Changeset 73423 in webkit

Timestamp:

Dec 6, 2010 7:42:36 PM (13 years ago)

Author:

hyatt@apple.com

Message:

​https://bugs.webkit.org/show_bug.cgi?id=50593

Reviewed by Simon Fraser.

Fix background canvas painting for documents with left/top overflow. The math from the original RTL patch was incorrect.

Just use the RenderView's document dimensions always.

WebCore:

• rendering/RenderBox.cpp:

(WebCore::RenderBox::paintRootBoxDecorations):

LayoutTests:

• fast/blockflow/Kusa-Makura-background-canvas.html: Added.
• platform/mac/fast/blockflow/Kusa-Makura-background-canvas-expected.checksum: Added.
• platform/mac/fast/blockflow/Kusa-Makura-background-canvas-expected.png: Added.
• platform/mac/fast/blockflow/Kusa-Makura-background-canvas-expected.txt: Added.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/fast/blockflow/Kusa-Makura-background-canvas.html (added)
• LayoutTests/platform/mac/fast/blockflow/Kusa-Makura-background-canvas-expected.checksum (added)
• LayoutTests/platform/mac/fast/blockflow/Kusa-Makura-background-canvas-expected.png (added)
• LayoutTests/platform/mac/fast/blockflow/Kusa-Makura-background-canvas-expected.txt (added)
• WebCore/ChangeLog (modified) (1 diff)
• WebCore/rendering/RenderBox.cpp (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2010-12-06  David Hyatt  <hyatt@apple.com>
+
+        Reviewed by Simon Fraser.
+
+        https://bugs.webkit.org/show_bug.cgi?id=50593
+        
+        Fix background canvas painting for documents with left/top overflow.  The math from the original RTL patch was incorrect.
+        
+        Just use the RenderView's document dimensions always.
+
+        * fast/blockflow/Kusa-Makura-background-canvas.html: Added.
+        * platform/mac/fast/blockflow/Kusa-Makura-background-canvas-expected.checksum: Added.
+        * platform/mac/fast/blockflow/Kusa-Makura-background-canvas-expected.png: Added.
+        * platform/mac/fast/blockflow/Kusa-Makura-background-canvas-expected.txt: Added.
+
 2010-12-06  Simon Fraser  <simon.fraser@apple.com>
 

trunk/WebCore/ChangeLog

@@ +1 @@
+2010-12-06  David Hyatt  <hyatt@apple.com>
+
+        Reviewed by Simon Fraser.
+
+        https://bugs.webkit.org/show_bug.cgi?id=50593
+        
+        Fix background canvas painting for documents with left/top overflow.  The math from the original RTL patch was incorrect.
+        
+        Just use the RenderView's document dimensions always.
+
+        * rendering/RenderBox.cpp:
+        (WebCore::RenderBox::paintRootBoxDecorations):
+
 2010-12-06  Simon Fraser  <simon.fraser@apple.com>
 

trunk/WebCore/rendering/RenderBox.cpp

@@ -744 +744 @@
     }
 
-    int w = width();
-    int h = height();
-
-    int rw;
-    int rh;
-    if (view()->frameView()) {
-        rw = view()->frameView()->contentsWidth();
-        rh = view()->frameView()->contentsHeight();
-    } else {
-        rw = view()->width();
-        rh = view()->height();
-    }
-
-    // CSS2 14.2:
-    // The background of the box generated by the root element covers the entire canvas including
-    // its margins.
-    int bx = tx - marginLeft() + view()->docLeft();
-    int by = ty - marginTop() + view()->docTop();
-    int bw = max(w + marginLeft() + marginRight() + borderLeft() + borderRight(), rw);
-    int bh = max(h + marginTop() + marginBottom() + borderTop() + borderBottom(), rh);
-
-    paintFillLayers(paintInfo, bgColor, bgLayer, bx, by, bw, bh, CompositeSourceOver, bodyObject);
+    // The background of the box generated by the root element covers the entire canvas, so just use
+    // the RenderView's docTop/Left/Width/Height accessors.
+    paintFillLayers(paintInfo, bgColor, bgLayer, view()->docLeft(), view()->docTop(), view()->docWidth(), view()->docHeight(), CompositeSourceOver, bodyObject);
 
     if (style()->hasBorder() && style()->display() != INLINE)
-        paintBorder(paintInfo.context, tx, ty, w, h, style());
+        paintBorder(paintInfo.context, tx, ty, width(), height(), style());
 }