Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Change from SkDeviceProperties to SkSurfaceProps."

Browse Source
This commit is contained in:
Derek Sollenberger
2015-07-27 13:51:32 +00:00
committed by Android (Google) Code Review
parent 457672d5f0 0e9059b454
commit 6cead94206
1 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
libs/hwui/font/Font.cpp
View File

@@ -19,7 +19,7 @@
#include <utils/JenkinsHash.h>
#include <utils/Trace.h>
#include <SkDeviceProperties.h>
#include <SkSurfaceProps.h>
#include <SkGlyph.h>
#include <SkGlyphCache.h>
#include <SkUtils.h>
@@ -281,8 +281,8 @@ CachedGlyphInfo* Font::getCachedGlyph(const SkPaint* paint, glyph_t textUnit, bo
if (cachedGlyph) {
// Is the glyph still in texture cache?
if (!cachedGlyph->mIsValid) {
SkDeviceProperties deviceProperties(kUnknown_SkPixelGeometry, 1.0f);
SkAutoGlyphCache autoCache(*paint, &deviceProperties, &mDescription.mLookupTransform);
SkSurfaceProps surfaceProps(0, kUnknown_SkPixelGeometry);
SkAutoGlyphCacheNoGamma autoCache(*paint, &surfaceProps, &mDescription.mLookupTransform);
const SkGlyph& skiaGlyph = GET_METRICS(autoCache.getCache(), textUnit);
updateGlyphCache(paint, skiaGlyph, autoCache.getCache(), cachedGlyph, precaching);
}
@@ -472,8 +472,8 @@ CachedGlyphInfo* Font::cacheGlyph(const SkPaint* paint, glyph_t glyph, bool prec
CachedGlyphInfo* newGlyph = new CachedGlyphInfo();
mCachedGlyphs.add(glyph, newGlyph);
SkDeviceProperties deviceProperties(kUnknown_SkPixelGeometry, 1.0f);
SkAutoGlyphCache autoCache(*paint, &deviceProperties, &mDescription.mLookupTransform);
SkSurfaceProps surfaceProps(0, kUnknown_SkPixelGeometry);
SkAutoGlyphCacheNoGamma autoCache(*paint, &surfaceProps, &mDescription.mLookupTransform);
const SkGlyph& skiaGlyph = GET_METRICS(autoCache.getCache(), glyph);
newGlyph->mIsValid = false;
newGlyph->mGlyphIndex = skiaGlyph.fID;