commit d24955ad3511a024206dd2ac893b52aa85d6cd30
author robertphillips <robertphillips@google.com> Fri Jun 26 12:17:59 2015 -0700
committer Commit bot <commit-bot@chromium.org> Fri Jun 26 12:17:59 2015 -0700
tree bd854f8d98ab4a3b940c2cc698532ad9005de7dc
parent 2766c00fc0b6a07d46e5f74cdad45da2ef625237

Make SkPaint::glyphsToUnichars use explicit SkSurfaceProps

BUG=skia:3984,skia:3934

Review URL: https://codereview.chromium.org/1211413003

src/core/SkPaint.cpp

diff --git a/src/core/SkPaint.cpp b/src/core/SkPaint.cpp
index b18ffa6..f40aeff 100644
--- a/src/core/SkPaint.cpp
+++ b/src/core/SkPaint.cpp
@@ -519,8 +519,7 @@
     return true;
 }
 
-void SkPaint::glyphsToUnichars(const uint16_t glyphs[], int count,
-                               SkUnichar textData[]) const {
+void SkPaint::glyphsToUnichars(const uint16_t glyphs[], int count, SkUnichar textData[]) const {
     if (count <= 0) {
         return;
     }
@@ -528,7 +527,8 @@
     SkASSERT(glyphs != NULL);
     SkASSERT(textData != NULL);
 
-    SkAutoGlyphCache autoCache(*this, NULL, NULL);
+    SkSurfaceProps props(0, kUnknown_SkPixelGeometry);
+    SkAutoGlyphCache autoCache(*this, &props, NULL);
     SkGlyphCache*    cache = autoCache.getCache();
 
     for (int index = 0; index < count; index++) {