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

Revert "Reland "[includes] Remove SkColorSpace include from SkImageInfo""

Browse Source 
This reverts commit 00de8cc000.

Reason for revert: G3 Breakage?

Original change's description:
> Reland "[includes] Remove SkColorSpace include from SkImageInfo"
>
> This is a reland of commit 2151fa37fa
>
> New client fixes:
>  - https://crrev.com/c/3616345
>
> Original change's description:
> > [includes] Remove SkColorSpace include from SkImageInfo
> >
> > See also https://skia-review.googlesource.com/c/skia/+/525639
> >
> > This should be landed when clients have been fixed.
> >  - https://github.com/flutter/engine/pull/32532
> >  - https://github.com/flutter/engine/pull/32382
> >  - http://cl/438808657
> >  - http://cl/438803822
> >  - http://cl/438807456
> >  - http://cl/438808026
> >  - http://cl/438821192
> >  - https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17542295
> >
> > Change-Id: I04beeb2e2b6132c40508c98f4f281981dadbb0d4
> > Bug: skia:13052
> > Reviewed-on: https://skia-review.googlesource.com/c/skia/+/526416
> > Commit-Queue: Kevin Lubick <kjlubick@google.com>
> > Reviewed-by: Brian Salomon <bsalomon@google.com>
>
> Canary-Chromium-CL: 3616345
> Bug: skia:13052
> Change-Id: I670d3d0d0bab2a86559d9a1184cb36ef008196f3
> Reviewed-on: https://skia-review.googlesource.com/c/skia/+/535357
> Reviewed-by: Brian Salomon <bsalomon@google.com>

Bug: skia:13052
Change-Id: Ie2d036f0bfcdb481c4227a6d567e38d527c81168
No-Presubmit: true
No-Tree-Checks: true
No-Try: true
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/535202
Bot-Commit: Rubber Stamper <rubber-stamper@appspot.gserviceaccount.com>
Auto-Submit: Brian Osman <brianosman@google.com>
Commit-Queue: Rubber Stamper <rubber-stamper@appspot.gserviceaccount.com>
This commit is contained in:
Brian Osman 2022-04-29 22:16:18 +00:00 committed by SkCQ
parent 7bc9970941
commit 05dd660fee
17 changed files with 2 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
include/core/BUILD.bazel
View File

