Title: [109971] branches/subpixellayout/Source/WebCore/rendering
- Revision
- 109971
- Author
- [email protected]
- Date
- 2012-03-06 16:08:33 -0800 (Tue, 06 Mar 2012)
Log Message
Reverting LineWidth left and right to int, and fixing flex-hang by ignoring remaining space that's less than a pixel.
Modified Paths
Diff
Modified: branches/subpixellayout/Source/WebCore/rendering/RenderBlockLineLayout.cpp (109970 => 109971)
--- branches/subpixellayout/Source/WebCore/rendering/RenderBlockLineLayout.cpp 2012-03-07 00:07:12 UTC (rev 109970)
+++ branches/subpixellayout/Source/WebCore/rendering/RenderBlockLineLayout.cpp 2012-03-07 00:08:33 UTC (rev 109971)
@@ -98,7 +98,7 @@
private:
void computeAvailableWidthFromLeftAndRight()
{
- m_availableWidth = max(zeroLayoutUnit, m_right - m_left) + m_overhangWidth;
+ m_availableWidth = max(0, m_right - m_left) + m_overhangWidth;
}
private:
@@ -106,8 +106,8 @@
float m_uncommittedWidth;
float m_committedWidth;
float m_overhangWidth; // The amount by which |m_availableWidth| has been inflated to account for possible contraction due to ruby overhang.
- LayoutUnit m_left;
- LayoutUnit m_right;
+ int m_left;
+ int m_right;
float m_availableWidth;
bool m_isFirstLine;
};
@@ -130,11 +130,11 @@
if (newFloat->type() == RenderBlock::FloatingObject::FloatLeft) {
m_left = m_block->pixelSnappedLogicalRightForFloat(newFloat);
if (m_isFirstLine && m_block->style()->isLeftToRightDirection())
- m_left += m_block->textIndentOffset();
+ m_left += floorToInt(m_block->textIndentOffset());
} else {
m_right = m_block->pixelSnappedLogicalLeftForFloat(newFloat);
if (m_isFirstLine && !m_block->style()->isLeftToRightDirection())
- m_right -= m_block->textIndentOffset();
+ m_right -= floorToInt(m_block->textIndentOffset());
}
computeAvailableWidthFromLeftAndRight();
Modified: branches/subpixellayout/Source/WebCore/rendering/RenderDeprecatedFlexibleBox.cpp (109970 => 109971)
--- branches/subpixellayout/Source/WebCore/rendering/RenderDeprecatedFlexibleBox.cpp 2012-03-07 00:07:12 UTC (rev 109970)
+++ branches/subpixellayout/Source/WebCore/rendering/RenderDeprecatedFlexibleBox.cpp 2012-03-07 00:08:33 UTC (rev 109971)
@@ -814,7 +814,7 @@
}
}
}
- } while (groupRemainingSpace);
+ } while (groupRemainingSpace >= 1);
}
// We didn't find any children that could grow.
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
