Reland "[includes] Remove link between SkImage.h and SkImageEncoder.h"

This is a reland of commit f60584eb0f

Client changes:
 - https://chromium-review.googlesource.com/c/chromium/src/+/3508565
 - http://cl/433225409
 - http://cl/433450799

Original change's description:
> [includes] Remove link between SkImage.h and SkImageEncoder.h
>
> According to go/chrome-includes [1], this will save about
> 210MB (0.09%) off the Chrome build. http://screen/GVdDaRRneTRuroL
>
> [1] https://commondatastorage.googleapis.com/chromium-browser-clang/include-analysis.html#view=edges&filter=%5Ethird_party%2Fskia%2Finclude%2Fcore%2FSkImage%5C.h%24&sort=asize&reverse=&includer=%5Ethird_party%2Fskia%2Finclude%2Fcore%2FSkImage%5C.h%24&included=&limit=1000
>
> Change-Id: If911ec283a9ce2b07c8509768a6a05446573a215
> Bug: 242216
> Reviewed-on: https://skia-review.googlesource.com/c/skia/+/512416
> Reviewed-by: Leon Scroggins <scroggo@google.com>
> Reviewed-by: Brian Osman <brianosman@google.com>
> Commit-Queue: Kevin Lubick <kjlubick@google.com>

Bug: 242216
Change-Id: Ic61e4ac2878e7a51f389312a3a434856e2e32be3
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/518277
Reviewed-by: Leon Scroggins <scroggo@google.com>
Reviewed-by: Robert Phillips <robertphillips@google.com>
Reviewed-by: Brian Osman <brianosman@google.com>
Commit-Queue: Kevin Lubick <kjlubick@google.com>

bench/RecordingBench.cpp

@@ -6,7 +6,9 @@
  */
 
 #include "bench/RecordingBench.h"
+
 #include "include/core/SkBBHFactory.h"
