Title: [108394] branches/subpixellayout/Source/WebCore/rendering
- Revision
- 108394
- Author
- [email protected]
- Date
- 2012-02-21 13:46:23 -0800 (Tue, 21 Feb 2012)
Log Message
Fixing the order of arguments to pixelSnappedIntRectFromEdges in RenderInline, and properly calculating the available logical width in RenderBlockLineLayout. Both of these were regressions from my previous commit.
Modified Paths
Diff
Modified: branches/subpixellayout/Source/WebCore/rendering/RenderBlockLineLayout.cpp (108393 => 108394)
--- branches/subpixellayout/Source/WebCore/rendering/RenderBlockLineLayout.cpp 2012-02-21 21:40:52 UTC (rev 108393)
+++ branches/subpixellayout/Source/WebCore/rendering/RenderBlockLineLayout.cpp 2012-02-21 21:46:23 UTC (rev 108394)
@@ -761,7 +761,7 @@
int snappedLeft, snappedRight;
pixelSnappedLogicalLeftAndRightOffsetsForLine(logicalHeight(), lineInfo.isFirstLine(), snappedLeft, snappedRight);
float logicalLeft = snappedLeft;
- float availableLogicalWidth = snappedRight;
+ float availableLogicalWidth = snappedRight - snappedLeft;
bool needsWordSpacing = false;
float totalLogicalWidth = lineBox->getFlowSpacingLogicalWidth();
Modified: branches/subpixellayout/Source/WebCore/rendering/RenderInline.cpp (108393 => 108394)
--- branches/subpixellayout/Source/WebCore/rendering/RenderInline.cpp 2012-02-21 21:40:52 UTC (rev 108393)
+++ branches/subpixellayout/Source/WebCore/rendering/RenderInline.cpp 2012-02-21 21:46:23 UTC (rev 108394)
@@ -1415,7 +1415,7 @@
LayoutUnit bottom = paintOffset.y() + thisline.maxY() + offset;
LayoutUnit right = paintOffset.x() + thisline.maxX() + offset;
- IntRect pixelSnappedBox = pixelSnappedIntRectFromEdges(top, left, bottom, right);
+ IntRect pixelSnappedBox = pixelSnappedIntRectFromEdges(left, top, right, bottom);
int snappedAndAdjustedNextLineLeft = roundToInt(paintOffset.x() + nextline.x());
int snappedAndAdjustedNextLineRight = snapSizeToPixel(nextline.width(), nextline.x() + paintOffset.x()) + snappedAndAdjustedNextLineLeft;
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
