<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[166015] trunk/Source/WebCore</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/166015">166015</a></dd>
<dt>Author</dt> <dd>simon.fraser@apple.com</dd>
<dt>Date</dt> <dd>2014-03-20 16:14:31 -0700 (Thu, 20 Mar 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>FrameView::paintContents() is not called for composited content
https://bugs.webkit.org/show_bug.cgi?id=130541
Reviewed by Beth Dakin.
FrameView::paintContents() is not called for frames that have
composited contents, yet it contains code that is expected
to run for all Frames.
Fix by factoring into will/didPaintContents(), and calling
the will/did functions from RenderLayerBacking::paintIntoLayer().
Also add a SetLayoutNeededForbiddenScope check for composited-layer
painting.
* page/FrameView.cpp:
(WebCore::FrameView::updateControlTints):
(WebCore::FrameView::willPaintContents):
(WebCore::FrameView::didPaintContents):
(WebCore::FrameView::paintContents):
* page/FrameView.h:
* rendering/RenderLayerBacking.cpp:
(WebCore::RenderLayerBacking::paintIntoLayer):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCorepageFrameViewcpp">trunk/Source/WebCore/page/FrameView.cpp</a></li>
<li><a href="#trunkSourceWebCorepageFrameViewh">trunk/Source/WebCore/page/FrameView.h</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderLayerBackingcpp">trunk/Source/WebCore/rendering/RenderLayerBacking.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (166014 => 166015)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2014-03-20 23:09:45 UTC (rev 166014)
+++ trunk/Source/WebCore/ChangeLog 2014-03-20 23:14:31 UTC (rev 166015)
</span><span class="lines">@@ -1,3 +1,29 @@
</span><ins>+2014-03-20 Simon Fraser <simon.fraser@apple.com>
+
+ FrameView::paintContents() is not called for composited content
+ https://bugs.webkit.org/show_bug.cgi?id=130541
+
+ Reviewed by Beth Dakin.
+
+ FrameView::paintContents() is not called for frames that have
+ composited contents, yet it contains code that is expected
+ to run for all Frames.
+
+ Fix by factoring into will/didPaintContents(), and calling
+ the will/did functions from RenderLayerBacking::paintIntoLayer().
+
+ Also add a SetLayoutNeededForbiddenScope check for composited-layer
+ painting.
+
+ * page/FrameView.cpp:
+ (WebCore::FrameView::updateControlTints):
+ (WebCore::FrameView::willPaintContents):
+ (WebCore::FrameView::didPaintContents):
+ (WebCore::FrameView::paintContents):
+ * page/FrameView.h:
+ * rendering/RenderLayerBacking.cpp:
+ (WebCore::RenderLayerBacking::paintIntoLayer):
+
</ins><span class="cx"> 2014-03-20 Tim Horton <timothy_horton@apple.com>
</span><span class="cx">
</span><span class="cx"> Fix the Mountain Lion build.
</span></span></pre></div>
<a id="trunkSourceWebCorepageFrameViewcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/FrameView.cpp (166014 => 166015)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/FrameView.cpp 2014-03-20 23:09:45 UTC (rev 166014)
+++ trunk/Source/WebCore/page/FrameView.cpp 2014-03-20 23:14:31 UTC (rev 166015)
</span><span class="lines">@@ -3461,43 +3461,15 @@
</span><span class="cx"> adjustTiledBackingCoverage();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void FrameView::paintContents(GraphicsContext* p, const IntRect& rect)
</del><ins>+void FrameView::willPaintContents(GraphicsContext* context, const IntRect& dirtyRect, PaintingState& paintingState)
</ins><span class="cx"> {
</span><span class="cx"> Document* document = frame().document();
</span><span class="cx">
</span><del>-#ifndef NDEBUG
- bool fillWithRed;
- if (document->printing())
- fillWithRed = false; // Printing, don't fill with red (can't remember why).
- else if (frame().ownerElement())
- fillWithRed = false; // Subframe, don't fill with red.
- else if (isTransparent())
- fillWithRed = false; // Transparent, don't fill with red.
- else if (m_paintBehavior & PaintBehaviorSelectionOnly)
- fillWithRed = false; // Selections are transparent, don't fill with red.
- else if (m_nodeToDraw)
- fillWithRed = false; // Element images are transparent, don't fill with red.
- else
- fillWithRed = true;
-
- if (fillWithRed)
- p->fillRect(rect, Color(0xFF, 0, 0), ColorSpaceDeviceRGB);
-#endif
</del><ins>+ if (!context->paintingDisabled())
+ InspectorInstrumentation::willPaint(renderView());
</ins><span class="cx">
</span><del>- RenderView* renderView = this->renderView();
- if (!renderView) {
- LOG_ERROR("called FrameView::paint with nil renderer");
- return;
- }
</del><ins>+ paintingState.isTopLevelPainter = !sCurrentPaintTimeStamp;
</ins><span class="cx">
</span><del>- ASSERT(!needsLayout());
- if (needsLayout())
- return;
-
- if (!p->paintingDisabled())
- InspectorInstrumentation::willPaint(renderView);
-
- bool isTopLevelPainter = !sCurrentPaintTimeStamp;
</del><span class="cx"> #if PLATFORM(IOS)
</span><span class="cx"> // FIXME: Remove PLATFORM(IOS)-guard once we upstream the iOS changes to MemoryPressureHandler.h.
</span><span class="cx"> if (isTopLevelPainter && memoryPressureHandler().hasReceivedMemoryPressure()) {
</span><span class="lines">@@ -3508,15 +3480,13 @@
</span><span class="cx"> memoryCache()->prune();
</span><span class="cx"> }
</span><span class="cx"> #endif
</span><del>- if (isTopLevelPainter)
</del><ins>+ if (paintingState.isTopLevelPainter)
</ins><span class="cx"> sCurrentPaintTimeStamp = monotonicallyIncreasingTime();
</span><span class="cx">
</span><del>- FontCachePurgePreventer fontCachePurgePreventer;
-
- if (!p->paintingDisabled() && !document->printing())
</del><ins>+ if (!context->paintingDisabled() && !document->printing())
</ins><span class="cx"> flushCompositingStateForThisFrame(&frame());
</span><span class="cx">
</span><del>- PaintBehavior oldPaintBehavior = m_paintBehavior;
</del><ins>+ paintingState.paintBehavior = m_paintBehavior;
</ins><span class="cx">
</span><span class="cx"> if (FrameView* parentView = parentFrameView()) {
</span><span class="cx"> if (parentView->paintBehavior() & PaintBehaviorFlattenCompositingLayers)
</span><span class="lines">@@ -3524,38 +3494,27 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if (m_paintBehavior == PaintBehaviorNormal)
</span><del>- document->markers().invalidateRenderedRectsForMarkersInRect(rect);
</del><ins>+ document->markers().invalidateRenderedRectsForMarkersInRect(dirtyRect);
</ins><span class="cx">
</span><span class="cx"> if (document->printing())
</span><span class="cx"> m_paintBehavior |= PaintBehaviorFlattenCompositingLayers;
</span><span class="cx">
</span><del>- bool flatteningPaint = m_paintBehavior & PaintBehaviorFlattenCompositingLayers;
- bool isRootFrame = !frame().ownerElement();
- if (flatteningPaint && isRootFrame)
</del><ins>+ paintingState.isFlatteningPaintOfRootFrame = (m_paintBehavior & PaintBehaviorFlattenCompositingLayers) && !frame().ownerElement();
+ if (paintingState.isFlatteningPaintOfRootFrame)
</ins><span class="cx"> notifyWidgetsInAllFrames(WillPaintFlattened);
</span><span class="cx">
</span><span class="cx"> ASSERT(!m_isPainting);
</span><span class="cx"> m_isPainting = true;
</span><ins>+}
</ins><span class="cx">
</span><del>- // m_nodeToDraw is used to draw only one element (and its descendants)
- RenderObject* eltRenderer = m_nodeToDraw ? m_nodeToDraw->renderer() : 0;
- RenderLayer* rootLayer = renderView->layer();
-
-#ifndef NDEBUG
- RenderElement::SetLayoutNeededForbiddenScope forbidSetNeedsLayout(&rootLayer->renderer());
-#endif
-
- rootLayer->paint(p, rect, m_paintBehavior, eltRenderer);
-
- if (rootLayer->containsDirtyOverlayScrollbars())
- rootLayer->paintOverlayScrollbars(p, rect, m_paintBehavior, eltRenderer);
-
</del><ins>+void FrameView::didPaintContents(GraphicsContext* context, const IntRect& dirtyRect, PaintingState& paintingState)
+{
</ins><span class="cx"> m_isPainting = false;
</span><span class="cx">
</span><del>- if (flatteningPaint && isRootFrame)
</del><ins>+ if (paintingState.isFlatteningPaintOfRootFrame)
</ins><span class="cx"> notifyWidgetsInAllFrames(DidPaintFlattened);
</span><span class="cx">
</span><del>- m_paintBehavior = oldPaintBehavior;
</del><ins>+ m_paintBehavior = paintingState.paintBehavior;
</ins><span class="cx"> m_lastPaintTime = monotonicallyIncreasingTime();
</span><span class="cx">
</span><span class="cx"> #if PLATFORM(IOS)
</span><span class="lines">@@ -3566,22 +3525,76 @@
</span><span class="cx"> memoryCache()->pruneLiveResources(true);
</span><span class="cx"> #endif
</span><span class="cx">
</span><ins>+ Document* document = frame().document();
</ins><span class="cx"> // Regions may have changed as a result of the visibility/z-index of element changing.
</span><span class="cx"> #if ENABLE(DASHBOARD_SUPPORT)
</span><span class="cx"> if (document->annotatedRegionsDirty())
</span><span class="cx"> updateAnnotatedRegions();
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>- if (isTopLevelPainter)
</del><ins>+ if (paintingState.isTopLevelPainter)
</ins><span class="cx"> sCurrentPaintTimeStamp = 0;
</span><span class="cx">
</span><del>- if (!p->paintingDisabled()) {
- InspectorInstrumentation::didPaint(renderView, p, rect);
</del><ins>+ if (!context->paintingDisabled()) {
+ InspectorInstrumentation::didPaint(renderView(), context, dirtyRect);
</ins><span class="cx"> // FIXME: should probably not fire milestones for snapshot painting. https://bugs.webkit.org/show_bug.cgi?id=117623
</span><span class="cx"> firePaintRelatedMilestonesIfNeeded();
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+void FrameView::paintContents(GraphicsContext* context, const IntRect& dirtyRect)
+{
+ Document* document = frame().document();
+
+#ifndef NDEBUG
+ bool fillWithRed;
+ if (document->printing())
+ fillWithRed = false; // Printing, don't fill with red (can't remember why).
+ else if (frame().ownerElement())
+ fillWithRed = false; // Subframe, don't fill with red.
+ else if (isTransparent())
+ fillWithRed = false; // Transparent, don't fill with red.
+ else if (m_paintBehavior & PaintBehaviorSelectionOnly)
+ fillWithRed = false; // Selections are transparent, don't fill with red.
+ else if (m_nodeToDraw)
+ fillWithRed = false; // Element images are transparent, don't fill with red.
+ else
+ fillWithRed = true;
+
+ if (fillWithRed)
+ context->fillRect(dirtyRect, Color(0xFF, 0, 0), ColorSpaceDeviceRGB);
+#endif
+
+ RenderView* renderView = this->renderView();
+ if (!renderView) {
+ LOG_ERROR("called FrameView::paint with nil renderer");
+ return;
+ }
+
+ ASSERT(!needsLayout());
+ if (needsLayout())
+ return;
+
+ PaintingState paintingState;
+ willPaintContents(context, dirtyRect, paintingState);
+
+ FontCachePurgePreventer fontCachePurgePreventer;
+
+ // m_nodeToDraw is used to draw only one element (and its descendants)
+ RenderObject* eltRenderer = m_nodeToDraw ? m_nodeToDraw->renderer() : 0;
+ RenderLayer* rootLayer = renderView->layer();
+
+#ifndef NDEBUG
+ RenderElement::SetLayoutNeededForbiddenScope forbidSetNeedsLayout(&rootLayer->renderer());
+#endif
+
+ rootLayer->paint(context, dirtyRect, m_paintBehavior, eltRenderer);
+ if (rootLayer->containsDirtyOverlayScrollbars())
+ rootLayer->paintOverlayScrollbars(context, dirtyRect, m_paintBehavior, eltRenderer);
+
+ didPaintContents(context, dirtyRect, paintingState);
+}
+
</ins><span class="cx"> void FrameView::setPaintBehavior(PaintBehavior behavior)
</span><span class="cx"> {
</span><span class="cx"> m_paintBehavior = behavior;
</span></span></pre></div>
<a id="trunkSourceWebCorepageFrameViewh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/FrameView.h (166014 => 166015)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/FrameView.h 2014-03-20 23:09:45 UTC (rev 166014)
+++ trunk/Source/WebCore/page/FrameView.h 2014-03-20 23:14:31 UTC (rev 166015)
</span><span class="lines">@@ -297,7 +297,23 @@
</span><span class="cx"> void addEmbeddedObjectToUpdate(RenderEmbeddedObject&);
</span><span class="cx"> void removeEmbeddedObjectToUpdate(RenderEmbeddedObject&);
</span><span class="cx">
</span><del>- virtual void paintContents(GraphicsContext*, const IntRect& damageRect) override;
</del><ins>+ virtual void paintContents(GraphicsContext*, const IntRect& dirtyRect) override;
+
+ struct PaintingState {
+ PaintBehavior paintBehavior;
+ bool isTopLevelPainter;
+ bool isFlatteningPaintOfRootFrame;
+ PaintingState()
+ : paintBehavior()
+ , isTopLevelPainter(false)
+ , isFlatteningPaintOfRootFrame(false)
+ {
+ }
+ };
+
+ void willPaintContents(GraphicsContext*, const IntRect& dirtyRect, PaintingState&);
+ void didPaintContents(GraphicsContext*, const IntRect& dirtyRect, PaintingState&);
+
</ins><span class="cx"> void setPaintBehavior(PaintBehavior);
</span><span class="cx"> PaintBehavior paintBehavior() const;
</span><span class="cx"> bool isPainting() const;
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderLayerBackingcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderLayerBacking.cpp (166014 => 166015)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderLayerBacking.cpp 2014-03-20 23:09:45 UTC (rev 166014)
+++ trunk/Source/WebCore/rendering/RenderLayerBacking.cpp 2014-03-20 23:14:31 UTC (rev 166015)
</span><span class="lines">@@ -2157,7 +2157,15 @@
</span><span class="cx"> paintFlags |= (RenderLayer::PaintLayerPaintingRootBackgroundOnly | RenderLayer::PaintLayerPaintingCompositingForegroundPhase); // Need PaintLayerPaintingCompositingForegroundPhase to walk child layers.
</span><span class="cx"> else if (compositor().fixedRootBackgroundLayer())
</span><span class="cx"> paintFlags |= RenderLayer::PaintLayerPaintingSkipRootBackground;
</span><del>-
</del><ins>+
+#ifndef NDEBUG
+ RenderElement::SetLayoutNeededForbiddenScope forbidSetNeedsLayout(&m_owningLayer.renderer());
+#endif
+
+ FrameView::PaintingState paintingState;
+ if (m_owningLayer.isRootLayer())
+ m_owningLayer.renderer().view().frameView().willPaintContents(context, paintDirtyRect, paintingState);
+
</ins><span class="cx"> // FIXME: GraphicsLayers need a way to split for RenderRegions.
</span><span class="cx"> RenderLayer::LayerPaintingInfo paintingInfo(&m_owningLayer, paintDirtyRect, paintBehavior, m_devicePixelFractionFromRenderer);
</span><span class="cx"> m_owningLayer.paintLayerContents(context, paintingInfo, paintFlags);
</span><span class="lines">@@ -2165,6 +2173,9 @@
</span><span class="cx"> if (m_owningLayer.containsDirtyOverlayScrollbars())
</span><span class="cx"> m_owningLayer.paintLayerContents(context, paintingInfo, paintFlags | RenderLayer::PaintLayerPaintingOverlayScrollbars);
</span><span class="cx">
</span><ins>+ if (m_owningLayer.isRootLayer())
+ m_owningLayer.renderer().view().frameView().didPaintContents(context, paintDirtyRect, paintingState);
+
</ins><span class="cx"> compositor().didPaintBacking(this);
</span><span class="cx">
</span><span class="cx"> ASSERT(!m_owningLayer.m_usedTransparency);
</span></span></pre>
</div>
</div>
</body>
</html>