Title: [125929] trunk/Source/WebCore
- Revision
- 125929
- Author
- o...@chromium.org
- Date
- 2012-08-17 13:42:22 -0700 (Fri, 17 Aug 2012)
Log Message
Delete dead code in deprecated flexbox for RTL line-clamp
https://bugs.webkit.org/show_bug.cgi?id=94282
Reviewed by Tony Chang.
-webkit-line-clamp and direction:rtl is not supported. Delete some
obviously dead code that half-tries to support it.
* rendering/RenderDeprecatedFlexibleBox.cpp:
(WebCore::RenderDeprecatedFlexibleBox::applyLineClamp):
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (125928 => 125929)
--- trunk/Source/WebCore/ChangeLog 2012-08-17 20:22:20 UTC (rev 125928)
+++ trunk/Source/WebCore/ChangeLog 2012-08-17 20:42:22 UTC (rev 125929)
@@ -1,3 +1,15 @@
+2012-08-17 Ojan Vafai <o...@chromium.org>
+
+ Delete dead code in deprecated flexbox for RTL line-clamp
+ https://bugs.webkit.org/show_bug.cgi?id=94282
+
+ Reviewed by Tony Chang.
+
+ -webkit-line-clamp and direction:rtl is not supported. Delete some
+ obviously dead code that half-tries to support it.
+ * rendering/RenderDeprecatedFlexibleBox.cpp:
+ (WebCore::RenderDeprecatedFlexibleBox::applyLineClamp):
+
2012-08-17 John Mellor <joh...@chromium.org>
Text Autosizing: Increase line height in proportion to font size.
Modified: trunk/Source/WebCore/rendering/RenderDeprecatedFlexibleBox.cpp (125928 => 125929)
--- trunk/Source/WebCore/rendering/RenderDeprecatedFlexibleBox.cpp 2012-08-17 20:22:20 UTC (rev 125928)
+++ trunk/Source/WebCore/rendering/RenderDeprecatedFlexibleBox.cpp 2012-08-17 20:42:22 UTC (rev 125929)
@@ -964,14 +964,12 @@
continue;
LayoutUnit blockRightEdge = destBlock->logicalRightOffsetForLine(lastVisibleLine->y(), false);
- LayoutUnit blockLeftEdge = destBlock->logicalLeftOffsetForLine(lastVisibleLine->y(), false);
-
- LayoutUnit blockEdge = leftToRight ? blockRightEdge : blockLeftEdge;
- if (!lastVisibleLine->lineCanAccommodateEllipsis(leftToRight, blockEdge, lastVisibleLine->x() + lastVisibleLine->logicalWidth(), totalWidth))
+ if (!lastVisibleLine->lineCanAccommodateEllipsis(leftToRight, blockRightEdge, lastVisibleLine->x() + lastVisibleLine->logicalWidth(), totalWidth))
continue;
// Let the truncation code kick in.
// FIXME: the text alignment should be recomputed after the width changes due to truncation.
+ LayoutUnit blockLeftEdge = destBlock->logicalLeftOffsetForLine(lastVisibleLine->y(), false);
lastVisibleLine->placeEllipsis(anchorBox ? ellipsisAndSpaceStr : ellipsisStr, leftToRight, blockLeftEdge, blockRightEdge, totalWidth, anchorBox);
destBlock->setHasMarkupTruncation(true);
}
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
http://lists.webkit.org/mailman/listinfo/webkit-changes
