Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 6cead942 authored by Derek Sollenberger's avatar Derek Sollenberger Committed by Android (Google) Code Review
Browse files

Merge "Change from SkDeviceProperties to SkSurfaceProps."

parents 457672d5 0e9059b4

libs/hwui/font/Font.cpp

+5 −5
Original line number Original line Diff line number Diff line
@@ -19,7 +19,7 @@ 
#include <utils/JenkinsHash.h>

#include <utils/JenkinsHash.h>

#include <utils/Trace.h>

#include <utils/Trace.h>





#include <SkDeviceProperties.h>

#include <SkSurfaceProps.h>

#include <SkGlyph.h>

#include <SkGlyph.h>

#include <SkGlyphCache.h>

#include <SkGlyphCache.h>

#include <SkUtils.h>

#include <SkUtils.h>
@@ -281,8 +281,8 @@ CachedGlyphInfo* Font::getCachedGlyph(const SkPaint* paint, glyph_t textUnit, bo 
    if (cachedGlyph) {

    if (cachedGlyph) {

        // Is the glyph still in texture cache?

        // Is the glyph still in texture cache?

        if (!cachedGlyph->mIsValid) {

        if (!cachedGlyph->mIsValid) {

            SkDeviceProperties deviceProperties(kUnknown_SkPixelGeometry, 1.0f);

            SkSurfaceProps surfaceProps(0, kUnknown_SkPixelGeometry);

            SkAutoGlyphCache autoCache(*paint, &deviceProperties, &mDescription.mLookupTransform);

            SkAutoGlyphCacheNoGamma autoCache(*paint, &surfaceProps, &mDescription.mLookupTransform);

            const SkGlyph& skiaGlyph = GET_METRICS(autoCache.getCache(), textUnit);

            const SkGlyph& skiaGlyph = GET_METRICS(autoCache.getCache(), textUnit);

            updateGlyphCache(paint, skiaGlyph, autoCache.getCache(), cachedGlyph, precaching);

            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();

    CachedGlyphInfo* newGlyph = new CachedGlyphInfo();

    mCachedGlyphs.add(glyph, newGlyph);

    mCachedGlyphs.add(glyph, newGlyph);





    SkDeviceProperties deviceProperties(kUnknown_SkPixelGeometry, 1.0f);

    SkSurfaceProps surfaceProps(0, kUnknown_SkPixelGeometry);

    SkAutoGlyphCache autoCache(*paint, &deviceProperties, &mDescription.mLookupTransform);

    SkAutoGlyphCacheNoGamma autoCache(*paint, &surfaceProps, &mDescription.mLookupTransform);

    const SkGlyph& skiaGlyph = GET_METRICS(autoCache.getCache(), glyph);

    const SkGlyph& skiaGlyph = GET_METRICS(autoCache.getCache(), glyph);

    newGlyph->mIsValid = false;

    newGlyph->mIsValid = false;

    newGlyph->mGlyphIndex = skiaGlyph.fID;

    newGlyph->mGlyphIndex = skiaGlyph.fID;