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

[includes] Remove SkColorSpace include from SkImageInfo

Browse Source 
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>
This commit is contained in:
Kevin Lubick 2022-04-20 14:50:18 -04:00 committed by SkCQ
parent 23d333bdd6
commit 2151fa37fa
14 changed files with 13 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
include/core/BUILD.bazel
View File

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

1
include/core/SkImageInfo.h
View File

@ -9,7 +9,6 @@
#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

@ -429,6 +429,7 @@ 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,6 +16,7 @@
#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

@ -240,6 +240,7 @@ 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,6 +7,7 @@
#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

@ -99,6 +99,7 @@ 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,6 +7,7 @@
#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,6 +7,7 @@
#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

@ -217,6 +217,7 @@ 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,6 +27,7 @@
#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"

2
tests/BUILD.bazel
View File

@ -2296,6 +2296,7 @@ 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",
@ -6946,6 +6947,7 @@ 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,6 +12,7 @@
#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/VkHardwareBufferTest.cpp
View File

@ -13,6 +13,7 @@
#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"