Title: [99630] trunk/Source/WebCore
Revision
99630
Author
m...@apple.com
Date
2011-11-08 16:24:46 -0800 (Tue, 08 Nov 2011)

Log Message

REGRESSION (r99613): Incomplete painting of the root element background in flipped blocks writing mode
https://bugs.webkit.org/show_bug.cgi?id=71863

Reviewed by Anders Carlsson.

* rendering/RenderBox.cpp:
(WebCore::RenderBox::paintRootBoxFillLayers): Instead of unconditionally flipping the background
rect here...
* rendering/RenderView.cpp:
(WebCore::RenderView::backgroundRect): ...flip it only in column mode here.
* rendering/RenderView.h:

Modified Paths

Diff

Modified: trunk/Source/WebCore/ChangeLog (99629 => 99630)


--- trunk/Source/WebCore/ChangeLog	2011-11-09 00:21:11 UTC (rev 99629)
+++ trunk/Source/WebCore/ChangeLog	2011-11-09 00:24:46 UTC (rev 99630)
@@ -1,3 +1,17 @@
+2011-11-08  Dan Bernstein  <m...@apple.com>
+
+        REGRESSION (r99613): Incomplete painting of the root element background in flipped blocks writing mode
+        https://bugs.webkit.org/show_bug.cgi?id=71863
+
+        Reviewed by Anders Carlsson.
+
+        * rendering/RenderBox.cpp:
+        (WebCore::RenderBox::paintRootBoxFillLayers): Instead of unconditionally flipping the background
+        rect here...
+        * rendering/RenderView.cpp:
+        (WebCore::RenderView::backgroundRect): ...flip it only in column mode here.
+        * rendering/RenderView.h:
+
 2011-11-08  Michael Saboff  <msab...@apple.com>
 
         Towards 8 Bit Strings: Templatize JSC::Parser class by Lexer type

Modified: trunk/Source/WebCore/rendering/RenderBox.cpp (99629 => 99630)


--- trunk/Source/WebCore/rendering/RenderBox.cpp	2011-11-09 00:21:11 UTC (rev 99629)
+++ trunk/Source/WebCore/rendering/RenderBox.cpp	2011-11-09 00:24:46 UTC (rev 99630)
@@ -872,10 +872,7 @@
         }
     }
 
-    RenderView* view = this->view();
-    LayoutRect backgroundRect = view->backgroundRect();
-    flipForWritingMode(backgroundRect);
-    paintFillLayers(paintInfo, bgColor, bgLayer, backgroundRect, BackgroundBleedNone, CompositeSourceOver, bodyObject);
+    paintFillLayers(paintInfo, bgColor, bgLayer, view()->backgroundRect(this), BackgroundBleedNone, CompositeSourceOver, bodyObject);
 }
 
 BackgroundBleedAvoidance RenderBox::determineBackgroundBleedAvoidance(GraphicsContext* context) const

Modified: trunk/Source/WebCore/rendering/RenderView.cpp (99629 => 99630)


--- trunk/Source/WebCore/rendering/RenderView.cpp	2011-11-09 00:21:11 UTC (rev 99629)
+++ trunk/Source/WebCore/rendering/RenderView.cpp	2011-11-09 00:24:46 UTC (rev 99630)
@@ -692,7 +692,7 @@
     return overflowRect;
 }
 
-LayoutRect RenderView::backgroundRect() const
+LayoutRect RenderView::backgroundRect(RenderBox* backgroundRenderer) const
 {
     if (!hasColumns())
         return unscaledDocumentRect();
@@ -701,6 +701,8 @@
     LayoutRect backgroundRect(0, 0, columnInfo->desiredColumnWidth(), columnInfo->columnHeight() * columnInfo->columnCount());
     if (!isHorizontalWritingMode())
         backgroundRect = backgroundRect.transposedRect();
+    backgroundRenderer->flipForWritingMode(backgroundRect);
+
     return backgroundRect;
 }
 

Modified: trunk/Source/WebCore/rendering/RenderView.h (99629 => 99630)


--- trunk/Source/WebCore/rendering/RenderView.h	2011-11-09 00:21:11 UTC (rev 99629)
+++ trunk/Source/WebCore/rendering/RenderView.h	2011-11-09 00:24:46 UTC (rev 99630)
@@ -167,7 +167,7 @@
 #endif
 
     IntRect unscaledDocumentRect() const;
-    LayoutRect backgroundRect() const;
+    LayoutRect backgroundRect(RenderBox* backgroundRenderer) const;
 
     IntRect documentRect() const;
 
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes

Reply via email to