Changeset 189466 in webkit

Timestamp:

Sep 7, 2015, 11:26:46 AM (10 years ago)

Author:

Antti Koivisto

Message:

Remove GlyphPage::mayUseMixedFontsWhenFilling
​https://bugs.webkit.org/show_bug.cgi?id=148928

Reviewed by Dan Bernstein.

​http://trac.webkit.org/188566 removed support for composite fonts. We never need to use mixed
glyph pages for fonts anymore.

• platform/graphics/Font.cpp:

(WebCore::createAndFillGlyphPage):

• platform/graphics/GlyphPage.h:

(WebCore::GlyphPage::GlyphPage):
(WebCore::GlyphPage::mayUseMixedFontsWhenFilling): Deleted.

• platform/graphics/mac/GlyphPageMac.cpp:

(WebCore::shouldUseCoreText):
(WebCore::GlyphPage::fill):
(WebCore::GlyphPage::mayUseMixedFontsWhenFilling): Deleted.

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• platform/graphics/Font.cpp (modified) (1 diff)
• platform/graphics/GlyphPage.h (modified) (1 diff)
• platform/graphics/mac/GlyphPageMac.cpp (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2015-09-07  Antti Koivisto  <antti@apple.com>
+
+        Remove GlyphPage::mayUseMixedFontsWhenFilling
+        https://bugs.webkit.org/show_bug.cgi?id=148928
+
+        Reviewed by Dan Bernstein.
+
+        http://trac.webkit.org/188566 removed support for composite fonts. We never need to use mixed
+        glyph pages for fonts anymore.
+
+        * platform/graphics/Font.cpp:
+        (WebCore::createAndFillGlyphPage):
+        * platform/graphics/GlyphPage.h:
+        (WebCore::GlyphPage::GlyphPage):
+        (WebCore::GlyphPage::mayUseMixedFontsWhenFilling): Deleted.
+        * platform/graphics/mac/GlyphPageMac.cpp:
+        (WebCore::shouldUseCoreText):
+        (WebCore::GlyphPage::fill):
+        (WebCore::GlyphPage::mayUseMixedFontsWhenFilling): Deleted.
+
 2015-09-07  Antti Koivisto  <antti@apple.com>
 

trunk/Source/WebCore/platform/graphics/Font.cpp

@@ -227 +227 @@
     // Success is not guaranteed. For example, Times fails to fill page 260, giving glyph data
     // for only 128 out of 256 characters.
-    RefPtr<GlyphPage> glyphPage;
-    if (GlyphPage::mayUseMixedFontsWhenFilling(buffer, bufferLength, font))
-        glyphPage = GlyphPage::createForMixedFonts();
-    else
-        glyphPage = GlyphPage::createForSingleFont(font);
+    RefPtr<GlyphPage> glyphPage = GlyphPage::createForSingleFont(font);
 
     bool haveGlyphs = fillGlyphPage(*glyphPage, buffer, bufferLength, font);

trunk/Source/WebCore/platform/graphics/GlyphPage.h

@@ -158 +158 @@
     // Implemented by the platform.
     bool fill(UChar* characterBuffer, unsigned bufferLength, const Font*);
-#if PLATFORM(COCOA)
-    static bool mayUseMixedFontsWhenFilling(const UChar* characterBuffer, unsigned bufferLength, const Font*);
-#else
-    static bool mayUseMixedFontsWhenFilling(const UChar*, unsigned, const Font*) { return false; }
-#endif
 
 private:

trunk/Source/WebCore/platform/graphics/mac/GlyphPageMac.cpp

@@ -59 +59 @@
 }
 
-bool GlyphPage::mayUseMixedFontsWhenFilling(const UChar* buffer, unsigned bufferLength, const Font* fontData)
-{
-#if USE(APPKIT)
-    // FIXME: This is only really needed for composite font references.
-    return shouldUseCoreText(buffer, bufferLength, fontData);
-#else
-    UNUSED_PARAM(buffer);
-    UNUSED_PARAM(bufferLength);
-    UNUSED_PARAM(fontData);
-    return false;
-#endif
-}
-
 bool GlyphPage::fill(UChar* buffer, unsigned bufferLength, const Font* fontData)
 {