@ -395,6 +395,7 @@ generated_cc_atom(
visibility = ["//:__subpackages__"],
deps = [
":SkAlphaType_hdr",
":SkColorSpace_hdr",
":SkColorType_hdr",
":SkMath_hdr",
":SkRect_hdr",

1
include/core/SkImageInfo.h
View File

@ -9,6 +9,7 @@
#define SkImageInfo_DEFINED
#include "include/core/SkAlphaType.h"
#include "include/core/SkColorSpace.h" // TODO(kjlubick) Remove this after clients fixed
#include "include/core/SkColorType.h"
#include "include/core/SkMath.h"
#include "include/core/SkRect.h"

1
src/gpu/ganesh/BUILD.bazel
View File

@ -432,7 +432,6 @@ generated_cc_atom(
":GrTextureProxy_hdr",
":GrTexture_hdr",
":SkGr_hdr",
"//include/core:SkColorSpace_hdr",
"//include/core:SkTypes_hdr",
"//include/gpu:GrBackendSurface_hdr",
"//include/gpu:GrDirectContext_hdr",

1
src/gpu/ganesh/GrAHardwareBufferImageGenerator.cpp
View File

@ -16,7 +16,6 @@
#include <android/hardware_buffer.h>
#include "include/core/SkColorSpace.h"
#include "include/gpu/GrBackendSurface.h"
#include "include/gpu/GrDirectContext.h"
#include "include/gpu/GrRecordingContext.h"

1
src/gpu/ganesh/d3d/BUILD.bazel
View File

@ -242,7 +242,6 @@ generated_cc_atom(
":GrD3DTextureRenderTarget_hdr",
":GrD3DTexture_hdr",
":GrD3DUtil_hdr",
"//include/core:SkColorSpace_hdr",
"//include/gpu:GrBackendSurface_hdr",
"//include/gpu/d3d:GrD3DBackendContext_hdr",
"//src/core:SkConvertPixels_hdr",

1
src/gpu/ganesh/d3d/GrD3DGpu.cpp
View File

@ -7,7 +7,6 @@
#include "src/gpu/ganesh/d3d/GrD3DGpu.h"
#include "include/core/SkColorSpace.h"
#include "include/gpu/GrBackendSurface.h"
#include "include/gpu/d3d/GrD3DBackendContext.h"
#include "src/core/SkConvertPixels.h"

1
src/gpu/ganesh/dawn/BUILD.bazel
View File

@ -103,7 +103,6 @@ generated_cc_atom(
":GrDawnRenderTarget_hdr",
":GrDawnTexture_hdr",
":GrDawnUtil_hdr",
"//include/core:SkColorSpace_hdr",
"//include/gpu:GrBackendSemaphore_hdr",
"//include/gpu:GrBackendSurface_hdr",
"//include/gpu:GrContextOptions_hdr",

1
src/gpu/ganesh/dawn/GrDawnGpu.cpp
View File

@ -7,7 +7,6 @@
#include "src/gpu/ganesh/dawn/GrDawnGpu.h"
#include "include/core/SkColorSpace.h"
#include "include/gpu/GrBackendSemaphore.h"
#include "include/gpu/GrBackendSurface.h"
#include "include/gpu/GrContextOptions.h"

1
src/gpu/ganesh/mtl/GrMtlGpu.mm
View File

@ -7,7 +7,6 @@
#include "src/gpu/ganesh/mtl/GrMtlGpu.h"
#include "include/core/SkColorSpace.h"
#include "include/private/gpu/ganesh/GrTypesPriv.h"
#include "src/core/SkCompressedDataUtils.h"
#include "src/core/SkConvertPixels.h"

1
src/gpu/graphite/BUILD.bazel
View File

@ -219,7 +219,6 @@ generated_cc_atom(
":Renderer_hdr",
":TextureProxy_hdr",
":TextureUtils_hdr",
"//include/core:SkColorSpace_hdr",
"//include/core:SkPathEffect_hdr",
"//include/core:SkPath_hdr",
"//include/core:SkStrokeRec_hdr",

1
src/gpu/graphite/Device.cpp
View File

@ -27,7 +27,6 @@
#include "src/gpu/graphite/geom/Shape.h"
#include "src/gpu/graphite/geom/Transform_graphite.h"
#include "include/core/SkColorSpace.h"
#include "include/core/SkPath.h"
#include "include/core/SkPathEffect.h"
#include "include/core/SkStrokeRec.h"

4
tests/BUILD.bazel
View File

@ -2298,7 +2298,6 @@ generated_cc_atom(
deps = [
":Test_hdr",
"//include/core:SkCanvas_hdr",
"//include/core:SkColorSpace_hdr",
"//include/core:SkImage_hdr",
"//include/core:SkSurface_hdr",
"//include/core:SkTypes_hdr",
@ -3372,7 +3371,6 @@ generated_cc_atom(
visibility = ["//:__subpackages__"],
deps = [
":Test_hdr",
"//include/core:SkColorSpace_hdr",
"//include/core:SkTypes_hdr",
"//include/ports:SkImageGeneratorNDK_hdr",
"//tools:Resources_hdr",
@ -3386,7 +3384,6 @@ generated_cc_atom(
visibility = ["//:__subpackages__"],
deps = [
":Test_hdr",
"//include/core:SkColorSpace_hdr",
"//include/core:SkColor_hdr",
"//include/core:SkImageEncoder_hdr",
"//include/core:SkImageGenerator_hdr",
@ -6951,7 +6948,6 @@ generated_cc_atom(
":Test_hdr",
"//include/core:SkBitmap_hdr",
"//include/core:SkCanvas_hdr",
"//include/core:SkColorSpace_hdr",
"//include/core:SkImage_hdr",
"//include/core:SkSurface_hdr",
"//include/core:SkTypes_hdr",

1
tests/GrAHardwareBufferTest.cpp
View File

@ -12,7 +12,6 @@
#if SK_SUPPORT_GPU && defined(SK_BUILD_FOR_ANDROID) && __ANDROID_API__ >= 26
#include "include/core/SkCanvas.h"
#include "include/core/SkColorSpace.h"
#include "include/core/SkImage.h"
#include "include/core/SkSurface.h"
#include "include/gpu/GrDirectContext.h"

1
tests/NdkDecodeTest.cpp
View File

@ -7,7 +7,6 @@
#include "include/core/SkTypes.h"
#ifdef SK_ENABLE_NDK_IMAGES
#include "include/core/SkColorSpace.h"
#include "include/ports/SkImageGeneratorNDK.h"
#include "tests/Test.h"
#include "tools/Resources.h"

1
tests/NdkEncodeTest.cpp
View File

@ -8,7 +8,6 @@
#include "include/core/SkTypes.h"
#ifdef SK_ENABLE_NDK_IMAGES
#include "include/core/SkColor.h"
#include "include/core/SkColorSpace.h"
#include "include/core/SkImageEncoder.h"
#include "include/core/SkImageGenerator.h"
#include "include/private/SkMalloc.h"

1
tests/VkHardwareBufferTest.cpp
View File

@ -13,7 +13,6 @@
#include "include/core/SkBitmap.h"
#include "include/core/SkCanvas.h"
#include "include/core/SkColorSpace.h"
#include "include/core/SkImage.h"
#include "include/core/SkSurface.h"
#include "include/gpu/GrBackendSemaphore.h"

1
tools/skottie_ios_app/SkiaGLContext.mm
View File

@ -3,7 +3,6 @@
#include "tools/skottie_ios_app/SkiaContext.h"
#include "include/core/SkColorSpace.h"
#include "include/core/SkSurface.h"
#include "include/core/SkTime.h"
#include "include/gpu/GrBackendSurface.h"