<!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>[167298] trunk/Source</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/167298">167298</a></dd>
<dt>Author</dt> <dd>simon.fraser@apple.com</dd>
<dt>Date</dt> <dd>2014-04-14 23:13:58 -0700 (Mon, 14 Apr 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>[iOS WK2] Pages often blank on first load if page loaded by typing the URL
https://bugs.webkit.org/show_bug.cgi?id=131665
Reviewed by Tim Horton.
The document overlay-related code in RemoteLayerTreeDrawingArea::setRootCompositingLayer()
was triggering a compositing layer flush when called with a null rootLayer, which happens
for pages going into the page cache. This would trigger a layer flush that would clobber
the root layer for the visible page, resulting in missing content.
Also, rebuildCompositingLayerTree() is called recursively and the m_documentOverlayRootLayer
was being added to (and then removed from) every single compositing layers.
Fix both these by changing to a pull model, where RenderLayerCompositor requests
the overlay layer via ChromeClient, and gets it at the end of every flush,
adding to the children of the root layer.
Source/WebCore:
* WebCore.exp.in:
* page/ChromeClient.h:
(WebCore::ChromeClient::documentOverlayLayerForFrame):
* rendering/RenderLayerCompositor.cpp:
(WebCore::RenderLayerCompositor::RenderLayerCompositor):
(WebCore::RenderLayerCompositor::flushPendingLayerChanges): Put visibleRect
into a variable for ease of debugging.
(WebCore::RenderLayerCompositor::updateCompositingLayers): Asser
that we're not in the page cache (this would have caught the bug).
(WebCore::RenderLayerCompositor::appendOverlayLayers):
(WebCore::RenderLayerCompositor::rebuildCompositingLayerTree):
(WebCore::RenderLayerCompositor::setDocumentOverlayRootLayer): Deleted.
* rendering/RenderLayerCompositor.h:
Source/WebKit2:
* WebProcess/WebCoreSupport/WebChromeClient.cpp:
(WebKit::WebChromeClient::documentOverlayLayerForFrame):
* WebProcess/WebCoreSupport/WebChromeClient.h:
* WebProcess/WebPage/mac/RemoteLayerTreeDrawingArea.mm:
(WebKit::RemoteLayerTreeDrawingArea::setRootCompositingLayer):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreWebCoreexpin">trunk/Source/WebCore/WebCore.exp.in</a></li>
<li><a href="#trunkSourceWebCorepageChromeClienth">trunk/Source/WebCore/page/ChromeClient.h</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderLayerCompositorcpp">trunk/Source/WebCore/rendering/RenderLayerCompositor.cpp</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderLayerCompositorh">trunk/Source/WebCore/rendering/RenderLayerCompositor.h</a></li>
<li><a href="#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeLog</a></li>
<li><a href="#trunkSourceWebKit2WebProcessWebCoreSupportWebChromeClientcpp">trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebChromeClient.cpp</a></li>
<li><a href="#trunkSourceWebKit2WebProcessWebCoreSupportWebChromeClienth">trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebChromeClient.h</a></li>
<li><a href="#trunkSourceWebKit2WebProcessWebPagemacRemoteLayerTreeDrawingAreamm">trunk/Source/WebKit2/WebProcess/WebPage/mac/RemoteLayerTreeDrawingArea.mm</a></li>
<li><a href="#trunkSourceWebKit2WebProcessWebPagemacTiledCoreAnimationDrawingAreamm">trunk/Source/WebKit2/WebProcess/WebPage/mac/TiledCoreAnimationDrawingArea.mm</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (167297 => 167298)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2014-04-15 06:13:17 UTC (rev 167297)
+++ trunk/Source/WebCore/ChangeLog 2014-04-15 06:13:58 UTC (rev 167298)
</span><span class="lines">@@ -1,3 +1,36 @@
</span><ins>+2014-04-14 Simon Fraser <simon.fraser@apple.com>
+
+ [iOS WK2] Pages often blank on first load if page loaded by typing the URL
+ https://bugs.webkit.org/show_bug.cgi?id=131665
+
+ Reviewed by Tim Horton.
+
+ The document overlay-related code in RemoteLayerTreeDrawingArea::setRootCompositingLayer()
+ was triggering a compositing layer flush when called with a null rootLayer, which happens
+ for pages going into the page cache. This would trigger a layer flush that would clobber
+ the root layer for the visible page, resulting in missing content.
+
+ Also, rebuildCompositingLayerTree() is called recursively and the m_documentOverlayRootLayer
+ was being added to (and then removed from) every single compositing layers.
+
+ Fix both these by changing to a pull model, where RenderLayerCompositor requests
+ the overlay layer via ChromeClient, and gets it at the end of every flush,
+ adding to the children of the root layer.
+
+ * WebCore.exp.in:
+ * page/ChromeClient.h:
+ (WebCore::ChromeClient::documentOverlayLayerForFrame):
+ * rendering/RenderLayerCompositor.cpp:
+ (WebCore::RenderLayerCompositor::RenderLayerCompositor):
+ (WebCore::RenderLayerCompositor::flushPendingLayerChanges): Put visibleRect
+ into a variable for ease of debugging.
+ (WebCore::RenderLayerCompositor::updateCompositingLayers): Asser
+ that we're not in the page cache (this would have caught the bug).
+ (WebCore::RenderLayerCompositor::appendOverlayLayers):
+ (WebCore::RenderLayerCompositor::rebuildCompositingLayerTree):
+ (WebCore::RenderLayerCompositor::setDocumentOverlayRootLayer): Deleted.
+ * rendering/RenderLayerCompositor.h:
+
</ins><span class="cx"> 2014-04-14 Jon Honeycutt <jhoneycutt@apple.com>
</span><span class="cx">
</span><span class="cx"> Assertion failure under FEImage::determineAbsolutePaintRect()
</span></span></pre></div>
<a id="trunkSourceWebCoreWebCoreexpin"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/WebCore.exp.in (167297 => 167298)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/WebCore.exp.in 2014-04-15 06:13:17 UTC (rev 167297)
+++ trunk/Source/WebCore/WebCore.exp.in 2014-04-15 06:13:58 UTC (rev 167298)
</span><span class="lines">@@ -871,7 +871,6 @@
</span><span class="cx"> __ZN7WebCore21NetworkStorageSession28createPrivateBrowsingSessionERKN3WTF6StringE
</span><span class="cx"> __ZN7WebCore21PlatformKeyboardEvent24disambiguateKeyDownEventENS_13PlatformEvent4TypeEb
</span><span class="cx"> __ZN7WebCore21RemoteCommandListener6createERNS_27RemoteCommandListenerClientE
</span><del>-__ZN7WebCore21RenderLayerCompositor27setDocumentOverlayRootLayerEPNS_13GraphicsLayerE
</del><span class="cx"> __ZN7WebCore21ResourceLoadScheduler20servePendingRequestsENS_20ResourceLoadPriorityE
</span><span class="cx"> __ZN7WebCore21ResourceLoadScheduler20servePendingRequestsEPNS0_15HostInformationENS_20ResourceLoadPriorityE
</span><span class="cx"> __ZN7WebCore21ResourceLoadScheduler21resumePendingRequestsEv
</span></span></pre></div>
<a id="trunkSourceWebCorepageChromeClienth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/ChromeClient.h (167297 => 167298)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/ChromeClient.h 2014-04-15 06:13:17 UTC (rev 167297)
+++ trunk/Source/WebCore/page/ChromeClient.h 2014-04-15 06:13:58 UTC (rev 167298)
</span><span class="lines">@@ -290,6 +290,8 @@
</span><span class="cx"> // Returns whether or not the client can render the composited layer,
</span><span class="cx"> // regardless of the settings.
</span><span class="cx"> virtual bool allowsAcceleratedCompositing() const { return true; }
</span><ins>+ // Supply a layer that will added as an overlay over other document layers (scrolling with the document).
+ virtual GraphicsLayer* documentOverlayLayerForFrame(Frame&) { return nullptr; }
</ins><span class="cx">
</span><span class="cx"> enum CompositingTrigger {
</span><span class="cx"> ThreeDTransformTrigger = 1 << 0,
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderLayerCompositorcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderLayerCompositor.cpp (167297 => 167298)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderLayerCompositor.cpp 2014-04-15 06:13:17 UTC (rev 167297)
+++ trunk/Source/WebCore/rendering/RenderLayerCompositor.cpp 2014-04-15 06:13:58 UTC (rev 167298)
</span><span class="lines">@@ -255,7 +255,6 @@
</span><span class="cx"> , m_isTrackingRepaints(false)
</span><span class="cx"> , m_layersWithTiledBackingCount(0)
</span><span class="cx"> , m_rootLayerAttachment(RootLayerUnattached)
</span><del>- , m_documentOverlayRootLayer(nullptr)
</del><span class="cx"> , m_layerFlushTimer(this, &RenderLayerCompositor::layerFlushTimerFired)
</span><span class="cx"> , m_layerFlushThrottlingEnabled(page() && page()->progress().isMainLoadProgressing())
</span><span class="cx"> , m_layerFlushThrottlingTemporarilyDisabledForInteraction(false)
</span><span class="lines">@@ -430,7 +429,8 @@
</span><span class="cx"> #if PLATFORM(IOS)
</span><span class="cx"> double horizontalMargin = defaultTileWidth / pageScaleFactor();
</span><span class="cx"> double verticalMargin = defaultTileHeight / pageScaleFactor();
</span><del>- rootLayer->flushCompositingState(frameView.computeCoverageRect(horizontalMargin, verticalMargin));
</del><ins>+ FloatRect visibleRect = frameView.computeCoverageRect(horizontalMargin, verticalMargin);
+ rootLayer->flushCompositingState(visibleRect);
</ins><span class="cx"> #else
</span><span class="cx"> // Having a m_clipLayer indicates that we're doing scrolling via GraphicsLayers.
</span><span class="cx"> IntRect visibleRect = m_clipLayer ? IntRect(IntPoint(), frameView.contentsSize()) : frameView.visibleContentRect();
</span><span class="lines">@@ -597,6 +597,8 @@
</span><span class="cx"> void RenderLayerCompositor::updateCompositingLayers(CompositingUpdateType updateType, RenderLayer* updateRoot)
</span><span class="cx"> {
</span><span class="cx"> m_updateCompositingLayersTimer.stop();
</span><ins>+
+ ASSERT(!m_renderView.document().inPageCache());
</ins><span class="cx">
</span><span class="cx"> // Compositing layers will be updated in Document::implicitClose() if suppressed here.
</span><span class="cx"> if (!m_renderView.document().visualUpdatesAllowed())
</span><span class="lines">@@ -689,6 +691,7 @@
</span><span class="cx">
</span><span class="cx"> // Host the document layer in the RenderView's root layer.
</span><span class="cx"> if (isFullUpdate) {
</span><ins>+ appendOverlayLayers(childList);
</ins><span class="cx"> // Even when childList is empty, don't drop out of compositing mode if there are
</span><span class="cx"> // composited layers that we didn't hit in our traversal (e.g. because of visibility:hidden).
</span><span class="cx"> if (childList.isEmpty() && !hasAnyAdditionalCompositedLayers(*updateRoot))
</span><span class="lines">@@ -721,6 +724,17 @@
</span><span class="cx"> InspectorInstrumentation::layerTreeDidChange(page());
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+void RenderLayerCompositor::appendOverlayLayers(Vector<GraphicsLayer*>& childList)
+{
+ Frame& frame = m_renderView.frameView().frame();
+ Page* page = frame.page();
+ if (!page)
+ return;
+
+ if (GraphicsLayer* overlayLayer = page->chrome().client().documentOverlayLayerForFrame(frame))
+ childList.append(overlayLayer);
+}
+
</ins><span class="cx"> void RenderLayerCompositor::layerBecameNonComposited(const RenderLayer& layer)
</span><span class="cx"> {
</span><span class="cx"> // Inform the inspector that the given RenderLayer was destroyed.
</span><span class="lines">@@ -1461,9 +1475,6 @@
</span><span class="cx">
</span><span class="cx"> childLayersOfEnclosingLayer.append(layerBacking->childForSuperlayers());
</span><span class="cx"> }
</span><del>-
- if (m_documentOverlayRootLayer)
- childLayersOfEnclosingLayer.append(m_documentOverlayRootLayer);
</del><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void RenderLayerCompositor::rebuildRegionCompositingLayerTree(RenderNamedFlowFragment* region, Vector<GraphicsLayer*>& childList, int depth)
</span><span class="lines">@@ -3819,13 +3830,4 @@
</span><span class="cx"> m_renderView.frameView().firePaintRelatedMilestonesIfNeeded();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void RenderLayerCompositor::setDocumentOverlayRootLayer(GraphicsLayer* documentOverlayRootLayer)
-{
- if (m_documentOverlayRootLayer)
- m_documentOverlayRootLayer->removeFromParent();
- m_documentOverlayRootLayer = documentOverlayRootLayer;
- setCompositingLayersNeedRebuild(true);
- scheduleCompositingLayerUpdate();
-}
-
</del><span class="cx"> } // namespace WebCore
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderLayerCompositorh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderLayerCompositor.h (167297 => 167298)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderLayerCompositor.h 2014-04-15 06:13:17 UTC (rev 167297)
+++ trunk/Source/WebCore/rendering/RenderLayerCompositor.h 2014-04-15 06:13:58 UTC (rev 167298)
</span><span class="lines">@@ -304,8 +304,6 @@
</span><span class="cx"> void setRootExtendedBackgroundColor(const Color&);
</span><span class="cx"> Color rootExtendedBackgroundColor() const { return m_rootExtendedBackgroundColor; }
</span><span class="cx">
</span><del>- void setDocumentOverlayRootLayer(GraphicsLayer*);
-
</del><span class="cx"> private:
</span><span class="cx"> class OverlapMap;
</span><span class="cx">
</span><span class="lines">@@ -366,6 +364,7 @@
</span><span class="cx"> bool layerHas3DContent(const RenderLayer&) const;
</span><span class="cx"> bool isRunningAcceleratedTransformAnimation(RenderLayerModelObject&) const;
</span><span class="cx">
</span><ins>+ void appendOverlayLayers(Vector<GraphicsLayer*>&);
</ins><span class="cx"> bool hasAnyAdditionalCompositedLayers(const RenderLayer& rootLayer) const;
</span><span class="cx">
</span><span class="cx"> void ensureRootLayer();
</span><span class="lines">@@ -508,8 +507,6 @@
</span><span class="cx"> std::unique_ptr<GraphicsLayer> m_layerForFooter;
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>- GraphicsLayer* m_documentOverlayRootLayer;
-
</del><span class="cx"> std::unique_ptr<GraphicsLayerUpdater> m_layerUpdater; // Updates tiled layer visible area periodically while animations are running.
</span><span class="cx">
</span><span class="cx"> Timer<RenderLayerCompositor> m_layerFlushTimer;
</span></span></pre></div>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (167297 => 167298)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2014-04-15 06:13:17 UTC (rev 167297)
+++ trunk/Source/WebKit2/ChangeLog 2014-04-15 06:13:58 UTC (rev 167298)
</span><span class="lines">@@ -1,3 +1,28 @@
</span><ins>+2014-04-14 Simon Fraser <simon.fraser@apple.com>
+
+ [iOS WK2] Pages often blank on first load if page loaded by typing the URL
+ https://bugs.webkit.org/show_bug.cgi?id=131665
+
+ Reviewed by Tim Horton.
+
+ The document overlay-related code in RemoteLayerTreeDrawingArea::setRootCompositingLayer()
+ was triggering a compositing layer flush when called with a null rootLayer, which happens
+ for pages going into the page cache. This would trigger a layer flush that would clobber
+ the root layer for the visible page, resulting in missing content.
+
+ Also, rebuildCompositingLayerTree() is called recursively and the m_documentOverlayRootLayer
+ was being added to (and then removed from) every single compositing layers.
+
+ Fix both these by changing to a pull model, where RenderLayerCompositor requests
+ the overlay layer via ChromeClient, and gets it at the end of every flush,
+ adding to the children of the root layer.
+
+ * WebProcess/WebCoreSupport/WebChromeClient.cpp:
+ (WebKit::WebChromeClient::documentOverlayLayerForFrame):
+ * WebProcess/WebCoreSupport/WebChromeClient.h:
+ * WebProcess/WebPage/mac/RemoteLayerTreeDrawingArea.mm:
+ (WebKit::RemoteLayerTreeDrawingArea::setRootCompositingLayer):
+
</ins><span class="cx"> 2014-04-14 Tim Horton <timothy_horton@apple.com>
</span><span class="cx">
</span><span class="cx"> Fix the 32-bit build.
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessWebCoreSupportWebChromeClientcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebChromeClient.cpp (167297 => 167298)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebChromeClient.cpp 2014-04-15 06:13:17 UTC (rev 167297)
+++ trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebChromeClient.cpp 2014-04-15 06:13:58 UTC (rev 167298)
</span><span class="lines">@@ -771,6 +771,14 @@
</span><span class="cx"> m_page->exitAcceleratedCompositingMode();
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+GraphicsLayer* WebChromeClient::documentOverlayLayerForFrame(Frame& frame)
+{
+ if (&frame == &m_page->corePage()->mainFrame())
+ return m_page->pageOverlayController().documentOverlayRootLayer();
+
+ return nullptr;
+}
+
</ins><span class="cx"> void WebChromeClient::setNeedsOneShotDrawingSynchronization()
</span><span class="cx"> {
</span><span class="cx"> notImplemented();
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessWebCoreSupportWebChromeClienth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebChromeClient.h (167297 => 167298)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebChromeClient.h 2014-04-15 06:13:17 UTC (rev 167297)
+++ trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebChromeClient.h 2014-04-15 06:13:58 UTC (rev 167298)
</span><span class="lines">@@ -202,6 +202,7 @@
</span><span class="cx"> virtual void attachRootGraphicsLayer(WebCore::Frame*, WebCore::GraphicsLayer*) override;
</span><span class="cx"> virtual void setNeedsOneShotDrawingSynchronization() override;
</span><span class="cx"> virtual void scheduleCompositingLayerFlush() override;
</span><ins>+ virtual WebCore::GraphicsLayer* documentOverlayLayerForFrame(WebCore::Frame&) override;
</ins><span class="cx">
</span><span class="cx"> virtual CompositingTriggerFlags allowedCompositingTriggers() const
</span><span class="cx"> {
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessWebPagemacRemoteLayerTreeDrawingAreamm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/WebPage/mac/RemoteLayerTreeDrawingArea.mm (167297 => 167298)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/WebPage/mac/RemoteLayerTreeDrawingArea.mm 2014-04-15 06:13:17 UTC (rev 167297)
+++ trunk/Source/WebKit2/WebProcess/WebPage/mac/RemoteLayerTreeDrawingArea.mm 2014-04-15 06:13:58 UTC (rev 167298)
</span><span class="lines">@@ -94,8 +94,6 @@
</span><span class="cx"> children.append(m_webPage->pageOverlayController().viewOverlayRootLayer());
</span><span class="cx"> }
</span><span class="cx"> m_rootLayer->setChildren(children);
</span><del>-
- m_webPage->mainFrameView()->renderView()->compositor().setDocumentOverlayRootLayer(m_webPage->pageOverlayController().documentOverlayRootLayer());
</del><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void RemoteLayerTreeDrawingArea::updateGeometry(const IntSize& viewSize, const IntSize& layerPosition)
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessWebPagemacTiledCoreAnimationDrawingAreamm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/WebPage/mac/TiledCoreAnimationDrawingArea.mm (167297 => 167298)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/WebPage/mac/TiledCoreAnimationDrawingArea.mm 2014-04-15 06:13:17 UTC (rev 167297)
+++ trunk/Source/WebKit2/WebProcess/WebPage/mac/TiledCoreAnimationDrawingArea.mm 2014-04-15 06:13:58 UTC (rev 167298)
</span><span class="lines">@@ -449,8 +449,6 @@
</span><span class="cx">
</span><span class="cx"> [m_hostingLayer setSublayers:layer ? @[ layer, m_webPage->pageOverlayController().viewOverlayRootLayer()->platformLayer() ] : @[ ]];
</span><span class="cx">
</span><del>- m_webPage->mainFrameView()->renderView()->compositor().setDocumentOverlayRootLayer(m_webPage->pageOverlayController().documentOverlayRootLayer());
-
</del><span class="cx"> bool hadRootLayer = !!m_rootLayer;
</span><span class="cx"> m_rootLayer = layer;
</span><span class="cx"> [m_rootLayer setSublayerTransform:m_transform];
</span></span></pre>
</div>
</div>
</body>
</html>