+#include "include/core/SkData.h"
 #include "include/core/SkPictureRecorder.h"
 
 PictureCentricBench::PictureCentricBench(const char* name, const SkPicture* pic) : fName(name) {

bench/nanobench.cpp

@@ -26,6 +26,7 @@
 #include "include/core/SkCanvas.h"
 #include "include/core/SkData.h"
 #include "include/core/SkGraphics.h"
+#include "include/core/SkImageEncoder.h"
 #include "include/core/SkPictureRecorder.h"
 #include "include/core/SkString.h"
 #include "include/core/SkSurface.h"

fuzz/FuzzEncoders.cpp

@@ -10,6 +10,7 @@
 #include "include/core/SkImage.h"
 #include "include/core/SkImageInfo.h"
 #include "include/core/SkPixmap.h"
+#include "include/core/SkStream.h"
 #include "include/encode/SkJpegEncoder.h"
 #include "include/encode/SkPngEncoder.h"
 #include "include/encode/SkWebpEncoder.h"

fuzz/oss_fuzz/FuzzRegionDeserialize.cpp

@@ -7,6 +7,7 @@
 
 
 #include "include/core/SkCanvas.h"
+#include "include/core/SkData.h"
 #include "include/core/SkPaint.h"
 #include "include/core/SkSurface.h"
 #include "src/core/SkRegionPriv.h"

gm/lazytiling.cpp

@@ -13,7 +13,6 @@
 #include "include/core/SkSize.h"
 #include "include/core/SkString.h"
 #include "include/gpu/GrDirectContext.h"
-
 #include "src/core/SkCanvasPriv.h"
 #include "src/core/SkConvertPixels.h"
 #include "src/gpu/GrDirectContextPriv.h"
@@ -23,7 +22,6 @@
 #include "src/gpu/SkGr.h"
 #include "src/gpu/effects/GrTextureEffect.h"
 #include "src/gpu/v1/SurfaceDrawContext_v1.h"
-
 #include "tools/gpu/ProxyUtils.h"
 
 static GrSurfaceProxyView create_view(GrDirectContext* dContext,

gm/userfont.cpp

@@ -11,6 +11,7 @@
 #include "include/core/SkPaint.h"
 #include "include/core/SkPath.h"
 #include "include/core/SkSize.h"
+#include "include/core/SkStream.h"
 #include "include/core/SkString.h"
 #include "include/utils/SkCustomTypeface.h"
 #include "tools/Resources.h"

gm/yuv420_odd_dim.cpp

@@ -11,6 +11,7 @@
 #include "include/core/SkCanvas.h"
 #include "include/core/SkImage.h"
 #include "include/core/SkPixmap.h"
+#include "include/core/SkStream.h"
 #include "include/core/SkSurface.h"
 #include "include/encode/SkJpegEncoder.h"
 #include "include/gpu/GrRecordingContext.h"

include/core/SkImage.h

@@ -8,7 +8,6 @@
 #ifndef SkImage_DEFINED
 #define SkImage_DEFINED
 
-#include "include/core/SkImageEncoder.h"
 #include "include/core/SkImageInfo.h"
 #include "include/core/SkRefCnt.h"
 #include "include/core/SkSamplingOptions.h"
@@ -28,24 +27,27 @@
 #include <android/hardware_buffer.h>
 #endif
 
-class SkData;
+class GrBackendFormat;
+class GrBackendTexture;
+class GrContextThreadSafeProxy;
+class GrDirectContext;
+class GrRecordingContext;
+class GrYUVABackendTextureInfo;
+class GrYUVABackendTextures;
 class SkCanvas;
+class SkData;
 class SkImage;
 class SkImageFilter;
 class SkImageGenerator;
 class SkMipmap;
 class SkPaint;
 class SkPicture;
+class SkPixmap;
 class SkPromiseImageTexture;
 class SkSurface;
 class SkYUVAPixmaps;
-class GrBackendFormat;
-class GrBackendTexture;
-class GrDirectContext;
-class GrRecordingContext;
-class GrContextThreadSafeProxy;
-class GrYUVABackendTextureInfo;
-class GrYUVABackendTextures;
+
+enum class SkEncodedImageFormat;
 
 #if SK_GRAPHITE_ENABLED
 namespace skgpu {

modules/androidkit/src/Image.cpp

@@ -7,9 +7,11 @@
 
 #include <jni.h>
 
+#include "include/core/SkData.h"
 #include "include/core/SkImage.h"
 #include "include/core/SkM44.h"
 #include "include/core/SkTileMode.h"
+#include "include/private/SkTo.h"
 #include "modules/androidkit/src/Utils.h"
 
 namespace {

modules/skottie/tests/AudioLayer.cpp

@@ -5,8 +5,8 @@
  * found in the LICENSE file.
  */
 
+#include "include/core/SkStream.h"
 #include "modules/skottie/include/Skottie.h"
-
 #include "tests/Test.h"
 
 using namespace skottie;

modules/skottie/tests/Expression.cpp

@@ -6,6 +6,7 @@
  */
 
 #include <iostream>
+#include "include/core/SkStream.h"
 #include "modules/skottie/include/Skottie.h"
 #include "modules/skottie/include/SkottieProperty.h"
 #include "tests/Test.h"

modules/skottie/tests/Image.cpp

@@ -5,6 +5,7 @@
  * found in the LICENSE file.
  */
 
+#include "include/core/SkStream.h"
 #include "include/core/SkSurface.h"
 #include "modules/skottie/include/Skottie.h"
 #include "tests/Test.h"

platform_tools/android/apps/skottie/skottielib/src/main/cpp/native-lib.cpp

@@ -9,6 +9,7 @@
 #include "include/core/SkBitmap.h"
 #include "include/core/SkCanvas.h"
 #include "include/core/SkColor.h"
+#include "include/core/SkStream.h"
 #include "include/core/SkSurface.h"
 #include "include/core/SkTime.h"
 #include <jni.h>

samplecode/Sample3D.cpp

@@ -9,6 +9,7 @@
 #include "include/core/SkM44.h"
 #include "include/core/SkPaint.h"
 #include "include/core/SkRRect.h"
+#include "include/core/SkStream.h"
 #include "include/core/SkVertices.h"
 #include "include/utils/SkRandom.h"
 #include "samplecode/Sample.h"

src/gpu/GrBlurUtils.cpp

@@ -9,8 +9,14 @@
 
 #if SK_GPU_V1
 
+#include "include/core/SkBitmap.h"
+#include "include/core/SkPaint.h"
 #include "include/gpu/GrDirectContext.h"
 #include "include/gpu/GrRecordingContext.h"
+#include "src/core/SkDraw.h"
+#include "src/core/SkMaskFilterBase.h"
+#include "src/core/SkMatrixProvider.h"
+#include "src/core/SkTLazy.h"
 #include "src/gpu/GrCaps.h"
 #include "src/gpu/GrDirectContextPriv.h"
 #include "src/gpu/GrFixedClip.h"
@@ -26,14 +32,6 @@
 #include "src/gpu/geometry/GrStyledShape.h"
 #include "src/gpu/v1/SurfaceDrawContext_v1.h"
 
-#include "include/core/SkBitmap.h"
-#include "include/core/SkPaint.h"
-#include "src/core/SkDraw.h"
-#include "src/core/SkMaskFilterBase.h"
-#include "src/core/SkMatrixProvider.h"
-#include "src/core/SkTLazy.h"
-#include "src/gpu/SkGr.h"
-
 static bool clip_bounds_quick_reject(const SkIRect& clipBounds, const SkIRect& rect) {
     return clipBounds.isEmpty() || rect.isEmpty() || !SkIRect::Intersects(clipBounds, rect);
 }

src/image/SkImage_Base.h

@@ -8,6 +8,7 @@
 #ifndef SkImage_Base_DEFINED
 #define SkImage_Base_DEFINED
 
+#include "include/core/SkData.h"
 #include "include/core/SkImage.h"
 #include "include/core/SkSurface.h"
 #include "src/core/SkMipmap.h"

src/pdf/SkPDFBitmap.cpp

@@ -9,6 +9,7 @@
 
 #include "include/core/SkBitmap.h"
 #include "include/core/SkData.h"
+#include "include/core/SkEncodedImageFormat.h"
 #include "include/core/SkExecutor.h"
 #include "include/core/SkImage.h"
 #include "include/core/SkStream.h"

tests/CanvasStateTest.cpp

@@ -14,6 +14,7 @@
 #include "include/core/SkRect.h"
 #include "include/core/SkRegion.h"
 #include "include/core/SkScalar.h"
+#include "include/core/SkStream.h"
 #include "include/core/SkSurface.h"
 #include "include/core/SkTypes.h"
 #include "include/private/SkTDArray.h"

tests/EncodeTest.cpp

@@ -13,6 +13,7 @@
 #include "include/core/SkColorPriv.h"
 #include "include/core/SkEncodedImageFormat.h"
 #include "include/core/SkImage.h"
+#include "include/core/SkImageEncoder.h"
 #include "include/core/SkStream.h"
 #include "include/core/SkSurface.h"
 #include "include/encode/SkJpegEncoder.h"

tests/FontMgrAndroidParserTest.cpp

@@ -10,6 +10,7 @@
 #include "include/core/SkBitmap.h"
 #include "include/core/SkCanvas.h"
 #include "include/core/SkFont.h"
+#include "include/core/SkStream.h"
 #include "include/core/SkTypeface.h"
 #include "include/ports/SkFontMgr_android.h"
 #include "include/private/SkFixed.h"

tests/SkRuntimeEffectTest.cpp

@@ -11,6 +11,7 @@
 #include "include/core/SkColorFilter.h"
 #include "include/core/SkData.h"
 #include "include/core/SkPaint.h"
+#include "include/core/SkStream.h"
 #include "include/core/SkSurface.h"
 #include "include/effects/SkBlenders.h"
 #include "include/effects/SkRuntimeEffect.h"

tests/SkSLInterpreterTest.cpp

@@ -6,6 +6,7 @@
  */
 
 #include "include/core/SkM44.h"
+#include "include/core/SkStream.h"
 #include "src/sksl/SkSLCompiler.h"
 #include "src/sksl/codegen/SkSLVMCodeGenerator.h"
 #include "src/sksl/ir/SkSLExternalFunction.h"

tests/TestUtils.cpp

@@ -7,6 +7,7 @@
 
 #include "tests/TestUtils.h"
 
+#include "include/core/SkStream.h"
 #include "include/encode/SkPngEncoder.h"
 #include "include/utils/SkBase64.h"
 #include "src/core/SkAutoPixmapStorage.h"

tools/Resources.h

@@ -8,6 +8,8 @@
 #ifndef Resources_DEFINED
 #define Resources_DEFINED
 
+#include "include/core/SkBitmap.h"
+#include "include/core/SkData.h"
 #include "include/core/SkImage.h"
 #include "include/core/SkString.h"
 

tools/SkSharingProc.cpp

@@ -11,6 +11,7 @@
 #include "include/core/SkData.h"
 #include "include/core/SkImage.h"
 #include "include/core/SkSerialProcs.h"
+#include "include/core/SkStream.h"
 
 namespace {
     sk_sp<SkData> collectNonTextureImagesProc(SkImage* img, void* ctx) {

tools/skottie_ios_app/SkiaUIContext.mm

@@ -3,7 +3,9 @@
 
 #include "tools/skottie_ios_app/SkiaContext.h"
 
+#include "include/core/SkBitmap.h"
 #include "include/core/SkCanvas.h"
+#include "include/core/SkSize.h"
 #include "include/core/SkTime.h"
 #include "include/utils/mac/SkCGUtils.h"
 

tools/skqp/src/skqp.cpp

@@ -8,6 +8,7 @@
 #include "tools/skqp/src/skqp.h"
 
 #include "gm/gm.h"
+#include "include/core/SkBitmap.h"
 #include "include/core/SkFontStyle.h"
 #include "include/core/SkGraphics.h"
 #include "include/core/SkStream.h"

tools/viewer/SkSLDebuggerSlide.cpp

@@ -8,6 +8,7 @@
 #include "tools/viewer/SkSLDebuggerSlide.h"
 
 #include "include/core/SkCanvas.h"
+#include "include/core/SkStream.h"
 #include "tools/viewer/Viewer.h"
 
 #include <algorithm>

tools/viewer/SkSLSlide.cpp

@@ -9,6 +9,7 @@
 
 #include "include/core/SkCanvas.h"
 #include "include/core/SkFont.h"
+#include "include/core/SkStream.h"
 #include "include/effects/SkGradientShader.h"
 #include "include/effects/SkPerlinNoiseShader.h"
 #include "include/sksl/SkSLDebugTrace.h"