Changeset 176527 in webkit

Timestamp:

Nov 24, 2014, 4:10:17 PM (12 years ago)

Author:

Alan Bujtas

Message:

SimpleLineLayout::canUseFor() should iterate through RenderTexts to check if their content is eligible for simple line layout.
​https://bugs.webkit.org/show_bug.cgi?id=139007

Reviewed by Antti Koivisto.

Source/WebCore:

Tests: fast/text/simple-line-layout-multiple-renderers-non-breaking-space.html

fast/text/simple-line-layout-multiple-renderers-with-float.html

• rendering/SimpleLineLayout.cpp:

(WebCore::SimpleLineLayout::canUseFor):

LayoutTests:

• fast/text/simple-line-layout-multiple-renderers-non-breaking-space-expected.html: Added.
• fast/text/simple-line-layout-multiple-renderers-non-breaking-space.html: Added.
• fast/text/simple-line-layout-multiple-renderers-with-float-expected.html: Added.
• fast/text/simple-line-layout-multiple-renderers-with-float.html: Added.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/fast/text/simple-line-layout-multiple-renderers-non-breaking-space-expected.html (added)
• LayoutTests/fast/text/simple-line-layout-multiple-renderers-non-breaking-space.html (added)
• LayoutTests/fast/text/simple-line-layout-multiple-renderers-with-float-expected.html (added)
• LayoutTests/fast/text/simple-line-layout-multiple-renderers-with-float.html (added)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/rendering/SimpleLineLayout.cpp (modified) (2 diffs)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2014-11-24  Zalan Bujtas  <zalan@apple.com>
+
+        SimpleLineLayout::canUseFor() should iterate through RenderTexts to check if their content is eligible for simple line layout.
+        https://bugs.webkit.org/show_bug.cgi?id=139007
+
+        Reviewed by Antti Koivisto.
+
+        * fast/text/simple-line-layout-multiple-renderers-non-breaking-space-expected.html: Added.
+        * fast/text/simple-line-layout-multiple-renderers-non-breaking-space.html: Added.
+        * fast/text/simple-line-layout-multiple-renderers-with-float-expected.html: Added.
+        * fast/text/simple-line-layout-multiple-renderers-with-float.html: Added.
+
 2014-11-24  Zalan Bujtas  <zalan@apple.com>
 

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2014-11-24  Zalan Bujtas  <zalan@apple.com>
+
+        SimpleLineLayout::canUseFor() should iterate through RenderTexts to check if their content is eligible for simple line layout.
+        https://bugs.webkit.org/show_bug.cgi?id=139007
+
+        Reviewed by Antti Koivisto.
+
+        Tests: fast/text/simple-line-layout-multiple-renderers-non-breaking-space.html
+               fast/text/simple-line-layout-multiple-renderers-with-float.html
+
+        * rendering/SimpleLineLayout.cpp:
+        (WebCore::SimpleLineLayout::canUseFor):
+
 2014-11-22  Sam Weinig  <sam@webkit.org>
 

trunk/Source/WebCore/rendering/SimpleLineLayout.cpp

@@ -164 +164 @@
     if (style.lineBreak() != LineBreakAuto)
         return false;
-    const RenderText& textRenderer = downcast<RenderText>(*flow.firstChild());
+
+    // We can't use the code path if any lines would need to be shifted below floats. This is because we don't keep per-line y coordinates.
     if (flow.containsFloats()) {
-        // We can't use the code path if any lines would need to be shifted below floats. This is because we don't keep per-line y coordinates.
-        float minimumWidthNeeded = textRenderer.minLogicalWidth();
+        float minimumWidthNeeded = std::numeric_limits<float>::max();
+        for (const auto& textRenderer : childrenOfType<RenderText>(flow))
+            minimumWidthNeeded = std::min(minimumWidthNeeded, textRenderer.minLogicalWidth());
+
         for (auto& floatRenderer : *flow.floatingObjectSet()) {
             ASSERT(floatRenderer);
@@ -175 +178 @@
         }
     }
-    if (textRenderer.isCombineText() || textRenderer.isCounter() || textRenderer.isQuote() || textRenderer.isTextFragment()
-        || textRenderer.isSVGInlineText())
-        return false;
-    if (style.font().codePath(TextRun(textRenderer.text())) != Font::Simple)
-        return false;
     if (style.font().primaryFont()->isSVGFont())
         return false;
-
     // We assume that all lines have metrics based purely on the primary font.
     auto& primaryFontData = *style.font().primaryFont();
     if (primaryFontData.isLoading())
         return false;
-    if (!canUseForText(textRenderer, primaryFontData))
-        return false;
-
+    for (const auto& textRenderer : childrenOfType<RenderText>(flow)) {
+        if (textRenderer.isCombineText() || textRenderer.isCounter() || textRenderer.isQuote() || textRenderer.isTextFragment()
+            || textRenderer.isSVGInlineText())
+            return false;
+        if (style.font().codePath(TextRun(textRenderer.text())) != Font::Simple)
+            return false;
+        if (!canUseForText(textRenderer, primaryFontData))
+            return false;
+    }
     return true;
 }