From e817dbb889b6ef1a811c2c3e6b405ad5c11d6758 Mon Sep 17 00:00:00 2001 From: jvanverth Date: Fri, 10 Oct 2014 08:52:03 -0700 Subject: 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 --- expectations/gm/ignored-tests.txt | 4 ---- 1 file changed, 4 deletions(-) (limited to 'expectations') diff --git a/expectations/gm/ignored-tests.txt b/expectations/gm/ignored-tests.txt index 27182c904a..5793ba217b 100644 --- a/expectations/gm/ignored-tests.txt +++ b/expectations/gm/ignored-tests.txt @@ -33,10 +33,6 @@ ## epoger will rebaseline by 25 Dec 2013 #gradtext -# jvanverth -# color emoji fix -coloremoji - # rileya - https://codereview.chromium.org/516463005/ will rebaseline after bots cycle yuv_to_rgb_effect -- cgit v1.2.3