Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(197)

Unified Diff: src/core/SkPaint.cpp

Issue 1211413003: Make SkPaint::glyphsToUnichars use explicit SkSurfaceProps (Closed) Base URL: https://skia.googlesource.com/skia.git@master
Patch Set: update Created 5 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « include/core/SkPaint.h ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: src/core/SkPaint.cpp
diff --git a/src/core/SkPaint.cpp b/src/core/SkPaint.cpp
index b18ffa65a79c18badf49e9efd6cbf611d24d8385..f40aeff727afe73551bfe0275bf04d22e143371a 100644
--- a/src/core/SkPaint.cpp
+++ b/src/core/SkPaint.cpp
@@ -519,8 +519,7 @@ bool SkPaint::containsText(const void* textData, size_t byteLength) const {
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 @@ void SkPaint::glyphsToUnichars(const uint16_t glyphs[], int count,
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++) {
« no previous file with comments | « include/core/SkPaint.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698