diff options
| author |  bungeman <bungeman@google.com> | 2016-07-15 18:49:42 -0700 |
|---|---|---|
| committer |  Commit bot <commit-bot@chromium.org> | 2016-07-15 18:49:42 -0700 |
| commit | 280d537e2893ee036c5e58e23438b12d30d634ee (patch) | |
| tree | 7dfb36ae1485faecfe8d1385ffc651097609f59c /src/ports/SkFontHost_FreeType_common.h | |
| parent | 6fc8ff024bd823f350400a86e7b9daa1c25f618e (diff) | |
Revert of Rotate emoji with FreeType. (patchset #5 id:80001 of https://codereview.chromium.org/2139703002/ )
Reason for revert:
Causing roll to fail on telemetry_perf_unittests (bencharks.system_health_smoke_test.SystemHealthBenchmarkSmokeTest.system_health.memory_desktop.load:search:taobao (and baidu)) and browser_tests (FindInPageControllerTest.FindInPageSpecialURLS).
This is due to triggering the assert in copyFTBitmap
SkASSERT(dstMask.fBounds.width() == static_cast<int>(srcFTBitmap.width));
when called from inside the block guarded by
if (bitmapTransform.isIdentity())
Original issue's description:
> Rotate bitmap strikes with FreeType.
>
> BUG=skia:3490
> GOLD_TRYBOT_URL= https://gold.skia.org/search?issue=2139703002
>
> Committed: https://skia.googlesource.com/skia/+/31e0c1379e6d0ce48196183e295b929af51fa74e
TBR=mtklein@google.com,reed@google.com
# Skipping CQ checks because original CL landed less than 1 days ago.
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true
BUG=skia:3490
Review-Url: https://codereview.chromium.org/2149253005
Diffstat (limited to 'src/ports/SkFontHost_FreeType_common.h')
| -rw-r--r-- | src/ports/SkFontHost_FreeType_common.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/ports/SkFontHost_FreeType_common.h b/src/ports/SkFontHost_FreeType_common.h index 6b50af27ab..3801453e22 100644 --- a/src/ports/SkFontHost_FreeType_common.h +++ b/src/ports/SkFontHost_FreeType_common.h @@ -31,8 +31,9 @@ protected: : INHERITED(typeface, effects, desc) {} - void generateGlyphImage(FT_Face face, const SkGlyph& glyph, const SkMatrix& bitmapTransform); + void generateGlyphImage(FT_Face face, const SkGlyph& glyph); void generateGlyphPath(FT_Face face, SkPath* path); + private: typedef SkScalerContext INHERITED; }; |