Remove support for disabling drawing of emoji
authorweinig@apple.com <weinig@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Sat, 31 Jan 2015 23:52:38 +0000 (23:52 +0000)
committerweinig@apple.com <weinig@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Sat, 31 Jan 2015 23:52:38 +0000 (23:52 +0000)
https://bugs.webkit.org/show_bug.cgi?id=141126

Reviewed by Antti Koivisto.

Remove unused support for disabling the drawing of emoji.

* WebCore.exp.in:
* platform/graphics/GraphicsContext.cpp:
(WebCore::GraphicsContext::emojiDrawingEnabled): Deleted.
(WebCore::GraphicsContext::setEmojiDrawingEnabled): Deleted.
* platform/graphics/GraphicsContext.h:
(WebCore::GraphicsContextState::GraphicsContextState):
* platform/graphics/cocoa/FontCascadeCocoa.mm:
(WebCore::FontCascade::drawGlyphs):

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@179451 268f45cc-cd09-0410-ab3c-d52691b4dbfc

Source/WebCore/ChangeLog
Source/WebCore/WebCore.exp.in
Source/WebCore/platform/graphics/GraphicsContext.cpp
Source/WebCore/platform/graphics/GraphicsContext.h
Source/WebCore/platform/graphics/cocoa/FontCascadeCocoa.mm

index 6456197..6df82ac 100644 (file)
@@ -1,5 +1,23 @@
 2015-01-31  Sam Weinig  <sam@webkit.org>
 
+        Remove support for disabling drawing of emoji
+        https://bugs.webkit.org/show_bug.cgi?id=141126
+
+        Reviewed by Antti Koivisto.
+
+        Remove unused support for disabling the drawing of emoji.
+
+        * WebCore.exp.in:
+        * platform/graphics/GraphicsContext.cpp:
+        (WebCore::GraphicsContext::emojiDrawingEnabled): Deleted.
+        (WebCore::GraphicsContext::setEmojiDrawingEnabled): Deleted.
+        * platform/graphics/GraphicsContext.h:
+        (WebCore::GraphicsContextState::GraphicsContextState):
+        * platform/graphics/cocoa/FontCascadeCocoa.mm:
+        (WebCore::FontCascade::drawGlyphs):
+
+2015-01-31  Sam Weinig  <sam@webkit.org>
+
         Remove even more Mountain Lion support
         https://bugs.webkit.org/show_bug.cgi?id=141124
 
index db410a6..cf49ff8 100644 (file)
@@ -2701,7 +2701,6 @@ __ZN7WebCore15DatabaseTracker38emptyDatabaseFilesRemovalTaskDidFinishEv
 __ZN7WebCore15DatabaseTracker44emptyDatabaseFilesRemovalTaskWillBeScheduledEv
 __ZN7WebCore15DatabaseTracker7trackerEv
 __ZN7WebCore15GraphicsContext15drawLineForTextERKNS_10FloatPointEfbb
-__ZN7WebCore15GraphicsContext22setEmojiDrawingEnabledEb
 __ZN7WebCore15GraphicsContext23setIsAcceleratedContextEb
 __ZN7WebCore15LegacyTileCache14drainLayerPoolEv
 __ZN7WebCore15LegacyTileCache20setLayerPoolCapacityEj
index a371066..3b76f2e 100644 (file)
@@ -749,18 +749,6 @@ BlendMode GraphicsContext::blendModeOperation() const
     return m_state.blendMode;
 }
 
-#if PLATFORM(IOS)
-bool GraphicsContext::emojiDrawingEnabled()
-{
-    return m_state.emojiDrawingEnabled;
-}
-
-void GraphicsContext::setEmojiDrawingEnabled(bool emojiDrawingEnabled)
-{
-    m_state.emojiDrawingEnabled = emojiDrawingEnabled;
-}
-#endif
-
 void GraphicsContext::setDrawLuminanceMask(bool drawLuminanceMask)
 {
     m_state.drawLuminanceMask = drawLuminanceMask;
index b1ae6b9..5418666 100644 (file)
@@ -128,9 +128,6 @@ namespace WebCore {
             , shadowColorSpace(ColorSpaceDeviceRGB)
             , compositeOperator(CompositeSourceOver)
             , blendMode(BlendModeNormal)
-#if PLATFORM(IOS)
-            , emojiDrawingEnabled(true)
-#endif
             , shouldAntialias(true)
             , shouldSmoothFonts(true)
             , shouldSubpixelQuantizeFonts(true)
@@ -172,9 +169,6 @@ namespace WebCore {
         CompositeOperator compositeOperator;
         BlendMode blendMode;
 
-#if PLATFORM(IOS)
-        bool emojiDrawingEnabled : 1;
-#endif
         bool shouldAntialias : 1;
         bool shouldSmoothFonts : 1;
         bool shouldSubpixelQuantizeFonts : 1;
@@ -349,11 +343,6 @@ namespace WebCore {
 
         TextDrawingModeFlags textDrawingMode() const;
         void setTextDrawingMode(TextDrawingModeFlags);
-
-#if PLATFORM(IOS)
-        bool emojiDrawingEnabled();
-        WEBCORE_EXPORT void setEmojiDrawingEnabled(bool);
-#endif
         
 #if !PLATFORM(IOS)
         void drawText(const FontCascade&, const TextRun&, const FloatPoint&, int from = 0, int to = -1);
index c6eca45..29dc81c 100644 (file)
@@ -259,9 +259,6 @@ void FontCascade::drawGlyphs(GraphicsContext* context, const Font* font, const G
     float fontSize = platformData.size();
     CGAffineTransform matrix = useLetterpressEffect || platformData.isColorBitmapFont() ? CGAffineTransformIdentity : CGAffineTransformMakeScale(fontSize, fontSize);
     if (platformData.m_isEmoji) {
-        if (!context->emojiDrawingEnabled())
-            return;
-
         // Mimic the positioining of non-bitmap glyphs, which are not subpixel-positioned.
         point.setY(ceilf(point.y()));