diff options
| author |  Cary Clark <caryclark@skia.org> | 2017-09-15 11:59:23 -0400 |
|---|---|---|
| committer |  Skia Commit-Bot <skia-commit-bot@chromium.org> | 2017-09-15 16:31:35 +0000 |
| commit | a4083c97d48e8a4f88e2797d7363f141e3d42553 (patch) | |
| tree | ab01d3982edcf50b7d69dc3e4475568964daa5fe /src/ports | |
| parent | 3bf6366c6fc5d619358458e50909b60deb4cfe4a (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/ports')
| -rw-r--r-- | src/ports/SkFontHost_FreeType.cpp | 2 | ||||
| -rw-r--r-- | src/ports/SkFontHost_FreeType_common.cpp | 2 | ||||
| -rw-r--r-- | src/ports/SkFontHost_mac.cpp | 4 | ||||
| -rw-r--r-- | src/ports/SkFontHost_win.cpp | 4 | ||||
| -rw-r--r-- | src/ports/SkImageEncoder_CG.cpp | 2 | ||||
| -rw-r--r-- | src/ports/SkScalerContext_win_dw.cpp | 2 |
6 files changed, 8 insertions, 8 deletions
diff --git a/src/ports/SkFontHost_FreeType.cpp b/src/ports/SkFontHost_FreeType.cpp index f892438ca3..0f2ef15f63 100644 --- a/src/ports/SkFontHost_FreeType.cpp +++ b/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" diff --git a/src/ports/SkFontHost_FreeType_common.cpp b/src/ports/SkFontHost_FreeType_common.cpp index 864f75dee8..e027c8802f 100644 --- a/src/ports/SkFontHost_FreeType_common.cpp +++ b/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" diff --git a/src/ports/SkFontHost_mac.cpp b/src/ports/SkFontHost_mac.cpp index 9456f0366a..2564ab5b04 100644 --- a/src/ports/SkFontHost_mac.cpp +++ b/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++) { diff --git a/src/ports/SkFontHost_win.cpp b/src/ports/SkFontHost_win.cpp index 4a0aabede9..42785e9f1b 100644 --- a/src/ports/SkFontHost_win.cpp +++ b/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> diff --git a/src/ports/SkImageEncoder_CG.cpp b/src/ports/SkImageEncoder_CG.cpp index 8c2a542fc3..91827bd9bb 100644 --- a/src/ports/SkImageEncoder_CG.cpp +++ b/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" diff --git a/src/ports/SkScalerContext_win_dw.cpp b/src/ports/SkScalerContext_win_dw.cpp index a84e653f28..b7fbe8f171 100644 --- a/src/ports/SkScalerContext_win_dw.cpp +++ b/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; |