Changeset 106866 in webkit

Timestamp:

Feb 6, 2012, 4:00:37 PM (15 years ago)

Author:

leviw@chromium.org

Message:

Fix pixel snapping logic for FrameSets. This is for code correctness, but would never actually lead to incorrect renderings.

File:

• branches/subpixellayout/Source/WebCore/rendering/RenderFrameSet.cpp (modified) (2 diffs)

branches/subpixellayout/Source/WebCore/rendering/RenderFrameSet.cpp

@@ -83 +83 @@
 void RenderFrameSet::paintColumnBorder(const PaintInfo& paintInfo, const LayoutRect& borderRect)
 {
-    if (!paintInfo.rect.intersects(pixelSnappedIntRect(borderRect)))
-        return;
-        
-    // FIXME: We should do something clever when borders from distinct framesets meet at a join.
-    
-    // Fill first.
-    GraphicsContext* context = paintInfo.context;
-    ColorSpace colorSpace = style()->colorSpace();
-    context->fillRect(borderRect, frameSet()->hasBorderColor() ? style()->visitedDependentColor(CSSPropertyBorderLeftColor) : borderFillColor(), colorSpace);
-    
-    // Now stroke the edges but only if we have enough room to paint both edges with a little
-    // bit of the fill color showing through.
-    if (borderRect.width() >= 3) {
-        context->fillRect(IntRect(roundedIntPoint(borderRect.location()), IntSize(1, height())), borderStartEdgeColor(), colorSpace);
-        context->fillRect(IntRect(IntPoint(borderRect.maxX() - 1, borderRect.y()), IntSize(1, height())), borderEndEdgeColor(), colorSpace);
-    }
-}
-
-void RenderFrameSet::paintRowBorder(const PaintInfo& paintInfo, const LayoutRect& borderRect)
-{
     IntRect snappedBorderRect = pixelSnappedIntRect(borderRect);
     if (!paintInfo.rect.intersects(snappedBorderRect))
         return;
-
+        
     // FIXME: We should do something clever when borders from distinct framesets meet at a join.
     
@@ -113 +93 @@
     ColorSpace colorSpace = style()->colorSpace();
     context->fillRect(snappedBorderRect, frameSet()->hasBorderColor() ? style()->visitedDependentColor(CSSPropertyBorderLeftColor) : borderFillColor(), colorSpace);
-
+    
     // Now stroke the edges but only if we have enough room to paint both edges with a little
     // bit of the fill color showing through.
-    if (borderRect.height() >= 3) {
-        context->fillRect(IntRect(roundedIntPoint(borderRect.location()), IntSize(width(), 1)), borderStartEdgeColor(), colorSpace);
-        context->fillRect(IntRect(IntPoint(borderRect.x(), borderRect.maxY() - 1), IntSize(width(), 1)), borderEndEdgeColor(), colorSpace);
+    if (snappedBorderRect.width() >= 3) {
+        context->fillRect(IntRect(snappedBorderRect.location(), IntSize(1, snappedBorderRect.height())), borderStartEdgeColor(), colorSpace);
+        context->fillRect(IntRect(IntPoint(snappedBorderRect.maxX() - 1, snappedBorderRect.y()), IntSize(1, snappedBorderRect.height())), borderEndEdgeColor(), colorSpace);
+    }
+}
+
+void RenderFrameSet::paintRowBorder(const PaintInfo& paintInfo, const LayoutRect& borderRect)
+{
+    IntRect snappedBorderRect = pixelSnappedIntRect(borderRect);
+    if (!paintInfo.rect.intersects(snappedBorderRect))
+        return;
+
+    // FIXME: We should do something clever when borders from distinct framesets meet at a join.
+    
+    // Fill first.
+    GraphicsContext* context = paintInfo.context;
+    ColorSpace colorSpace = style()->colorSpace();
+    context->fillRect(snappedBorderRect, frameSet()->hasBorderColor() ? style()->visitedDependentColor(CSSPropertyBorderLeftColor) : borderFillColor(), colorSpace);
+
+    // Now stroke the edges but only if we have enough room to paint both edges with a little
+    // bit of the fill color showing through.
+    if (snappedBorderRect.height() >= 3) {
+        context->fillRect(IntRect(snappedBorderRect.location(), IntSize(width(), 1)), borderStartEdgeColor(), colorSpace);
+        context->fillRect(IntRect(IntPoint(snappedBorderRect.x(), snappedBorderRect.maxY() - 1), IntSize(snappedBorderRect.width(), 1)), borderEndEdgeColor(), colorSpace);
     }
 }