diff options
| author |  reed <reed@google.com> | 2015-05-12 09:50:04 -0700 |
|---|---|---|
| committer |  Commit bot <commit-bot@chromium.org> | 2015-05-12 09:50:04 -0700 |
| commit | 39a9a5069b25aa8b9529118cfd0ece5f412fb56b (patch) | |
| tree | 6857910652952189574c5f3df7425b06db7caed9 /src/fonts | |
| parent | 67d71c898249a7af3523b16c6a69895a63bfae0a (diff) | |
Make SkAdvancedTypefaceMetrics private.
Review URL: https://codereview.chromium.org/1129283003
Diffstat (limited to 'src/fonts')
| -rw-r--r-- | src/fonts/SkGScalerContext.cpp | 2 | ||||
| -rw-r--r-- | src/fonts/SkGScalerContext.h | 2 | ||||
| -rw-r--r-- | src/fonts/SkTestScalerContext.cpp | 3 | ||||
| -rw-r--r-- | src/fonts/SkTestScalerContext.h | 2 |
4 files changed, 5 insertions, 4 deletions
diff --git a/src/fonts/SkGScalerContext.cpp b/src/fonts/SkGScalerContext.cpp index 17eee82a13..5787478cec 100644 --- a/src/fonts/SkGScalerContext.cpp +++ b/src/fonts/SkGScalerContext.cpp @@ -178,7 +178,7 @@ void SkGTypeface::onFilterRec(SkScalerContextRec* rec) const { } SkAdvancedTypefaceMetrics* SkGTypeface::onGetAdvancedTypefaceMetrics( - SkAdvancedTypefaceMetrics::PerGlyphInfo info, + PerGlyphInfo info, const uint32_t* glyphIDs, uint32_t glyphIDsCount) const { return fProxy->getAdvancedTypefaceMetrics(info, glyphIDs, glyphIDsCount); diff --git a/src/fonts/SkGScalerContext.h b/src/fonts/SkGScalerContext.h index e0f32625cd..75f3ebedbd 100644 --- a/src/fonts/SkGScalerContext.h +++ b/src/fonts/SkGScalerContext.h @@ -23,7 +23,7 @@ protected: SkScalerContext* onCreateScalerContext(const SkDescriptor*) const override; void onFilterRec(SkScalerContextRec*) const override; SkAdvancedTypefaceMetrics* onGetAdvancedTypefaceMetrics( - SkAdvancedTypefaceMetrics::PerGlyphInfo, + PerGlyphInfo, const uint32_t* glyphIDs, uint32_t glyphIDsCount) const override; SkStreamAsset* onOpenStream(int* ttcIndex) const override; diff --git a/src/fonts/SkTestScalerContext.cpp b/src/fonts/SkTestScalerContext.cpp index 733e95fdb8..8ff9f4323b 100644 --- a/src/fonts/SkTestScalerContext.cpp +++ b/src/fonts/SkTestScalerContext.cpp @@ -5,6 +5,7 @@ * found in the LICENSE file. */ +#include "SkAdvancedTypefaceMetrics.h" #include "SkBitmap.h" #include "SkCanvas.h" #include "SkDescriptor.h" @@ -140,7 +141,7 @@ void SkTestTypeface::onFilterRec(SkScalerContextRec* rec) const { } SkAdvancedTypefaceMetrics* SkTestTypeface::onGetAdvancedTypefaceMetrics( - SkAdvancedTypefaceMetrics::PerGlyphInfo , + PerGlyphInfo , const uint32_t* glyphIDs, uint32_t glyphIDsCount) const { // pdf only diff --git a/src/fonts/SkTestScalerContext.h b/src/fonts/SkTestScalerContext.h index 573a3df212..1d4b89ae17 100644 --- a/src/fonts/SkTestScalerContext.h +++ b/src/fonts/SkTestScalerContext.h @@ -69,7 +69,7 @@ protected: SkScalerContext* onCreateScalerContext(const SkDescriptor* desc) const override; void onFilterRec(SkScalerContextRec* rec) const override; SkAdvancedTypefaceMetrics* onGetAdvancedTypefaceMetrics( - SkAdvancedTypefaceMetrics::PerGlyphInfo, + PerGlyphInfo, const uint32_t* glyphIDs, uint32_t glyphIDsCount) const override; |