Changeset 176534 in webkit

Timestamp:

Nov 24, 2014, 7:47:57 PM (12 years ago)

Author:

Alan Bujtas

Message:

Fix r176527. Iterate through the text renderers.
​https://bugs.webkit.org/show_bug.cgi?id=139007

Reviewed by Antti Koivisto.

• rendering/SimpleLineLayout.cpp:

(WebCore::SimpleLineLayout::canUseFor):

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• rendering/SimpleLineLayout.cpp (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2014-11-24  Zalan Bujtas  <zalan@apple.com>
+
+        Fix r176527. Iterate through the text renderers.
+        https://bugs.webkit.org/show_bug.cgi?id=139007
+
+        Reviewed by Antti Koivisto.
+
+        * rendering/SimpleLineLayout.cpp:
+        (WebCore::SimpleLineLayout::canUseFor):
+
 2014-11-24  Zalan Bujtas  <zalan@apple.com>
 

trunk/Source/WebCore/rendering/SimpleLineLayout.cpp

@@ -168 +168 @@
     if (flow.containsFloats()) {
         float minimumWidthNeeded = std::numeric_limits<float>::max();
-        for (const auto& textRenderer : childrenOfType<RenderText>(flow))
+        for (const auto& textRenderer : childrenOfType<RenderText>(flow)) {
             minimumWidthNeeded = std::min(minimumWidthNeeded, textRenderer.minLogicalWidth());
 
-        for (auto& floatRenderer : *flow.floatingObjectSet()) {
-            ASSERT(floatRenderer);
-            float availableWidth = flow.availableLogicalWidthForLine(floatRenderer->y(), false);
-            if (availableWidth < minimumWidthNeeded)
-                return false;
+            for (auto& floatRenderer : *flow.floatingObjectSet()) {
+                ASSERT(floatRenderer);
+                float availableWidth = flow.availableLogicalWidthForLine(floatRenderer->y(), false);
+                if (availableWidth < minimumWidthNeeded)
+                    return false;
+            }
         }
     }