Title: [108546] branches/subpixellayout/Source/WebCore/rendering/RenderMarquee.cpp
- Revision
- 108546
- Author
- le...@chromium.org
- Date
- 2012-02-22 13:24:31 -0800 (Wed, 22 Feb 2012)
Log Message
Fixing a merge artifact in RenderMarquee.
Modified Paths
Diff
Modified: branches/subpixellayout/Source/WebCore/rendering/RenderMarquee.cpp (108545 => 108546)
--- branches/subpixellayout/Source/WebCore/rendering/RenderMarquee.cpp 2012-02-22 21:23:56 UTC (rev 108545)
+++ branches/subpixellayout/Source/WebCore/rendering/RenderMarquee.cpp 2012-02-22 21:24:31 UTC (rev 108546)
@@ -116,7 +116,7 @@
if (isHorizontal()) {
bool ltr = s->isLeftToRightDirection();
LayoutUnit clientWidth = box->clientWidth();
- LayoutUnit contentWidth = ltr ? box->maxXLayoutOverflow() : box->minXLayoutOverflow();
+ LayoutUnit contentWidth = ltr ? box->maxPreferredLogicalWidth() : box->minPreferredLogicalWidth();
if (ltr)
contentWidth += (box->paddingRight() - box->borderLeft());
else {
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
