AuroraMiddleware/skia2
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Revert "[includes] Remove link between SkImageEncoder and SkBitmap"

Browse Source 
This reverts commit 965d9dc948.

Reason for revert: Breaking G3

Original change's description:
> [includes] Remove link between SkImageEncoder and SkBitmap
>
> This cleans up an old TODO and, according to go/chrome-includes
> [1] [2], will save 106 MB (0.05%) of build size.
>
> [1] https://commondatastorage.googleapis.com/chromium-browser-clang/chrome_includes_2022-03-09_114034.html#view=edges&filter=&sort=asize&reverse=&includer=%5Ethird_party%2Fskia%2Finclude%2Fcore%2FSkImageEncoder%5C.h%24&included=&limit=1000
> [2] http://screen/ohtAxmQcnXui47q
>
> Change-Id: Ic53bfa827964dd5d2d2dbce12f1722e57ea5a9bc
> Bug: 242216
> Reviewed-on: https://skia-review.googlesource.com/c/skia/+/518497
> Reviewed-by: Brian Osman <brianosman@google.com>
> Commit-Queue: Kevin Lubick <kjlubick@google.com>

Bug: 242216
Change-Id: I71d76582f44317f6ad3a4c0152c5ce10c9bbf783
No-Presubmit: true
No-Tree-Checks: true
No-Try: true
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/520796
Owners-Override: Kevin Lubick <kjlubick@google.com>
Bot-Commit: Rubber Stamper <rubber-stamper@appspot.gserviceaccount.com>
This commit is contained in:
Kevin Lubick 2022-03-14 23:59:15 +00:00
parent ff138c94d6
commit e1880aed8f
2 changed files with 6 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
include/core/SkImageEncoder.h
View File

@ -8,6 +8,9 @@
#ifndef SkImageEncoder_DEFINED #ifndef SkImageEncoder_DEFINED
#define SkImageEncoder_DEFINED #define SkImageEncoder_DEFINED
// TODO: update clients so we can remove this include, they should IWYU
#include "include/core/SkBitmap.h"
#include "include/core/SkData.h" #include "include/core/SkData.h"
#include "include/core/SkEncodedImageFormat.h" #include "include/core/SkEncodedImageFormat.h"
#include "include/core/SkPixmap.h" #include "include/core/SkPixmap.h"

12
tests/MultiPictureDocumentTest.cpp
View File

@ -4,22 +4,19 @@
* Use of this source code is governed by a BSD-style license that can be * Use of this source code is governed by a BSD-style license that can be
* found in the LICENSE file. * found in the LICENSE file.
* *
* This test confirms that a MultiPictureDocument can be serialized and deserialized without error. * This test confirms that a MultiPictureDocument can be serialized and deserailzied without error.
* And that the pictures within it are re-created accurately * And that the pictures within it are re-created accurately
*/ */
#include "include/core/SkCanvas.h" #include "include/core/SkCanvas.h"
#include "include/core/SkColor.h" #include "include/core/SkColorPriv.h"
#include "include/core/SkColorSpace.h"
#include "include/core/SkDocument.h" #include "include/core/SkDocument.h"
#include "include/core/SkFont.h" #include "include/core/SkFont.h"
#include "include/core/SkImage.h" #include "include/core/SkImage.h"
#include "include/core/SkImageInfo.h"
#include "include/core/SkPicture.h" #include "include/core/SkPicture.h"
#include "include/core/SkPictureRecorder.h" #include "include/core/SkPictureRecorder.h"
#include "include/core/SkRRect.h" #include "include/core/SkRRect.h"
#include "include/core/SkRect.h"
#include "include/core/SkSerialProcs.h"
#include "include/core/SkStream.h"
#include "include/core/SkString.h" #include "include/core/SkString.h"
#include "include/core/SkSurface.h" #include "include/core/SkSurface.h"
#include "include/core/SkTextBlob.h" #include "include/core/SkTextBlob.h"
@ -174,9 +171,6 @@ DEF_TEST(SkMultiPictureDocument_Serialize_and_deserialize, reporter) {
#if SK_SUPPORT_GPU && defined(SK_BUILD_FOR_ANDROID) && __ANDROID_API__ >= 26 #if SK_SUPPORT_GPU && defined(SK_BUILD_FOR_ANDROID) && __ANDROID_API__ >= 26
#include "include/core/SkBitmap.h"
#include "include/core/SkColorSpace.h"
#include "include/core/SkColorType.h"
#include "include/gpu/GrDirectContext.h" #include "include/gpu/GrDirectContext.h"
#include "src/gpu/GrAHardwareBufferUtils.h" #include "src/gpu/GrAHardwareBufferUtils.h"
#include "src/gpu/GrDirectContextPriv.h" #include "src/gpu/GrDirectContextPriv.h"