aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorGravatar Cary Clark <caryclark@skia.org>2018-02-28 15:01:05 -0500
committerGravatar Skia Commit-Bot <skia-commit-bot@chromium.org>2018-02-28 20:31:33 +0000
commit65e409faca661949f8208d8c984fafe3a96bbebd (patch)
treea3c5b9d9ab44c2b93ac58fae23747c7a92b39db8
parent2252636923271daba4678b54ca72cd5bad227c49 (diff)
make SkDestinationSurfaceColorMode private
R=brianosman@google.com, reed@google.com Bug: skia: Change-Id: Ibbf91a664cc504737137717d9170ce4de09b017c Reviewed-on: https://skia-review.googlesource.com/111161 Reviewed-by: Brian Osman <brianosman@google.com> Commit-Queue: Cary Clark <caryclark@google.com>
-rw-r--r--include/core/SkImageInfo.h5
-rw-r--r--include/gpu/GrTexture.h1
-rw-r--r--src/core/SkImageInfoPriv.h5
-rw-r--r--src/core/SkMipMap.h1
-rw-r--r--src/gpu/GrResourceProvider.h2
5 files changed, 8 insertions, 6 deletions
diff --git a/include/core/SkImageInfo.h b/include/core/SkImageInfo.h
index cf9d244169..ece47f5c41 100644
--- a/include/core/SkImageInfo.h
+++ b/include/core/SkImageInfo.h
@@ -139,11 +139,6 @@ enum SkYUVColorSpace {
///////////////////////////////////////////////////////////////////////////////
-enum class SkDestinationSurfaceColorMode {
- kLegacy,
- kGammaAndColorSpaceAware,
-};
-
/**
* Describe an image's dimensions and pixel type.
* Used for both src images and render-targets (surfaces).
diff --git a/include/gpu/GrTexture.h b/include/gpu/GrTexture.h
index 899b3ed58c..59cf76f032 100644
--- a/include/gpu/GrTexture.h
+++ b/include/gpu/GrTexture.h
@@ -18,6 +18,7 @@
#include "../private/GrTypesPriv.h"
class GrTexturePriv;
+enum class SkDestinationSurfaceColorMode;
class GrTexture : virtual public GrSurface {
public:
diff --git a/src/core/SkImageInfoPriv.h b/src/core/SkImageInfoPriv.h
index bd0b990d0e..04779ff3fb 100644
--- a/src/core/SkImageInfoPriv.h
+++ b/src/core/SkImageInfoPriv.h
@@ -10,6 +10,11 @@
#include "SkImageInfo.h"
+enum class SkDestinationSurfaceColorMode {
+ kLegacy,
+ kGammaAndColorSpaceAware,
+};
+
static inline bool SkAlphaTypeIsValid(unsigned value) {
return value <= kLastEnum_SkAlphaType;
}
diff --git a/src/core/SkMipMap.h b/src/core/SkMipMap.h
index 4ca9cbd63e..7710002542 100644
--- a/src/core/SkMipMap.h
+++ b/src/core/SkMipMap.h
@@ -9,6 +9,7 @@
#define SkMipMap_DEFINED
#include "SkCachedData.h"
+#include "SkImageInfoPriv.h"
#include "SkPixmap.h"
#include "SkScalar.h"
#include "SkSize.h"
diff --git a/src/gpu/GrResourceProvider.h b/src/gpu/GrResourceProvider.h
index caa108747d..dcabb0c912 100644
--- a/src/gpu/GrResourceProvider.h
+++ b/src/gpu/GrResourceProvider.h
@@ -12,7 +12,7 @@
#include "GrContextOptions.h"
#include "GrPathRange.h"
#include "GrResourceCache.h"
-#include "SkImageInfo.h"
+#include "SkImageInfoPriv.h"
#include "SkScalerContext.h"
class GrBackendRenderTarget;