Changeset 158012 in webkit

Timestamp:

Oct 25, 2013, 8:58:24 AM (12 years ago)

Author:

Antti Koivisto

Message:

Faster way for simple line layout to check if text has fallback fonts
​https://bugs.webkit.org/show_bug.cgi?id=123342

Reviewed by Andreas Kling.

Don't use RenderText::knownToHaveNoOverflowAndNoFallbackFonts as it is slow.

Simple text code path test already guarantees there is no overflow. Test for fallback
fonts explicitly.

• platform/graphics/SimpleFontData.h:

Make FINAL.

• rendering/RenderText.cpp:
• rendering/RenderText.h:

Remove knownToHaveNoOverflowAndNoFallbackFonts() as it has no clients.

• rendering/SimpleLineLayout.cpp:

(WebCore::SimpleLineLayout::canUseFor):

Check if all characters can be found from the primary font.

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• platform/graphics/SimpleFontData.h (modified) (1 diff)
• rendering/RenderText.cpp (modified) (1 diff)
• rendering/RenderText.h (modified) (1 diff)
• rendering/SimpleLineLayout.cpp (modified) (2 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2013-10-25  Antti Koivisto  <antti@apple.com>
+
+        Faster way for simple line layout to check if text has fallback fonts
+        https://bugs.webkit.org/show_bug.cgi?id=123342
+
+        Reviewed by Andreas Kling.
+        
+        Don't use RenderText::knownToHaveNoOverflowAndNoFallbackFonts as it is slow.
+
+        Simple text code path test already guarantees there is no overflow. Test for fallback
+        fonts explicitly.
+
+        * platform/graphics/SimpleFontData.h:
+        
+            Make FINAL.
+
+        * rendering/RenderText.cpp:
+        * rendering/RenderText.h:
+        
+            Remove knownToHaveNoOverflowAndNoFallbackFonts() as it has no clients.
+
+        * rendering/SimpleLineLayout.cpp:
+        (WebCore::SimpleLineLayout::canUseFor):
+        
+            Check if all characters can be found from the primary font.
+
 2013-10-25  Andreas Kling  <akling@apple.com>
 

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

@@ -66 +66 @@
 enum Pitch { UnknownPitch, FixedPitch, VariablePitch };
 
-class SimpleFontData : public FontData {
+class SimpleFontData FINAL : public FontData {
 public:
     class AdditionalFontData {

trunk/Source/WebCore/rendering/RenderText.cpp

@@ -511 +511 @@
 }
 
-bool RenderText::knownToHaveNoOverflowAndNoFallbackFonts() const
-{
-    if (preferredLogicalWidthsDirty())
-        const_cast<RenderText*>(this)->computePreferredLogicalWidths(0);
-
-    return m_knownToHaveNoOverflowAndNoFallbackFonts;
-}
-
 void RenderText::computePreferredLogicalWidths(float leadWidth)
 {

trunk/Source/WebCore/rendering/RenderText.h

@@ -141 +141 @@
 
     bool canUseSimpleFontCodePath() const { return m_canUseSimpleFontCodePath; }
-    bool knownToHaveNoOverflowAndNoFallbackFonts() const;
 
     void removeAndDestroyTextBoxes();

trunk/Source/WebCore/rendering/SimpleLineLayout.cpp

@@ -149 +149 @@
     if (style.font().codePath(TextRun(textRenderer.text())) != Font::Simple)
         return false;
-    if (!textRenderer.knownToHaveNoOverflowAndNoFallbackFonts())
-        return false;
+
+    auto primaryFontData = style.font().primaryFont();
 
     unsigned length = textRenderer.textLength();
@@ -179 +179 @@
                 return false;
         }
+        if (!primaryFontData->glyphForCharacter(character))
+            return false;
     }
     return true;