diff options
| author |  jvanverth <jvanverth@google.com> | 2014-10-10 08:52:03 -0700 |
|---|---|---|
| committer |  Commit bot <commit-bot@chromium.org> | 2014-10-10 08:52:03 -0700 |
| commit | e817dbb889b6ef1a811c2c3e6b405ad5c11d6758 (patch) | |
| tree | 443a1c6aa07e630f2700fced76687efbfd85effb /include | |
| parent | bc92163ddfe957ad6ffbb02ac40e0ba75ff82216 (diff) | |
Revert of Fix color emoji. (patchset #11 id:320001 of https://codereview.chromium.org/636183005/)
Reason for revert:
Crashing the Windows bots.
Original issue's description:
> Fix color emoji.
>
> Removes the GrMaskFormat and single atlas in GrTextStrike.
> Replaces it by storing the GrMaskFormat in each GrGlyph, and
> doing a lookup for the correct atlas based on that.
>
> Disables color glyph rendering in GrDistanceFieldTextContext
> for now.
>
> BUG=skia:2887
>
> Committed: https://skia.googlesource.com/skia/+/bc92163ddfe957ad6ffbb02ac40e0ba75ff82216
TBR=robertphillips@google.com,bungeman@google.com,reed@google.com,bsalomon@google.com
NOTREECHECKS=true
NOTRY=true
BUG=skia:2887
Review URL: https://codereview.chromium.org/640413004
Diffstat (limited to 'include')
| -rw-r--r-- | include/gpu/GrFontScaler.h | 3 | ||||
| -rw-r--r-- | include/gpu/GrGlyph.h | 18 |
2 files changed, 8 insertions, 13 deletions
diff --git a/include/gpu/GrFontScaler.h b/include/gpu/GrFontScaler.h index 54d1e3f9cc..0376038135 100644 --- a/include/gpu/GrFontScaler.h +++ b/include/gpu/GrFontScaler.h @@ -66,8 +66,7 @@ public: virtual ~GrFontScaler(); const GrFontDescKey* getKey(); - GrMaskFormat getMaskFormat() const; - GrMaskFormat getPackedGlyphMaskFormat(GrGlyph::PackedID) const; + GrMaskFormat getMaskFormat(); bool getPackedGlyphBounds(GrGlyph::PackedID, SkIRect* bounds); bool getPackedGlyphImage(GrGlyph::PackedID, int width, int height, int rowBytes, void* image); diff --git a/include/gpu/GrGlyph.h b/include/gpu/GrGlyph.h index 0e534d694a..a379144a42 100644 --- a/include/gpu/GrGlyph.h +++ b/include/gpu/GrGlyph.h @@ -9,10 +9,8 @@ #define GrGlyph_DEFINED #include "GrRect.h" -#include "GrTypes.h" - -#include "SkChecksum.h" #include "SkPath.h" +#include "SkChecksum.h" class GrPlot; @@ -25,19 +23,17 @@ class GrPlot; struct GrGlyph { typedef uint32_t PackedID; - GrPlot* fPlot; - SkPath* fPath; - PackedID fPackedID; - GrMaskFormat fMaskFormat; - GrIRect16 fBounds; - SkIPoint16 fAtlasLocation; + GrPlot* fPlot; + SkPath* fPath; + PackedID fPackedID; + GrIRect16 fBounds; + SkIPoint16 fAtlasLocation; - void init(GrGlyph::PackedID packed, const SkIRect& bounds, GrMaskFormat format) { + void init(GrGlyph::PackedID packed, const SkIRect& bounds) { fPlot = NULL; fPath = NULL; fPackedID = packed; fBounds.set(bounds); - fMaskFormat = format; fAtlasLocation.set(0, 0); } |