Title: [152943] trunk/Source/WebCore
Revision
152943
Author
[email protected]
Date
2013-07-20 00:26:29 -0700 (Sat, 20 Jul 2013)

Log Message

Pagination: Do not paint the baseBackgroundColor if asked to skipRootBackground.
https://bugs.webkit.org/show_bug.cgi?id=118933

Reviewed by Simon Fraser.

Captions rendered through TextTrackRepresentation are rendered with a background
color when in paginated views. Do not fill the paint area with the
baseBackgroundColor when the paint flags include SkipRootBackground.

* rendering/RenderView.cpp:
(WebCore::RenderView::paint):

Modified Paths

Diff

Modified: trunk/Source/WebCore/ChangeLog (152942 => 152943)


--- trunk/Source/WebCore/ChangeLog	2013-07-20 07:02:08 UTC (rev 152942)
+++ trunk/Source/WebCore/ChangeLog	2013-07-20 07:26:29 UTC (rev 152943)
@@ -1,3 +1,17 @@
+2013-07-19  Jer Noble  <[email protected]>
+
+        Pagination: Do not paint the baseBackgroundColor if asked to skipRootBackground.
+        https://bugs.webkit.org/show_bug.cgi?id=118933
+
+        Reviewed by Simon Fraser.
+
+        Captions rendered through TextTrackRepresentation are rendered with a background
+        color when in paginated views. Do not fill the paint area with the
+        baseBackgroundColor when the paint flags include SkipRootBackground.
+
+        * rendering/RenderView.cpp:
+        (WebCore::RenderView::paint):
+
 2013-07-19  Brady Eidson  <[email protected]>
 
         Pages should not be able to abuse users inside beforeunload handlers.

Modified: trunk/Source/WebCore/rendering/RenderView.cpp (152942 => 152943)


--- trunk/Source/WebCore/rendering/RenderView.cpp	2013-07-20 07:02:08 UTC (rev 152942)
+++ trunk/Source/WebCore/rendering/RenderView.cpp	2013-07-20 07:26:29 UTC (rev 152943)
@@ -411,7 +411,7 @@
     ASSERT(LayoutPoint(IntPoint(paintOffset.x(), paintOffset.y())) == paintOffset);
 
     // This avoids painting garbage between columns if there is a column gap.
-    if (m_frameView && m_frameView->pagination().mode != Pagination::Unpaginated)
+    if (m_frameView && m_frameView->pagination().mode != Pagination::Unpaginated && paintInfo.shouldPaintWithinRoot(this))
         paintInfo.context->fillRect(paintInfo.rect, m_frameView->baseBackgroundColor(), ColorSpaceDeviceRGB);
 
     paintObject(paintInfo, paintOffset);
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to