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>

bench/ColorPrivBench.cpp

@@ -5,7 +5,7 @@
  * found in the LICENSE file.
  */
 #include "Benchmark.h"
-#include "SkColorPriv.h"
+#include "SkColorData.h"
 #include "SkRandom.h"
 #include "SkString.h"
 

bench/InterpBench.cpp

@@ -6,7 +6,7 @@
  */
 
 #include "Benchmark.h"
-#include "SkColorPriv.h"
+#include "SkColorData.h"
 #include "SkFixed.h"
 #include "SkMatrix.h"
 #include "SkPaint.h"

bench/MathBench.cpp

@@ -6,7 +6,7 @@
  */
 
 #include "Benchmark.h"
-#include "SkColorPriv.h"
+#include "SkColorData.h"
 #include "SkFixed.h"
 #include "SkMathPriv.h"
 #include "SkMatrix.h"

gm/bitmappremul.cpp

@@ -8,7 +8,7 @@
 #include "gm.h"
 #include "SkBitmap.h"
 #include "SkCanvas.h"
-#include "SkColorPriv.h"
+#include "SkColorData.h"
 
 /**
  * This GM checks that bitmap pixels are unpremultiplied before being exported

src/codec/SkBmpCodec.cpp

@@ -10,7 +10,7 @@
 #include "SkBmpRLECodec.h"
 #include "SkBmpStandardCodec.h"
 #include "SkCodecPriv.h"
-#include "SkColorPriv.h"
+#include "SkColorData.h"
 #include "SkStream.h"
 
 /*

src/codec/SkBmpMaskCodec.cpp

@@ -7,7 +7,7 @@
 
 #include "SkBmpMaskCodec.h"
 #include "SkCodecPriv.h"
-#include "SkColorPriv.h"
+#include "SkColorData.h"
 
 /*
  * Creates an instance of the decoder

src/codec/SkBmpRLECodec.cpp

@@ -7,7 +7,7 @@
 
 #include "SkBmpRLECodec.h"
 #include "SkCodecPriv.h"
-#include "SkColorPriv.h"
+#include "SkColorData.h"
 #include "SkStream.h"
 
 /*

src/codec/SkBmpStandardCodec.cpp

@@ -7,7 +7,7 @@
 
 #include "SkBmpStandardCodec.h"
 #include "SkCodecPriv.h"
-#include "SkColorPriv.h"
+#include "SkColorData.h"
 #include "SkStream.h"
 
 /*

src/codec/SkCodecPriv.h

@@ -8,7 +8,7 @@
 #ifndef SkCodecPriv_DEFINED
 #define SkCodecPriv_DEFINED
 
-#include "SkColorPriv.h"
+#include "SkColorData.h"
 #include "SkColorSpaceXform.h"
 #include "SkColorSpaceXformPriv.h"
 #include "SkColorTable.h"

src/codec/SkGifCodec.cpp

@@ -32,7 +32,7 @@
 
 #include "SkCodecAnimation.h"
 #include "SkCodecPriv.h"
-#include "SkColorPriv.h"
+#include "SkColorData.h"
 #include "SkColorTable.h"
 #include "SkGifCodec.h"
 #include "SkMakeUnique.h"

src/codec/SkHeifCodec.cpp

@@ -10,7 +10,7 @@
 #ifdef SK_HAS_HEIF_LIBRARY
 #include "SkCodec.h"
 #include "SkCodecPriv.h"
-#include "SkColorPriv.h"
+#include "SkColorData.h"
 #include "SkColorSpace_Base.h"
 #include "SkEndian.h"
 #include "SkStream.h"

src/codec/SkIcoCodec.cpp

@@ -7,7 +7,7 @@
 
 #include "SkBmpCodec.h"
 #include "SkCodecPriv.h"
-#include "SkColorPriv.h"
+#include "SkColorData.h"
 #include "SkData.h"
 #include "SkIcoCodec.h"
 #include "SkPngCodec.h"

src/codec/SkJpegCodec.cpp

@@ -9,7 +9,7 @@
 #include "SkJpegCodec.h"
 #include "SkJpegDecoderMgr.h"
 #include "SkCodecPriv.h"
-#include "SkColorPriv.h"
+#include "SkColorData.h"
 #include "SkColorSpace_Base.h"
 #include "SkStream.h"
 #include "SkTemplates.h"

src/codec/SkMaskSwizzler.cpp

@@ -6,7 +6,7 @@
  */
 
 #include "SkCodecPriv.h"
