Changeset 107889 in webkit for trunk/Source/WebCore/rendering/RenderFrameSet.cpp

Timestamp:

Feb 15, 2012, 11:04:15 PM (13 years ago)

Author:

[email protected]

Message:

Convert RenderFrameSet to LayoutUnits in preparation for turning on subpixel layout
​https://bugs.webkit.org/show_bug.cgi?id=78526

Reviewed by Eric Seidel.

Revert paintColumnBorder and paintRowBorder to IntRect and pixel snap in
paint before calling them. This way the rounding logic is contained in a
single place (in paint).

No new tests, no new functionality.

• rendering/RenderFrameSet.cpp:

(WebCore::RenderFrameSet::paintColumnBorder):
(WebCore::RenderFrameSet::paintRowBorder):
(WebCore::RenderFrameSet::paint):
(WebCore::RenderFrameSet::getCursor):

• rendering/RenderFrameSet.h:

(RenderFrameSet):

File:

• trunk/Source/WebCore/rendering/RenderFrameSet.cpp (modified) (5 diffs)

trunk/Source/WebCore/rendering/RenderFrameSet.cpp

@@ -81 +81 @@
 }
 
-void RenderFrameSet::paintColumnBorder(const PaintInfo& paintInfo, const LayoutRect& borderRect)
-{
-    if (!paintInfo.rect.intersects(pixelSnappedIntRect(borderRect)))
+void RenderFrameSet::paintColumnBorder(const PaintInfo& paintInfo, const IntRect& borderRect)
+{
+    if (!paintInfo.rect.intersects(borderRect))
         return;
         
@@ -101 +101 @@
 }
 
-void RenderFrameSet::paintRowBorder(const PaintInfo& paintInfo, const LayoutRect& borderRect)
-{
-    if (!paintInfo.rect.intersects(pixelSnappedIntRect(borderRect)))
+void RenderFrameSet::paintRowBorder(const PaintInfo& paintInfo, const IntRect& borderRect)
+{
+    if (!paintInfo.rect.intersects(borderRect))
         return;
 
@@ -143 +143 @@
             xPos += m_cols.m_sizes[c];
             if (borderThickness && m_cols.m_allowBorder[c + 1]) {
-                paintColumnBorder(paintInfo, LayoutRect(adjustedPaintOffset.x() + xPos, adjustedPaintOffset.y() + yPos, borderThickness, height()));
+                paintColumnBorder(paintInfo, pixelSnappedIntRect(LayoutRect(adjustedPaintOffset.x() + xPos, adjustedPaintOffset.y() + yPos, borderThickness, height())));
                 xPos += borderThickness;
             }
@@ -152 +152 @@
         yPos += m_rows.m_sizes[r];
         if (borderThickness && m_rows.m_allowBorder[r + 1]) {
-            paintRowBorder(paintInfo, LayoutRect(adjustedPaintOffset.x(), adjustedPaintOffset.y() + yPos, width(), borderThickness));
+            paintRowBorder(paintInfo, pixelSnappedIntRect(LayoutRect(adjustedPaintOffset.x(), adjustedPaintOffset.y() + yPos, width(), borderThickness)));
             yPos += borderThickness;
         }
@@ -803 +803 @@
 CursorDirective RenderFrameSet::getCursor(const LayoutPoint& point, Cursor& cursor) const
 {
-    if (canResizeRow(roundedIntPoint(point))) {
+    IntPoint roundedPoint = roundedIntPoint(point);
+    if (canResizeRow(roundedPoint)) {
         cursor = rowResizeCursor();
         return SetCursor;
     }
-    if (canResizeColumn(point)) {
+    if (canResizeColumn(roundedPoint)) {
         cursor = columnResizeCursor();
         return SetCursor;