aboutsummaryrefslogtreecommitdiffhomepage
path: root/src/ports
diff options
context:
space:
mode:
authorGravatar Ben Wagner <bungeman@google.com>2018-07-09 10:50:25 -0400
committerGravatar Skia Commit-Bot <skia-commit-bot@chromium.org>2018-07-09 15:37:17 +0000
commit7828b6201bd9b480eb090def5d81fb9b98b1926a (patch)
tree683bb0b4361611b1d6c4841e56149d6cde2a9614 /src/ports
parent73ff4cd14f03acd9d68bc94cf22fd3ac387297ba (diff)
Remove SK_IGNORE_WIN_EMOJI_FIX
This define has been rebaselined and is no longer used by any user. Remove it. Change-Id: I9a7bfa0d789d2bd9e7880237f0676535b29857f5 Reviewed-on: https://skia-review.googlesource.com/139767 Auto-Submit: Ben Wagner <bungeman@google.com> Commit-Queue: Herb Derby <herb@google.com> Reviewed-by: Herb Derby <herb@google.com>
Diffstat (limited to 'src/ports')
-rw-r--r--src/ports/SkScalerContext_win_dw.cpp6
1 files changed, 0 insertions, 6 deletions
diff --git a/src/ports/SkScalerContext_win_dw.cpp b/src/ports/SkScalerContext_win_dw.cpp
index a238562ebd..dac7d0c67e 100644
--- a/src/ports/SkScalerContext_win_dw.cpp
+++ b/src/ports/SkScalerContext_win_dw.cpp
@@ -599,14 +599,8 @@ void SkScalerContext_DW::generateMetrics(SkGlyph* glyph) {
if (fIsColorFont && isColorGlyph(*glyph)) {
glyph->fMaskFormat = SkMask::kARGB32_Format;
-
-#ifndef SK_IGNORE_WIN_EMOJI_FIX
-
generateColorMetrics(glyph);
return;
-
-#endif
-
}
RECT bbox;