-#include "SkColorPriv.h"
+#include "SkColorData.h"
 #include "SkMaskSwizzler.h"
 
 static void swizzle_mask16_to_rgba_opaque(

src/codec/SkPngCodec.cpp

@@ -7,7 +7,7 @@
 
 #include "SkBitmap.h"
 #include "SkCodecPriv.h"
-#include "SkColorPriv.h"
+#include "SkColorData.h"
 #include "SkColorSpace.h"
 #include "SkColorSpacePriv.h"
 #include "SkColorTable.h"

src/codec/SkRawCodec.cpp

@@ -7,7 +7,7 @@
 
 #include "SkCodec.h"
 #include "SkCodecPriv.h"
-#include "SkColorPriv.h"
+#include "SkColorData.h"
 #include "SkData.h"
 #include "SkJpegCodec.h"
 #include "SkMakeUnique.h"

src/codec/SkSwizzler.cpp

@@ -6,7 +6,7 @@
  */
 
 #include "SkCodecPriv.h"
-#include "SkColorPriv.h"
+#include "SkColorData.h"
 #include "SkHalf.h"
 #include "SkOpts.h"
 #include "SkSwizzler.h"

src/codec/SkWbmpCodec.cpp

@@ -7,7 +7,7 @@
 
 #include "SkCodec.h"
 #include "SkCodecPriv.h"
-#include "SkColorPriv.h"
+#include "SkColorData.h"
 #include "SkColorTable.h"
 #include "SkData.h"
 #include "SkStream.h"

src/core/Sk4px.h

@@ -10,7 +10,7 @@
 
 #include "SkNx.h"
 #include "SkColor.h"
-#include "SkColorPriv.h"
+#include "SkColorData.h"
 
 // This file may be included multiple times by .cpp files with different flags, leading
 // to different definitions.  Usually that doesn't matter because it's all inlined, but

src/core/SkAAClip.cpp

@@ -8,7 +8,7 @@
 #include "SkAAClip.h"
 #include "SkAtomics.h"
 #include "SkBlitter.h"
-#include "SkColorPriv.h"
+#include "SkColorData.h"
 #include "SkPath.h"
 #include "SkScan.h"
 #include "SkUtils.h"

src/core/SkBitmap.cpp

@@ -7,7 +7,7 @@
 
 #include "SkAtomics.h"
 #include "SkBitmap.h"
-#include "SkColorPriv.h"
+#include "SkColorData.h"
 #include "SkColorTable.h"
 #include "SkConvertPixels.h"
 #include "SkData.h"

src/core/SkBitmapProcState.cpp

@@ -8,7 +8,7 @@
 #include "SkBitmapCache.h"
 #include "SkBitmapController.h"
 #include "SkBitmapProcState.h"
-#include "SkColorPriv.h"
+#include "SkColorData.h"
 #include "SkPaint.h"
 #include "SkShader.h"   // for tilemodes
 #include "SkUtilsArm.h"

src/core/SkBitmapProcState_filter.h

@@ -6,7 +6,7 @@
  */
 
 
-#include "SkColorPriv.h"
+#include "SkColorData.h"
 
 /*
     Filter_32_opaque

src/core/SkBlitMask_D32.cpp

@@ -7,7 +7,7 @@
 
 #include "SkBlitMask.h"
 #include "SkColor.h"
-#include "SkColorPriv.h"
+#include "SkColorData.h"
 #include "SkOpts.h"
 
 SkBlitMask::BlitLCD16RowProc SkBlitMask::BlitLCD16RowFactory(bool isOpaque) {

src/core/SkBlitRow_D32.cpp

@@ -7,7 +7,7 @@
 
 #include "SkBlitRow.h"
 #include "SkBlitMask.h"
-#include "SkColorPriv.h"
+#include "SkColorData.h"
 #include "SkOpts.h"
 #include "SkUtils.h"
 

src/core/SkBlitter.cpp

@@ -684,7 +684,7 @@ SkBlitter* SkBlitterClipper::apply(SkBlitter* blitter, const SkRegion* clip,
 ///////////////////////////////////////////////////////////////////////////////
 
 #include "SkColorShader.h"
-#include "SkColorPriv.h"
+#include "SkColorData.h"
 
 class Sk3DShader : public SkShaderBase {
 public:

src/core/SkBlitter_A8.cpp

@@ -6,7 +6,7 @@
  */
 
 #include "SkCoreBlitters.h"
-#include "SkColorPriv.h"
+#include "SkColorData.h"
 #include "SkShader.h"
 #include "SkXfermodePriv.h"
 

src/core/SkBlitter_ARGB32.cpp

@@ -6,7 +6,7 @@
  */
 
 #include "SkCoreBlitters.h"
-#include "SkColorPriv.h"
+#include "SkColorData.h"
 #include "SkShader.h"
 #include "SkUtils.h"
 #include "SkXfermodePriv.h"

src/core/SkBlurImageFilter.cpp

@@ -8,7 +8,7 @@
 #include "SkBlurImageFilter.h"
 
 #include "SkAutoPixmapStorage.h"
-#include "SkColorPriv.h"
+#include "SkColorData.h"
 #include "SkColorSpaceXformer.h"
 #include "SkGpuBlurUtils.h"
 #include "SkOpts.h"

src/core/SkColor.cpp

@@ -6,7 +6,7 @@
  */
 
 #include "SkColor.h"
-#include "SkColorPriv.h"
+#include "SkColorData.h"
 #include "SkFixed.h"
 
 SkPMColor SkPreMultiplyARGB(U8CPU a, U8CPU r, U8CPU g, U8CPU b) {

src/core/SkColorMatrixFilterRowMajor255.cpp

@@ -6,7 +6,7 @@
  */
 
 #include "SkColorMatrixFilterRowMajor255.h"
-#include "SkColorPriv.h"
+#include "SkColorData.h"
 #include "SkNx.h"
 #include "SkPM4fPriv.h"
 #include "SkRasterPipeline.h"

src/core/SkColorSpaceXform.cpp

@@ -5,7 +5,7 @@
  * found in the LICENSE file.
  */
 
-#include "SkColorPriv.h"
+#include "SkColorData.h"
 #include "SkColorSpace_A2B.h"
 #include "SkColorSpace_Base.h"
 #include "SkColorSpace_XYZ.h"

src/core/SkColorSpaceXform_A2B.cpp

@@ -7,7 +7,7 @@
 
 #include "SkColorSpaceXform_A2B.h"
 
-#include "SkColorPriv.h"
+#include "SkColorData.h"
 #include "SkColorSpace_A2B.h"
 #include "SkColorSpace_XYZ.h"
 #include "SkColorSpacePriv.h"

src/core/SkDither.h

@@ -9,13 +9,13 @@
 #ifndef SkDither_DEFINED
 #define SkDither_DEFINED
 
-#include "SkColorPriv.h"
+#include "SkColorData.h"
 
 #define SK_DitherValueMax4444   15
 #define SK_DitherValueMax565    7
 
 /*  need to use macros for bit-counts for each component, and then
-    move these into SkColorPriv.h
+    move these into SkColorData.h
 */
 
 #define SkDITHER_R32_FOR_565_MACRO(r, d)    (r + d - (r >> 5))

src/core/SkDraw.cpp

@@ -12,7 +12,7 @@
 #include "SkBlendModePriv.h"
 #include "SkBlitter.h"
 #include "SkCanvas.h"
-#include "SkColorPriv.h"
+#include "SkColorData.h"
 #include "SkDevice.h"
 #include "SkDeviceLooper.h"
 #include "SkDraw.h"

src/core/SkMaskGamma.h

@@ -10,7 +10,7 @@
 
 #include "SkTypes.h"
 #include "SkColor.h"
-#include "SkColorPriv.h"
+#include "SkColorData.h"
 #include "SkRefCnt.h"
 
 /**

src/core/SkMipMap.cpp

@@ -7,7 +7,7 @@
 
 #include "SkMipMap.h"
 #include "SkBitmap.h"
-#include "SkColorPriv.h"
+#include "SkColorData.h"
 #include "SkHalf.h"
 #include "SkMathPriv.h"
 #include "SkNx.h"

src/core/SkModeColorFilter.cpp

@@ -9,7 +9,7 @@
 #include "SkBlendModePriv.h"
 #include "SkBlitRow.h"
 #include "SkColorFilter.h"
-#include "SkColorPriv.h"
+#include "SkColorData.h"
 #include "SkColorSpaceXformer.h"
 #include "SkModeColorFilter.h"
 #include "SkPM4f.h"

src/core/SkPM4f.h

@@ -8,7 +8,7 @@
 #ifndef SkPM4f_DEFINED
 #define SkPM4f_DEFINED
 
-#include "SkColorPriv.h"
+#include "SkColorData.h"
 #include "SkNx.h"
 
 static inline Sk4f swizzle_rb(const Sk4f& x) {

src/core/SkPM4fPriv.h

@@ -8,7 +8,7 @@
 #ifndef SkPM4fPriv_DEFINED
 #define SkPM4fPriv_DEFINED
 
-#include "SkColorPriv.h"
+#include "SkColorData.h"
 #include "SkColorSpace.h"
 #include "SkColorSpace_Base.h"
 #include "SkArenaAlloc.h"

src/core/SkPixmap.cpp

@@ -7,7 +7,7 @@
 
 #include "SkBitmap.h"
 #include "SkCanvas.h"
-#include "SkColorPriv.h"
+#include "SkColorData.h"
 #include "SkConvertPixels.h"
 #include "SkData.h"
 #include "SkImageInfoPriv.h"

src/core/SkScalerContext.cpp

@@ -9,7 +9,7 @@
 
 #include "SkAutoMalloc.h"
 #include "SkAutoPixmapStorage.h"
-#include "SkColorPriv.h"
+#include "SkColorData.h"
 #include "SkDescriptor.h"
 #include "SkDraw.h"
 #include "SkGlyph.h"

src/core/SkScan_Antihair.cpp

@@ -8,7 +8,7 @@
 
 #include "SkScan.h"
 #include "SkBlitter.h"
-#include "SkColorPriv.h"
+#include "SkColorData.h"
 #include "SkLineClipper.h"
 #include "SkRasterClip.h"
 #include "SkFDot6.h"

src/core/SkSpriteBlitter_ARGB32.cpp

@@ -9,7 +9,7 @@
 #include "SkArenaAlloc.h"
 #include "SkBlitRow.h"
 #include "SkColorFilter.h"
-#include "SkColorPriv.h"
+#include "SkColorData.h"
 #include "SkTemplates.h"
 #include "SkUtils.h"
 #include "SkXfermodePriv.h"

src/core/SkUnPreMultiply.cpp

@@ -5,7 +5,7 @@
  * found in the LICENSE file.
  */
 #include "SkUnPreMultiply.h"
-#include "SkColorPriv.h"
+#include "SkColorData.h"
 
 SkColor SkUnPreMultiply::PMColorToColor(SkPMColor c) {
     const unsigned a = SkGetPackedA32(c);

src/core/SkXfermode.cpp

@@ -6,7 +6,7 @@
  */
 
 #include "SkBlendModePriv.h"
-#include "SkColorPriv.h"
+#include "SkColorData.h"
 #include "SkMathPriv.h"
 #include "SkOnce.h"
 #include "SkOpts.h"

src/effects/SkBlurMask.cpp

@@ -409,7 +409,7 @@ static int boxBlurInterp(const uint8_t* src, int src_y_stride, uint8_t* dst,
 
 
 
-#include "SkColorPriv.h"
+#include "SkColorData.h"
 
 static void merge_src_with_blur(uint8_t dst[], int dstRB,
                                 const uint8_t src[], int srcRB,

src/effects/SkDisplacementMapEffect.cpp

@@ -13,7 +13,7 @@
 #include "SkSpecialImage.h"
 #include "SkWriteBuffer.h"
 #include "SkUnPreMultiply.h"
-#include "SkColorPriv.h"
+#include "SkColorData.h"
 #if SK_SUPPORT_GPU
 #include "GrClip.h"
 #include "GrContext.h"

src/effects/SkLightingImageFilter.cpp

@@ -7,7 +7,7 @@
 
 #include "SkLightingImageFilter.h"
 #include "SkBitmap.h"
-#include "SkColorPriv.h"
+#include "SkColorData.h"
 #include "SkColorSpaceXformer.h"
 #include "SkPoint3.h"
 #include "SkReadBuffer.h"

src/effects/SkLumaColorFilter.cpp

@@ -7,7 +7,7 @@
 
 #include "SkLumaColorFilter.h"
 #include "SkPM4f.h"
-#include "SkColorPriv.h"
+#include "SkColorData.h"
 #include "SkRasterPipeline.h"
 #include "SkString.h"
 

src/effects/SkMagnifierImageFilter.cpp

@@ -8,7 +8,7 @@
 #include "SkMagnifierImageFilter.h"
 
 #include "SkBitmap.h"
-#include "SkColorPriv.h"
+#include "SkColorData.h"
 #include "SkColorSpaceXformer.h"
 #include "SkReadBuffer.h"
 #include "SkSpecialImage.h"

src/effects/SkMatrixConvolutionImageFilter.cpp

@@ -7,7 +7,7 @@
 
 #include "SkMatrixConvolutionImageFilter.h"
 #include "SkBitmap.h"
-#include "SkColorPriv.h"
+#include "SkColorData.h"
 #include "SkColorSpaceXformer.h"
 #include "SkReadBuffer.h"
 #include "SkSpecialImage.h"

src/effects/SkMorphologyImageFilter.cpp

@@ -8,7 +8,7 @@
 #include "SkMorphologyImageFilter.h"
 
 #include "SkBitmap.h"
-#include "SkColorPriv.h"
+#include "SkColorData.h"
 #include "SkColorSpaceXformer.h"
 #include "SkOpts.h"
 #include "SkReadBuffer.h"

src/effects/SkTableColorFilter.cpp

@@ -9,7 +9,7 @@
 #include "SkPM4f.h"
 #include "SkArenaAlloc.h"
 #include "SkBitmap.h"
-#include "SkColorPriv.h"
+#include "SkColorData.h"
 #include "SkRasterPipeline.h"
 #include "SkReadBuffer.h"
 #include "SkString.h"

src/effects/SkXfermodeImageFilter.cpp

@@ -8,7 +8,7 @@
 #include "SkXfermodeImageFilter.h"
 #include "SkArithmeticImageFilter.h"
 #include "SkCanvas.h"
-#include "SkColorPriv.h"
+#include "SkColorData.h"
 #include "SkColorSpaceXformer.h"
 #include "SkReadBuffer.h"
 #include "SkSpecialImage.h"

src/gpu/GrTessellator.h

@@ -9,6 +9,7 @@
 #define GrTessellator_DEFINED
 
 #include "GrColor.h"
+#include "SkColorData.h"
 #include "SkPoint.h"
 
 class SkPath;

src/gpu/SkGr.h

@@ -15,7 +15,7 @@
 #include "SkBlendModePriv.h"
 #include "SkCanvas.h"
 #include "SkColor.h"
-#include "SkColorPriv.h"
+#include "SkColorData.h"
 #include "SkFilterQuality.h"
 #include "SkImageInfo.h"
 #include "SkMatrix.h"

src/images/SkImageEncoderFns.h

@@ -14,7 +14,7 @@
 
 #include "SkBitmap.h"
 #include "SkColor.h"
-#include "SkColorPriv.h"
+#include "SkColorData.h"
 #include "SkColorSpace_Base.h"
 #include "SkICC.h"
 #include "SkOpts.h"

src/images/SkJpegEncoder.cpp

@@ -9,7 +9,7 @@
 
 #ifdef SK_HAS_JPEG_LIBRARY
 
-#include "SkColorPriv.h"
+#include "SkColorData.h"
 #include "SkColorSpace_Base.h"
 #include "SkImageEncoderFns.h"
 #include "SkImageInfoPriv.h"

src/images/SkWebpEncoder.cpp

@@ -19,7 +19,7 @@
 #ifdef SK_HAS_WEBP_LIBRARY
 
 #include "SkBitmap.h"
-#include "SkColorPriv.h"
+#include "SkColorData.h"
 #include "SkColorSpace_Base.h"
 #include "SkImageEncoderFns.h"
 #include "SkStream.h"

src/jumper/SkJumper.cpp

@@ -5,7 +5,7 @@
  * found in the LICENSE file.
  */
 
-#include "SkColorPriv.h"
+#include "SkColorData.h"
 #include "SkCpu.h"
 #include "SkJumper.h"
 #include "SkOnce.h"

src/opts/SkBitmapProcState_arm_neon.cpp

@@ -7,7 +7,7 @@
 
 #include "SkBitmapProcState.h"
 #include "SkBitmapProcState_filter.h"
-#include "SkColorPriv.h"
+#include "SkColorData.h"
 #include "SkPaint.h"
 #include "SkShader.h"   // for tilemodes
 #include "SkUtilsArm.h"

src/opts/SkBitmapProcState_filter_neon.h

@@ -6,7 +6,7 @@
  */
 
 #include <arm_neon.h>
-#include "SkColorPriv.h"
+#include "SkColorData.h"
 
 /*
  * Filter_32_opaque

src/opts/SkBitmapProcState_opts_SSE2.cpp

@@ -8,7 +8,7 @@
 #include <emmintrin.h>
 #include "SkBitmapProcState_opts_SSE2.h"
 #include "SkBitmapProcState_utils.h"
-#include "SkColorPriv.h"
+#include "SkColorData.h"
 #include "SkPaint.h"
 #include "SkUtils.h"
 

src/opts/SkBitmapProcState_opts_SSSE3.cpp

@@ -6,7 +6,7 @@
  */
 
 #include "SkBitmapProcState_opts_SSSE3.h"
-#include "SkColorPriv.h"
+#include "SkColorData.h"
 #include "SkPaint.h"
 #include "SkUtils.h"
 

src/opts/SkBlitMask_opts_arm.cpp

@@ -6,7 +6,7 @@
  */
 
 #include "SkColor.h"
-#include "SkColorPriv.h"
+#include "SkColorData.h"
 #include "SkBlitMask.h"
 #include "SkUtilsArm.h"
 #include "SkBlitMask_opts_arm_neon.h"

src/opts/SkBlitRow_opts.h

@@ -9,7 +9,7 @@
 #define SkBlitRow_opts_DEFINED
 
 #include "Sk4px.h"
-#include "SkColorPriv.h"
+#include "SkColorData.h"
 #include "SkMSAN.h"
 
 #if SK_CPU_SSE_LEVEL >= SK_CPU_SSE_LEVEL_SSE2

src/opts/SkBlitRow_opts_SSE2.cpp

@@ -8,7 +8,7 @@
 #include <emmintrin.h>
 #include "SkBitmapProcState_opts_SSE2.h"
 #include "SkBlitRow_opts_SSE2.h"
-#include "SkColorPriv.h"
+#include "SkColorData.h"
 #include "SkColor_opts_SSE2.h"
 #include "SkDither.h"
 #include "SkMSAN.h"

src/opts/SkBlitRow_opts_arm_neon.cpp

@@ -9,7 +9,7 @@
 
 #include "SkBlitMask.h"
 #include "SkBlitRow.h"
-#include "SkColorPriv.h"
+#include "SkColorData.h"
 #include "SkDither.h"
 #include "SkMathPriv.h"
 #include "SkUtils.h"

src/opts/SkBlurImageFilter_opts.h

@@ -8,7 +8,7 @@
 #ifndef SkBlurImageFilter_opts_DEFINED
 #define SkBlurImageFilter_opts_DEFINED
 
-#include "SkColorPriv.h"
+#include "SkColorData.h"
 #include "SkRect.h"
 
 #if SK_CPU_SSE_LEVEL >= SK_CPU_SSE_LEVEL_SSE2

src/opts/SkColor_opts_SSE2.h

@@ -42,7 +42,7 @@ static inline __m128i SkAlphaMulAlpha_SSE2(const __m128i& a,
     return prod;
 }
 
-// Portable version SkAlphaMulQ is in SkColorPriv.h.
+// Portable version SkAlphaMulQ is in SkColorData.h.
 static inline __m128i SkAlphaMulQ_SSE2(const __m128i& c, const __m128i& scale) {
     const __m128i mask = _mm_set1_epi32(0xFF00FF);
     __m128i s = _mm_or_si128(_mm_slli_epi32(scale, 16), scale);
@@ -80,7 +80,7 @@ static inline __m128i SkAlphaMulQ_SSE2(const __m128i& c, const unsigned scale) {
     return _mm_or_si128(rb, ag);
 }
 
-// Portable version SkFastFourByteInterp256 is in SkColorPriv.h.
+// Portable version SkFastFourByteInterp256 is in SkColorData.h.
 static inline __m128i SkFastFourByteInterp256_SSE2(const __m128i& src, const __m128i& dst, const unsigned src_scale) {
     // Computes dst + (((src - dst)*src_scale)>>8)
     const __m128i mask = _mm_set1_epi32(0x00FF00FF);
@@ -107,7 +107,7 @@ static inline __m128i SkFastFourByteInterp256_SSE2(const __m128i& src, const __m
     return _mm_add_epi8(dst, diff);
 }
 
-// Portable version SkPMLerp is in SkColorPriv.h
+// Portable version SkPMLerp is in SkColorData.h
 static inline __m128i SkPMLerp_SSE2(const __m128i& src, const __m128i& dst, const unsigned scale) {
     return SkFastFourByteInterp256_SSE2(src, dst, scale);
 }
@@ -238,7 +238,7 @@ static inline __m128i SkPixel32ToPixel16_ToU16_SSE2(const __m128i& src_pixel1,
     return d_pixel;
 }
 
-// Portable version is SkPMSrcOver in SkColorPriv.h.
+// Portable version is SkPMSrcOver in SkColorData.h.
 static inline __m128i SkPMSrcOver_SSE2(const __m128i& src, const __m128i& dst) {
     return _mm_add_epi32(src,
                          SkAlphaMulQ_SSE2(dst, _mm_sub_epi32(_mm_set1_epi32(256),

src/opts/SkColor_opts_neon.h

@@ -9,7 +9,7 @@
 #define SkColor_opts_neon_DEFINED
 
 #include "SkTypes.h"
-#include "SkColorPriv.h"
+#include "SkColorData.h"
 
 #include <arm_neon.h>
 

src/opts/SkSwizzler_opts.h

@@ -8,7 +8,7 @@
 #ifndef SkSwizzler_opts_DEFINED
 #define SkSwizzler_opts_DEFINED
 
-#include "SkColorPriv.h"
+#include "SkColorData.h"
 
 #if SK_CPU_SSE_LEVEL >= SK_CPU_SSE_LEVEL_SSSE3
     #include <immintrin.h>

src/pdf/SkPDFBitmap.cpp

@@ -7,7 +7,7 @@
 
 #include "SkPDFBitmap.h"
 
-#include "SkColorPriv.h"
+#include "SkColorData.h"
 #include "SkData.h"
 #include "SkDeflate.h"
 #include "SkImage.h"
@@ -46,7 +46,7 @@ static void fill_stream(SkWStream* out, char value, size_t n) {
     out->write(buffer, n % sizeof(buffer));
 }
 
-// TODO(reed@): Decide if these five functions belong in SkColorPriv.h
+// TODO(reed@): Decide if these five functions belong in SkColorData.h
 static bool SkIsBGRA(SkColorType ct) {
     SkASSERT(kBGRA_8888_SkColorType == ct || kRGBA_8888_SkColorType == ct);
     return kBGRA_8888_SkColorType == ct;

src/ports/SkFontHost_FreeType.cpp

@@ -8,7 +8,7 @@
 #include "SkAdvancedTypefaceMetrics.h"
 #include "SkBitmap.h"
 #include "SkCanvas.h"
-#include "SkColorPriv.h"
+#include "SkColorData.h"
 #include "SkDescriptor.h"
 #include "SkFDot6.h"
 #include "SkFontDescriptor.h"

src/ports/SkFontHost_FreeType_common.cpp

@@ -9,7 +9,7 @@
 #include "SkBitmap.h"
 #include "SkCanvas.h"
 #include "SkColor.h"
-#include "SkColorPriv.h"
+#include "SkColorData.h"
 #include "SkFDot6.h"
 #include "SkFontHost_FreeType_common.h"
 #include "SkPath.h"

src/ports/SkFontHost_mac.cpp

@@ -22,7 +22,7 @@
 #include "SkAdvancedTypefaceMetrics.h"
 #include "SkAutoMalloc.h"
 #include "SkCGUtils.h"
-#include "SkColorPriv.h"
+#include "SkColorData.h"
 #include "SkDescriptor.h"
 #include "SkEndian.h"
 #include "SkFloatingPoint.h"
@@ -1050,7 +1050,7 @@ void SkScalerContext_Mac::generateMetrics(SkGlyph* glyph) {
     glyph->fHeight = SkToU16(skIBounds.height());
 }
 
-#include "SkColorPriv.h"
+#include "SkColorData.h"
 
 static void build_power_table(uint8_t table[]) {
     for (int i = 0; i < 256; i++) {

src/ports/SkFontHost_win.cpp

@@ -10,7 +10,7 @@
 
 #include "SkAdvancedTypefaceMetrics.h"
 #include "SkBase64.h"
-#include "SkColorPriv.h"
+#include "SkColorData.h"
 #include "SkData.h"
 #include "SkDescriptor.h"
 #include "SkFontDescriptor.h"
@@ -1100,7 +1100,7 @@ static const uint8_t* getInverseGammaTableClearType() {
     return gTableClearType;
 }
 
-#include "SkColorPriv.h"
+#include "SkColorData.h"
 
 //Cannot assume that the input rgb is gray due to possible setting of kGenA8FromLCD_Flag.
 template<bool APPLY_PREBLEND>

src/ports/SkImageEncoder_CG.cpp

@@ -11,7 +11,7 @@
 
 #include "SkBitmap.h"
 #include "SkCGUtils.h"
-#include "SkColorPriv.h"
+#include "SkColorData.h"
 #include "SkData.h"
 #include "SkStream.h"
 #include "SkStreamPriv.h"

src/ports/SkScalerContext_win_dw.cpp

@@ -652,7 +652,7 @@ void SkScalerContext_DW::generateFontMetrics(SkPaint::FontMetrics* metrics) {
 
 ///////////////////////////////////////////////////////////////////////////////
 
-#include "SkColorPriv.h"
+#include "SkColorData.h"
 
 static void bilevel_to_bw(const uint8_t* SK_RESTRICT src, const SkGlyph& glyph) {
     const int width = glyph.fWidth;

src/shaders/SkComposeShader.cpp

@@ -9,7 +9,7 @@
 #include "SkBlendModePriv.h"
 #include "SkComposeShader.h"
 #include "SkColorFilter.h"
-#include "SkColorPriv.h"
+#include "SkColorData.h"
 #include "SkColorShader.h"
 #include "SkRasterPipeline.h"
 #include "SkReadBuffer.h"

src/shaders/gradients/SkGradientShaderPriv.h

@@ -14,7 +14,7 @@
 #include "SkArenaAlloc.h"
 #include "SkAutoMalloc.h"
 #include "SkClampRange.h"
-#include "SkColorPriv.h"
+#include "SkColorData.h"
 #include "SkColorSpace.h"
 #include "SkOnce.h"
 #include "SkPM4fPriv.h"

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"

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"
 

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"

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"

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;

tests/ColorPrivTest.cpp

@@ -1,6 +1,13 @@
+/*
+ * Copyright 2017 Google Inc.
+ *
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
+
 #include "Test.h"
 
-#include "SkColorPriv.h"
+#include "SkColorData.h"
 
 #define ASSERT(expr) REPORTER_ASSERT(r, expr)
 

tests/ColorTest.cpp

@@ -6,7 +6,7 @@
  */
 
 #include "SkColor.h"
-#include "SkColorPriv.h"
+#include "SkColorData.h"
 #include "SkMathPriv.h"
 #include "SkRandom.h"
 #include "SkUnPreMultiply.h"

tests/MathTest.cpp

@@ -5,7 +5,7 @@
  * found in the LICENSE file.
  */
 
-#include "SkColorPriv.h"
+#include "SkColorData.h"
 #include "SkEndian.h"
 #include "SkFDot6.h"
 #include "SkFixed.h"

tests/ReadPixelsTest.cpp

@@ -6,7 +6,7 @@
  */
 
 #include "SkCanvas.h"
-#include "SkColorPriv.h"
+#include "SkColorData.h"
 #include "SkColorSpace_Base.h"
 #include "SkHalf.h"
 #include "SkImageInfoPriv.h"

tests/SrcOverTest.cpp

@@ -5,7 +5,7 @@
  * found in the LICENSE file.
  */
 
-#include "SkColorPriv.h"
+#include "SkColorData.h"
 #include "Test.h"
 
 // our std SkAlpha255To256

tests/WritePixelsTest.cpp

@@ -6,7 +6,7 @@
  */
 
 #include "SkCanvas.h"
-#include "SkColorPriv.h"
+#include "SkColorData.h"
 #include "SkMathPriv.h"
 #include "SkSurface.h"
 #include "Test.h"