Title: [176534] trunk/Source/WebCore
- Revision
- 176534
- Author
- [email protected]
- Date
- 2014-11-24 19:47:57 -0800 (Mon, 24 Nov 2014)
Log 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):
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (176533 => 176534)
--- trunk/Source/WebCore/ChangeLog 2014-11-25 02:40:06 UTC (rev 176533)
+++ trunk/Source/WebCore/ChangeLog 2014-11-25 03:47:57 UTC (rev 176534)
@@ -1,5 +1,15 @@
2014-11-24 Zalan Bujtas <[email protected]>
+ 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 <[email protected]>
+
Simple line layout: Rename TextFragment::mustBreak to TextFragment::isLineBreak
https://bugs.webkit.org/show_bug.cgi?id=139035
Modified: trunk/Source/WebCore/rendering/SimpleLineLayout.cpp (176533 => 176534)
--- trunk/Source/WebCore/rendering/SimpleLineLayout.cpp 2014-11-25 02:40:06 UTC (rev 176533)
+++ trunk/Source/WebCore/rendering/SimpleLineLayout.cpp 2014-11-25 03:47:57 UTC (rev 176534)
@@ -167,14 +167,15 @@
// 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()) {
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;
+ }
}
}
if (style.font().primaryFont()->isSVGFont())
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
