aboutsummaryrefslogtreecommitdiffhomepage
path: root/src/utils
diff options
context:
space:
mode:
authorGravatar Cary Clark <caryclark@skia.org>2017-09-15 11:59:23 -0400
committerGravatar Skia Commit-Bot <skia-commit-bot@chromium.org>2017-09-15 16:31:35 +0000
commita4083c97d48e8a4f88e2797d7363f141e3d42553 (patch)
treeab01d3982edcf50b7d69dc3e4475568964daa5fe /src/utils
parent3bf6366c6fc5d619358458e50909b60deb4cfe4a (diff)
make most of SkColorPriv.h private
created new file src/core/SkColorData.h for internal consumption. Note that many of the functions there are unused as well. Bug: skia: 6898 R: reed@google.com Change-Id: I25bfd5a9c21f53558c4ca65a77eb5d322d897c6d Reviewed-on: https://skia-review.googlesource.com/46848 Commit-Queue: Cary Clark <caryclark@google.com> Reviewed-by: Mike Reed <reed@google.com>
Diffstat (limited to 'src/utils')
-rw-r--r--src/utils/SkPatchUtils.cpp2
-rw-r--r--src/utils/SkPatchUtils.h2
-rwxr-xr-xsrc/utils/SkShadowTessellator.cpp2
-rw-r--r--src/utils/SkShadowUtils.cpp2
-rw-r--r--src/utils/mac/SkCreateCGImageRef.cpp2
5 files changed, 5 insertions, 5 deletions
diff --git a/src/utils/SkPatchUtils.cpp b/src/utils/SkPatchUtils.cpp
index 5820d8571d..512e8cc334 100644
--- a/src/utils/SkPatchUtils.cpp
+++ b/src/utils/SkPatchUtils.cpp
@@ -7,7 +7,7 @@
#include "SkPatchUtils.h"
-#include "SkColorPriv.h"
+#include "SkColorData.h"
#include "SkColorSpace_Base.h"
#include "SkGeometry.h"
#include "SkPM4f.h"
diff --git a/src/utils/SkPatchUtils.h b/src/utils/SkPatchUtils.h
index 75c10e85ea..ee7a1f6dbc 100644
--- a/src/utils/SkPatchUtils.h
+++ b/src/utils/SkPatchUtils.h
@@ -8,7 +8,7 @@
#ifndef SkPatchUtils_DEFINED
#define SkPatchUtils_DEFINED
-#include "SkColorPriv.h"
+#include "SkColorData.h"
#include "SkMatrix.h"
#include "SkVertices.h"
diff --git a/src/utils/SkShadowTessellator.cpp b/src/utils/SkShadowTessellator.cpp
index 7c49ba6688..aff59bf36d 100755
--- a/src/utils/SkShadowTessellator.cpp
+++ b/src/utils/SkShadowTessellator.cpp
@@ -6,7 +6,7 @@
*/
#include "SkShadowTessellator.h"
-#include "SkColorPriv.h"
+#include "SkColorData.h"
#include "SkDrawShadowInfo.h"
#include "SkGeometry.h"
#include "SkInsetConvexPolygon.h"
diff --git a/src/utils/SkShadowUtils.cpp b/src/utils/SkShadowUtils.cpp
index 0e34c9105f..288ae9608b 100644
--- a/src/utils/SkShadowUtils.cpp
+++ b/src/utils/SkShadowUtils.cpp
@@ -8,7 +8,7 @@
#include "SkShadowUtils.h"
#include "SkCanvas.h"
#include "SkColorFilter.h"
-#include "SkColorPriv.h"
+#include "SkColorData.h"
#include "SkDevice.h"
#include "SkDrawShadowInfo.h"
#include "SkPath.h"
diff --git a/src/utils/mac/SkCreateCGImageRef.cpp b/src/utils/mac/SkCreateCGImageRef.cpp
index b5df42364b..fd55d91707 100644
--- a/src/utils/mac/SkCreateCGImageRef.cpp
+++ b/src/utils/mac/SkCreateCGImageRef.cpp
@@ -10,7 +10,7 @@
#include "SkCGUtils.h"
#include "SkBitmap.h"
-#include "SkColorPriv.h"
+#include "SkColorData.h"
static CGBitmapInfo ComputeCGAlphaInfo_RGBA(SkAlphaType at) {
CGBitmapInfo info = kCGBitmapByteOrder32Big;