<!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>[201802] trunk/Source/WebKit2</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/201802">201802</a></dd>
<dt>Author</dt> <dd>carlosgc@webkit.org</dd>
<dt>Date</dt> <dd>2016-06-08 05:13:11 -0700 (Wed, 08 Jun 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>LayerTreeHost should be created with a WebPage reference instead of a pointer
https://bugs.webkit.org/show_bug.cgi?id=158520
Reviewed by Žan Doberšek.
We are indeed creating the LayerTreeHost always from a WebPage reference but getting its address to pass it to
the LayerTreeHost create() function.
* WebProcess/WebPage/CoordinatedGraphics/CoordinatedDrawingArea.cpp:
(WebKit::CoordinatedDrawingArea::enterAcceleratedCompositingMode):
* WebProcess/WebPage/CoordinatedGraphics/CoordinatedLayerTreeHost.cpp:
(WebKit::CoordinatedLayerTreeHost::create):
(WebKit::CoordinatedLayerTreeHost::CoordinatedLayerTreeHost):
(WebKit::CoordinatedLayerTreeHost::didFlushRootLayer):
(WebKit::CoordinatedLayerTreeHost::performScheduledLayerFlush):
(WebKit::CoordinatedLayerTreeHost::commitSceneState):
(WebKit::CoordinatedLayerTreeHost::deviceOrPageScaleFactorChanged):
* WebProcess/WebPage/CoordinatedGraphics/CoordinatedLayerTreeHost.h:
* WebProcess/WebPage/CoordinatedGraphics/ThreadedCoordinatedLayerTreeHost.cpp:
(WebKit::ThreadedCoordinatedLayerTreeHost::create):
(WebKit::ThreadedCoordinatedLayerTreeHost::ThreadedCoordinatedLayerTreeHost):
(WebKit::ThreadedCoordinatedLayerTreeHost::deviceOrPageScaleFactorChanged):
(WebKit::ThreadedCoordinatedLayerTreeHost::compositorDidFlushLayers):
(WebKit::ThreadedCoordinatedLayerTreeHost::didScaleFactorChanged):
(WebKit::ThreadedCoordinatedLayerTreeHost::setVisibleContentsRect):
* WebProcess/WebPage/CoordinatedGraphics/ThreadedCoordinatedLayerTreeHost.h:
* WebProcess/WebPage/DrawingAreaImpl.cpp:
(WebKit::DrawingAreaImpl::enterAcceleratedCompositingMode):
* WebProcess/WebPage/LayerTreeHost.cpp:
(WebKit::LayerTreeHost::create):
(WebKit::LayerTreeHost::LayerTreeHost):
* WebProcess/WebPage/LayerTreeHost.h:
* WebProcess/WebPage/gtk/LayerTreeHostGtk.cpp:
(WebKit::LayerTreeHostGtk::create):
(WebKit::LayerTreeHostGtk::LayerTreeHostGtk):
(WebKit::LayerTreeHostGtk::makeContextCurrent):
(WebKit::LayerTreeHostGtk::deviceOrPageScaleFactorChanged):
(WebKit::LayerTreeHostGtk::paintContents):
(WebKit::LayerTreeHostGtk::deviceScaleFactor):
(WebKit::LayerTreeHostGtk::pageScaleFactor):
(WebKit::LayerTreeHostGtk::flushPendingLayerChanges):
(WebKit::LayerTreeHostGtk::flushAndRenderLayers):
(WebKit::LayerTreeHostGtk::pageBackgroundTransparencyChanged):
(WebKit::LayerTreeHostGtk::initialize): Deleted.
* WebProcess/WebPage/gtk/LayerTreeHostGtk.h:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeLog</a></li>
<li><a href="#trunkSourceWebKit2WebProcessWebPageCoordinatedGraphicsCoordinatedDrawingAreacpp">trunk/Source/WebKit2/WebProcess/WebPage/CoordinatedGraphics/CoordinatedDrawingArea.cpp</a></li>
<li><a href="#trunkSourceWebKit2WebProcessWebPageCoordinatedGraphicsCoordinatedLayerTreeHostcpp">trunk/Source/WebKit2/WebProcess/WebPage/CoordinatedGraphics/CoordinatedLayerTreeHost.cpp</a></li>
<li><a href="#trunkSourceWebKit2WebProcessWebPageCoordinatedGraphicsCoordinatedLayerTreeHosth">trunk/Source/WebKit2/WebProcess/WebPage/CoordinatedGraphics/CoordinatedLayerTreeHost.h</a></li>
<li><a href="#trunkSourceWebKit2WebProcessWebPageCoordinatedGraphicsThreadedCoordinatedLayerTreeHostcpp">trunk/Source/WebKit2/WebProcess/WebPage/CoordinatedGraphics/ThreadedCoordinatedLayerTreeHost.cpp</a></li>
<li><a href="#trunkSourceWebKit2WebProcessWebPageCoordinatedGraphicsThreadedCoordinatedLayerTreeHosth">trunk/Source/WebKit2/WebProcess/WebPage/CoordinatedGraphics/ThreadedCoordinatedLayerTreeHost.h</a></li>
<li><a href="#trunkSourceWebKit2WebProcessWebPageDrawingAreaImplcpp">trunk/Source/WebKit2/WebProcess/WebPage/DrawingAreaImpl.cpp</a></li>
<li><a href="#trunkSourceWebKit2WebProcessWebPageLayerTreeHostcpp">trunk/Source/WebKit2/WebProcess/WebPage/LayerTreeHost.cpp</a></li>
<li><a href="#trunkSourceWebKit2WebProcessWebPageLayerTreeHosth">trunk/Source/WebKit2/WebProcess/WebPage/LayerTreeHost.h</a></li>
<li><a href="#trunkSourceWebKit2WebProcessWebPagegtkLayerTreeHostGtkcpp">trunk/Source/WebKit2/WebProcess/WebPage/gtk/LayerTreeHostGtk.cpp</a></li>
<li><a href="#trunkSourceWebKit2WebProcessWebPagegtkLayerTreeHostGtkh">trunk/Source/WebKit2/WebProcess/WebPage/gtk/LayerTreeHostGtk.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (201801 => 201802)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2016-06-08 09:06:07 UTC (rev 201801)
+++ trunk/Source/WebKit2/ChangeLog 2016-06-08 12:13:11 UTC (rev 201802)
</span><span class="lines">@@ -1,3 +1,51 @@
</span><ins>+2016-06-08 Carlos Garcia Campos <cgarcia@igalia.com>
+
+ LayerTreeHost should be created with a WebPage reference instead of a pointer
+ https://bugs.webkit.org/show_bug.cgi?id=158520
+
+ Reviewed by Žan Doberšek.
+
+ We are indeed creating the LayerTreeHost always from a WebPage reference but getting its address to pass it to
+ the LayerTreeHost create() function.
+
+ * WebProcess/WebPage/CoordinatedGraphics/CoordinatedDrawingArea.cpp:
+ (WebKit::CoordinatedDrawingArea::enterAcceleratedCompositingMode):
+ * WebProcess/WebPage/CoordinatedGraphics/CoordinatedLayerTreeHost.cpp:
+ (WebKit::CoordinatedLayerTreeHost::create):
+ (WebKit::CoordinatedLayerTreeHost::CoordinatedLayerTreeHost):
+ (WebKit::CoordinatedLayerTreeHost::didFlushRootLayer):
+ (WebKit::CoordinatedLayerTreeHost::performScheduledLayerFlush):
+ (WebKit::CoordinatedLayerTreeHost::commitSceneState):
+ (WebKit::CoordinatedLayerTreeHost::deviceOrPageScaleFactorChanged):
+ * WebProcess/WebPage/CoordinatedGraphics/CoordinatedLayerTreeHost.h:
+ * WebProcess/WebPage/CoordinatedGraphics/ThreadedCoordinatedLayerTreeHost.cpp:
+ (WebKit::ThreadedCoordinatedLayerTreeHost::create):
+ (WebKit::ThreadedCoordinatedLayerTreeHost::ThreadedCoordinatedLayerTreeHost):
+ (WebKit::ThreadedCoordinatedLayerTreeHost::deviceOrPageScaleFactorChanged):
+ (WebKit::ThreadedCoordinatedLayerTreeHost::compositorDidFlushLayers):
+ (WebKit::ThreadedCoordinatedLayerTreeHost::didScaleFactorChanged):
+ (WebKit::ThreadedCoordinatedLayerTreeHost::setVisibleContentsRect):
+ * WebProcess/WebPage/CoordinatedGraphics/ThreadedCoordinatedLayerTreeHost.h:
+ * WebProcess/WebPage/DrawingAreaImpl.cpp:
+ (WebKit::DrawingAreaImpl::enterAcceleratedCompositingMode):
+ * WebProcess/WebPage/LayerTreeHost.cpp:
+ (WebKit::LayerTreeHost::create):
+ (WebKit::LayerTreeHost::LayerTreeHost):
+ * WebProcess/WebPage/LayerTreeHost.h:
+ * WebProcess/WebPage/gtk/LayerTreeHostGtk.cpp:
+ (WebKit::LayerTreeHostGtk::create):
+ (WebKit::LayerTreeHostGtk::LayerTreeHostGtk):
+ (WebKit::LayerTreeHostGtk::makeContextCurrent):
+ (WebKit::LayerTreeHostGtk::deviceOrPageScaleFactorChanged):
+ (WebKit::LayerTreeHostGtk::paintContents):
+ (WebKit::LayerTreeHostGtk::deviceScaleFactor):
+ (WebKit::LayerTreeHostGtk::pageScaleFactor):
+ (WebKit::LayerTreeHostGtk::flushPendingLayerChanges):
+ (WebKit::LayerTreeHostGtk::flushAndRenderLayers):
+ (WebKit::LayerTreeHostGtk::pageBackgroundTransparencyChanged):
+ (WebKit::LayerTreeHostGtk::initialize): Deleted.
+ * WebProcess/WebPage/gtk/LayerTreeHostGtk.h:
+
</ins><span class="cx"> 2016-06-07 Sam Weinig <sam@webkit.org>
</span><span class="cx">
</span><span class="cx"> Fix 10.10 build.
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessWebPageCoordinatedGraphicsCoordinatedDrawingAreacpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/WebPage/CoordinatedGraphics/CoordinatedDrawingArea.cpp (201801 => 201802)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/WebPage/CoordinatedGraphics/CoordinatedDrawingArea.cpp 2016-06-08 09:06:07 UTC (rev 201801)
+++ trunk/Source/WebKit2/WebProcess/WebPage/CoordinatedGraphics/CoordinatedDrawingArea.cpp 2016-06-08 12:13:11 UTC (rev 201802)
</span><span class="lines">@@ -306,7 +306,7 @@
</span><span class="cx"> m_exitCompositingTimer.stop();
</span><span class="cx"> m_wantsToExitAcceleratedCompositingMode = false;
</span><span class="cx">
</span><del>- m_layerTreeHost = LayerTreeHost::create(&m_webPage);
</del><ins>+ m_layerTreeHost = LayerTreeHost::create(m_webPage);
</ins><span class="cx"> if (!m_inUpdateBackingStoreState)
</span><span class="cx"> m_layerTreeHost->setShouldNotifyAfterNextScheduledLayerFlush(true);
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessWebPageCoordinatedGraphicsCoordinatedLayerTreeHostcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/WebPage/CoordinatedGraphics/CoordinatedLayerTreeHost.cpp (201801 => 201802)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/WebPage/CoordinatedGraphics/CoordinatedLayerTreeHost.cpp 2016-06-08 09:06:07 UTC (rev 201801)
+++ trunk/Source/WebKit2/WebProcess/WebPage/CoordinatedGraphics/CoordinatedLayerTreeHost.cpp 2016-06-08 12:13:11 UTC (rev 201802)
</span><span class="lines">@@ -49,7 +49,7 @@
</span><span class="cx">
</span><span class="cx"> namespace WebKit {
</span><span class="cx">
</span><del>-Ref<CoordinatedLayerTreeHost> CoordinatedLayerTreeHost::create(WebPage* webPage)
</del><ins>+Ref<CoordinatedLayerTreeHost> CoordinatedLayerTreeHost::create(WebPage& webPage)
</ins><span class="cx"> {
</span><span class="cx"> return adoptRef(*new CoordinatedLayerTreeHost(webPage));
</span><span class="cx"> }
</span><span class="lines">@@ -58,7 +58,7 @@
</span><span class="cx"> {
</span><span class="cx"> }
</span><span class="cx">
</span><del>-CoordinatedLayerTreeHost::CoordinatedLayerTreeHost(WebPage* webPage)
</del><ins>+CoordinatedLayerTreeHost::CoordinatedLayerTreeHost(WebPage& webPage)
</ins><span class="cx"> : LayerTreeHost(webPage)
</span><span class="cx"> , m_notifyAfterScheduledLayerFlush(false)
</span><span class="cx"> , m_isValid(true)
</span><span class="lines">@@ -69,9 +69,9 @@
</span><span class="cx"> , m_forceRepaintAsyncCallbackID(0)
</span><span class="cx"> , m_viewOverlayRootLayer(nullptr)
</span><span class="cx"> {
</span><del>- m_coordinator = std::make_unique<CompositingCoordinator>(webPage->corePage(), this);
</del><ins>+ m_coordinator = std::make_unique<CompositingCoordinator>(m_webPage.corePage(), this);
</ins><span class="cx">
</span><del>- m_coordinator->createRootLayer(webPage->size());
</del><ins>+ m_coordinator->createRootLayer(m_webPage.size());
</ins><span class="cx"> m_layerTreeContext.contextID = toCoordinatedGraphicsLayer(m_coordinator->rootLayer())->id();
</span><span class="cx">
</span><span class="cx"> CoordinatedSurface::setFactory(createCoordinatedSurface);
</span><span class="lines">@@ -186,7 +186,7 @@
</span><span class="cx"> {
</span><span class="cx"> // Because our view-relative overlay root layer is not attached to the FrameView's GraphicsLayer tree, we need to flush it manually.
</span><span class="cx"> if (m_viewOverlayRootLayer)
</span><del>- m_viewOverlayRootLayer->flushCompositingState(visibleContentRect, m_webPage->mainFrame()->view()->viewportIsStable());
</del><ins>+ m_viewOverlayRootLayer->flushCompositingState(visibleContentRect, m_webPage.mainFrame()->view()->viewportIsStable());
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void CoordinatedLayerTreeHost::performScheduledLayerFlush()
</span><span class="lines">@@ -202,12 +202,12 @@
</span><span class="cx"> bool didSync = m_coordinator->flushPendingLayerChanges();
</span><span class="cx">
</span><span class="cx"> if (m_forceRepaintAsyncCallbackID) {
</span><del>- m_webPage->send(Messages::WebPageProxy::VoidCallback(m_forceRepaintAsyncCallbackID));
</del><ins>+ m_webPage.send(Messages::WebPageProxy::VoidCallback(m_forceRepaintAsyncCallbackID));
</ins><span class="cx"> m_forceRepaintAsyncCallbackID = 0;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if (m_notifyAfterScheduledLayerFlush && didSync) {
</span><del>- static_cast<CoordinatedDrawingArea*>(m_webPage->drawingArea())->layerHostDidFlushLayers();
</del><ins>+ static_cast<CoordinatedDrawingArea*>(m_webPage.drawingArea())->layerHostDidFlushLayers();
</ins><span class="cx"> m_notifyAfterScheduledLayerFlush = false;
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="lines">@@ -223,7 +223,7 @@
</span><span class="cx">
</span><span class="cx"> void CoordinatedLayerTreeHost::commitSceneState(const WebCore::CoordinatedGraphicsState& state)
</span><span class="cx"> {
</span><del>- m_webPage->send(Messages::CoordinatedLayerTreeHostProxy::CommitCoordinatedGraphicsState(state));
</del><ins>+ m_webPage.send(Messages::CoordinatedLayerTreeHostProxy::CommitCoordinatedGraphicsState(state));
</ins><span class="cx"> m_isWaitingForRenderer = true;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -235,7 +235,7 @@
</span><span class="cx"> void CoordinatedLayerTreeHost::deviceOrPageScaleFactorChanged()
</span><span class="cx"> {
</span><span class="cx"> m_coordinator->deviceOrPageScaleFactorChanged();
</span><del>- m_webPage->mainFrame()->pageOverlayController().didChangeDeviceScaleFactor();
</del><ins>+ m_webPage.mainFrame()->pageOverlayController().didChangeDeviceScaleFactor();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void CoordinatedLayerTreeHost::pageBackgroundTransparencyChanged()
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessWebPageCoordinatedGraphicsCoordinatedLayerTreeHosth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/WebPage/CoordinatedGraphics/CoordinatedLayerTreeHost.h (201801 => 201802)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/WebPage/CoordinatedGraphics/CoordinatedLayerTreeHost.h 2016-06-08 09:06:07 UTC (rev 201801)
+++ trunk/Source/WebKit2/WebProcess/WebPage/CoordinatedGraphics/CoordinatedLayerTreeHost.h 2016-06-08 12:13:11 UTC (rev 201802)
</span><span class="lines">@@ -40,7 +40,7 @@
</span><span class="cx"> class CoordinatedLayerTreeHost : public LayerTreeHost, public WebCore::CompositingCoordinator::Client
</span><span class="cx"> {
</span><span class="cx"> public:
</span><del>- static Ref<CoordinatedLayerTreeHost> create(WebPage*);
</del><ins>+ static Ref<CoordinatedLayerTreeHost> create(WebPage&);
</ins><span class="cx"> virtual ~CoordinatedLayerTreeHost();
</span><span class="cx">
</span><span class="cx"> const LayerTreeContext& layerTreeContext() override { return m_layerTreeContext; }
</span><span class="lines">@@ -75,7 +75,7 @@
</span><span class="cx"> static RefPtr<WebCore::CoordinatedSurface> createCoordinatedSurface(const WebCore::IntSize&, WebCore::CoordinatedSurface::Flags);
</span><span class="cx">
</span><span class="cx"> protected:
</span><del>- explicit CoordinatedLayerTreeHost(WebPage*);
</del><ins>+ explicit CoordinatedLayerTreeHost(WebPage&);
</ins><span class="cx">
</span><span class="cx"> private:
</span><span class="cx"> // CoordinatedLayerTreeHost
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessWebPageCoordinatedGraphicsThreadedCoordinatedLayerTreeHostcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/WebPage/CoordinatedGraphics/ThreadedCoordinatedLayerTreeHost.cpp (201801 => 201802)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/WebPage/CoordinatedGraphics/ThreadedCoordinatedLayerTreeHost.cpp 2016-06-08 09:06:07 UTC (rev 201801)
+++ trunk/Source/WebKit2/WebProcess/WebPage/CoordinatedGraphics/ThreadedCoordinatedLayerTreeHost.cpp 2016-06-08 12:13:11 UTC (rev 201802)
</span><span class="lines">@@ -48,7 +48,7 @@
</span><span class="cx">
</span><span class="cx"> namespace WebKit {
</span><span class="cx">
</span><del>-Ref<ThreadedCoordinatedLayerTreeHost> ThreadedCoordinatedLayerTreeHost::create(WebPage* webPage)
</del><ins>+Ref<ThreadedCoordinatedLayerTreeHost> ThreadedCoordinatedLayerTreeHost::create(WebPage webPage)
</ins><span class="cx"> {
</span><span class="cx"> return adoptRef(*new ThreadedCoordinatedLayerTreeHost(webPage));
</span><span class="cx"> }
</span><span class="lines">@@ -57,7 +57,7 @@
</span><span class="cx"> {
</span><span class="cx"> }
</span><span class="cx">
</span><del>-ThreadedCoordinatedLayerTreeHost::ThreadedCoordinatedLayerTreeHost(WebPage* webPage)
</del><ins>+ThreadedCoordinatedLayerTreeHost::ThreadedCoordinatedLayerTreeHost(WebPage& webPage)
</ins><span class="cx"> : LayerTreeHost(webPage)
</span><span class="cx"> , m_forceRepaintAsyncCallbackID(0)
</span><span class="cx"> , m_notifyAfterScheduledLayerFlush(false)
</span><span class="lines">@@ -66,9 +66,9 @@
</span><span class="cx"> , m_layerFlushTimer(RunLoop::main(), this, &ThreadedCoordinatedLayerTreeHost::performScheduledLayerFlush)
</span><span class="cx"> , m_layerFlushSchedulingEnabled(true)
</span><span class="cx"> {
</span><del>- m_coordinator = std::make_unique<CompositingCoordinator>(m_webPage->corePage(), this);
</del><ins>+ m_coordinator = std::make_unique<CompositingCoordinator>(m_webPage.corePage(), this);
</ins><span class="cx">
</span><del>- m_coordinator->createRootLayer(m_webPage->size());
</del><ins>+ m_coordinator->createRootLayer(m_webPage.size());
</ins><span class="cx">
</span><span class="cx"> CoordinatedSurface::setFactory(createCoordinatedSurface);
</span><span class="cx">
</span><span class="lines">@@ -149,7 +149,7 @@
</span><span class="cx"> void ThreadedCoordinatedLayerTreeHost::deviceOrPageScaleFactorChanged()
</span><span class="cx"> {
</span><span class="cx"> m_coordinator->deviceOrPageScaleFactorChanged();
</span><del>- m_compositor->setDeviceScaleFactor(m_webPage->deviceScaleFactor());
</del><ins>+ m_compositor->setDeviceScaleFactor(m_webPage.deviceScaleFactor());
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void ThreadedCoordinatedLayerTreeHost::pauseRendering()
</span><span class="lines">@@ -180,12 +180,12 @@
</span><span class="cx">
</span><span class="cx"> void ThreadedCoordinatedLayerTreeHost::compositorDidFlushLayers()
</span><span class="cx"> {
</span><del>- static_cast<DrawingAreaImpl*>(m_webPage->drawingArea())->layerHostDidFlushLayers();
</del><ins>+ static_cast<DrawingAreaImpl*>(m_webPage.drawingArea())->layerHostDidFlushLayers();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void ThreadedCoordinatedLayerTreeHost::didScaleFactorChanged(float scale, const IntPoint& origin)
</span><span class="cx"> {
</span><del>- m_webPage->scalePage(scale, origin);
</del><ins>+ m_webPage.scalePage(scale, origin);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void ThreadedCoordinatedLayerTreeHost::setViewOverlayRootLayer(GraphicsLayer* graphicsLayer)
</span><span class="lines">@@ -221,8 +221,8 @@
</span><span class="cx"> if (m_lastScrollPosition != roundedIntPoint(rect.location())) {
</span><span class="cx"> m_lastScrollPosition = roundedIntPoint(rect.location());
</span><span class="cx">
</span><del>- if (!m_webPage->corePage()->mainFrame().view()->useFixedLayout())
- m_webPage->corePage()->mainFrame().view()->notifyScrollPositionChanged(m_lastScrollPosition);
</del><ins>+ if (!m_webPage.corePage()->mainFrame().view()->useFixedLayout())
+ m_webPage.corePage()->mainFrame().view()->notifyScrollPositionChanged(m_lastScrollPosition);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if (m_lastScaleFactor != scale) {
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessWebPageCoordinatedGraphicsThreadedCoordinatedLayerTreeHosth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/WebPage/CoordinatedGraphics/ThreadedCoordinatedLayerTreeHost.h (201801 => 201802)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/WebPage/CoordinatedGraphics/ThreadedCoordinatedLayerTreeHost.h 2016-06-08 09:06:07 UTC (rev 201801)
+++ trunk/Source/WebKit2/WebProcess/WebPage/CoordinatedGraphics/ThreadedCoordinatedLayerTreeHost.h 2016-06-08 12:13:11 UTC (rev 201802)
</span><span class="lines">@@ -61,7 +61,7 @@
</span><span class="cx"> class ThreadedCoordinatedLayerTreeHost : public LayerTreeHost, public WebCore::CompositingCoordinator::Client, public ThreadedCompositor::Client {
</span><span class="cx"> WTF_MAKE_NONCOPYABLE(ThreadedCoordinatedLayerTreeHost); WTF_MAKE_FAST_ALLOCATED;
</span><span class="cx"> public:
</span><del>- static Ref<ThreadedCoordinatedLayerTreeHost> create(WebPage*);
</del><ins>+ static Ref<ThreadedCoordinatedLayerTreeHost> create(WebPage&);
</ins><span class="cx"> virtual ~ThreadedCoordinatedLayerTreeHost();
</span><span class="cx">
</span><span class="cx"> const LayerTreeContext& layerTreeContext() override { return m_layerTreeContext; };
</span><span class="lines">@@ -101,7 +101,7 @@
</span><span class="cx"> static RefPtr<WebCore::CoordinatedSurface> createCoordinatedSurface(const WebCore::IntSize&, WebCore::CoordinatedSurface::Flags);
</span><span class="cx">
</span><span class="cx"> protected:
</span><del>- explicit ThreadedCoordinatedLayerTreeHost(WebPage*);
</del><ins>+ explicit ThreadedCoordinatedLayerTreeHost(WebPage&);
</ins><span class="cx">
</span><span class="cx"> private:
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessWebPageDrawingAreaImplcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/WebPage/DrawingAreaImpl.cpp (201801 => 201802)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/WebPage/DrawingAreaImpl.cpp 2016-06-08 09:06:07 UTC (rev 201801)
+++ trunk/Source/WebKit2/WebProcess/WebPage/DrawingAreaImpl.cpp 2016-06-08 12:13:11 UTC (rev 201802)
</span><span class="lines">@@ -471,7 +471,7 @@
</span><span class="cx">
</span><span class="cx"> ASSERT(!m_layerTreeHost);
</span><span class="cx">
</span><del>- m_layerTreeHost = LayerTreeHost::create(&m_webPage);
</del><ins>+ m_layerTreeHost = LayerTreeHost::create(m_webPage);
</ins><span class="cx"> #if USE(TEXTURE_MAPPER) && PLATFORM(GTK)
</span><span class="cx"> if (m_nativeSurfaceHandleForCompositing)
</span><span class="cx"> m_layerTreeHost->setNativeSurfaceHandleForCompositing(m_nativeSurfaceHandleForCompositing);
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessWebPageLayerTreeHostcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/WebPage/LayerTreeHost.cpp (201801 => 201802)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/WebPage/LayerTreeHost.cpp 2016-06-08 09:06:07 UTC (rev 201801)
+++ trunk/Source/WebKit2/WebProcess/WebPage/LayerTreeHost.cpp 2016-06-08 12:13:11 UTC (rev 201802)
</span><span class="lines">@@ -41,7 +41,7 @@
</span><span class="cx">
</span><span class="cx"> namespace WebKit {
</span><span class="cx">
</span><del>-PassRefPtr<LayerTreeHost> LayerTreeHost::create(WebPage* webPage)
</del><ins>+RefPtr<LayerTreeHost> LayerTreeHost::create(WebPage& webPage)
</ins><span class="cx"> {
</span><span class="cx"> #if USE(COORDINATED_GRAPHICS_THREADED)
</span><span class="cx"> return ThreadedCoordinatedLayerTreeHost::create(webPage);
</span><span class="lines">@@ -51,11 +51,11 @@
</span><span class="cx"> return LayerTreeHostGtk::create(webPage);
</span><span class="cx"> #else
</span><span class="cx"> UNUSED_PARAM(webPage);
</span><del>- return 0;
</del><ins>+ return nullptr;
</ins><span class="cx"> #endif
</span><span class="cx"> }
</span><span class="cx">
</span><del>-LayerTreeHost::LayerTreeHost(WebPage* webPage)
</del><ins>+LayerTreeHost::LayerTreeHost(WebPage& webPage)
</ins><span class="cx"> : m_webPage(webPage)
</span><span class="cx"> {
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessWebPageLayerTreeHosth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/WebPage/LayerTreeHost.h (201801 => 201802)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/WebPage/LayerTreeHost.h 2016-06-08 09:06:07 UTC (rev 201801)
+++ trunk/Source/WebKit2/WebProcess/WebPage/LayerTreeHost.h 2016-06-08 12:13:11 UTC (rev 201802)
</span><span class="lines">@@ -57,7 +57,7 @@
</span><span class="cx">
</span><span class="cx"> class LayerTreeHost : public RefCounted<LayerTreeHost> {
</span><span class="cx"> public:
</span><del>- static PassRefPtr<LayerTreeHost> create(WebPage*);
</del><ins>+ static RefPtr<LayerTreeHost> create(WebPage&);
</ins><span class="cx"> virtual ~LayerTreeHost();
</span><span class="cx">
</span><span class="cx"> virtual const LayerTreeContext& layerTreeContext() = 0;
</span><span class="lines">@@ -101,9 +101,9 @@
</span><span class="cx"> virtual void setViewOverlayRootLayer(WebCore::GraphicsLayer*) = 0;
</span><span class="cx">
</span><span class="cx"> protected:
</span><del>- explicit LayerTreeHost(WebPage*);
</del><ins>+ explicit LayerTreeHost(WebPage&);
</ins><span class="cx">
</span><del>- WebPage* m_webPage;
</del><ins>+ WebPage& m_webPage;
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> } // namespace WebKit
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessWebPagegtkLayerTreeHostGtkcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/WebPage/gtk/LayerTreeHostGtk.cpp (201801 => 201802)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/WebPage/gtk/LayerTreeHostGtk.cpp 2016-06-08 09:06:07 UTC (rev 201801)
+++ trunk/Source/WebKit2/WebProcess/WebPage/gtk/LayerTreeHostGtk.cpp 2016-06-08 12:13:11 UTC (rev 201802)
</span><span class="lines">@@ -126,14 +126,12 @@
</span><span class="cx"> nextFrame();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-PassRefPtr<LayerTreeHostGtk> LayerTreeHostGtk::create(WebPage* webPage)
</del><ins>+Ref<LayerTreeHostGtk> LayerTreeHostGtk::create(WebPage& webPage)
</ins><span class="cx"> {
</span><del>- RefPtr<LayerTreeHostGtk> host = adoptRef(new LayerTreeHostGtk(webPage));
- host->initialize();
- return host.release();
</del><ins>+ return adoptRef(*new LayerTreeHostGtk(webPage));
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-LayerTreeHostGtk::LayerTreeHostGtk(WebPage* webPage)
</del><ins>+LayerTreeHostGtk::LayerTreeHostGtk(WebPage& webPage)
</ins><span class="cx"> : LayerTreeHost(webPage)
</span><span class="cx"> , m_isValid(true)
</span><span class="cx"> , m_notifyAfterScheduledLayerFlush(false)
</span><span class="lines">@@ -141,41 +139,21 @@
</span><span class="cx"> , m_viewOverlayRootLayer(nullptr)
</span><span class="cx"> , m_renderFrameScheduler(std::bind(&LayerTreeHostGtk::renderFrame, this))
</span><span class="cx"> {
</span><del>-}
-
-bool LayerTreeHostGtk::makeContextCurrent()
-{
- if (!m_layerTreeContext.contextID) {
- m_context = nullptr;
- return false;
- }
-
- if (!m_context) {
- m_context = GLContext::createContextForWindow(reinterpret_cast<GLNativeWindowType>(m_layerTreeContext.contextID), GLContext::sharingContext());
- if (!m_context)
- return false;
- }
-
- return m_context->makeContextCurrent();
-}
-
-void LayerTreeHostGtk::initialize()
-{
</del><span class="cx"> m_rootLayer = GraphicsLayer::create(graphicsLayerFactory(), *this);
</span><span class="cx"> m_rootLayer->setDrawsContent(false);
</span><del>- m_rootLayer->setSize(m_webPage->size());
</del><ins>+ m_rootLayer->setSize(m_webPage.size());
</ins><span class="cx">
</span><span class="cx"> m_scaleMatrix.makeIdentity();
</span><del>- m_scaleMatrix.scale(m_webPage->deviceScaleFactor() * m_webPage->pageScaleFactor());
</del><ins>+ m_scaleMatrix.scale(m_webPage.deviceScaleFactor() * m_webPage.pageScaleFactor());
</ins><span class="cx"> downcast<GraphicsLayerTextureMapper>(*m_rootLayer).layer().setAnchorPoint(FloatPoint3D());
</span><span class="cx"> downcast<GraphicsLayerTextureMapper>(*m_rootLayer).layer().setTransform(m_scaleMatrix);
</span><span class="cx">
</span><span class="cx"> // The non-composited contents are a child of the root layer.
</span><span class="cx"> m_nonCompositedContentLayer = GraphicsLayer::create(graphicsLayerFactory(), *this);
</span><span class="cx"> m_nonCompositedContentLayer->setDrawsContent(true);
</span><del>- m_nonCompositedContentLayer->setContentsOpaque(m_webPage->drawsBackground());
- m_nonCompositedContentLayer->setSize(m_webPage->size());
- if (m_webPage->corePage()->settings().acceleratedDrawingEnabled())
</del><ins>+ m_nonCompositedContentLayer->setContentsOpaque(m_webPage.drawsBackground());
+ m_nonCompositedContentLayer->setSize(m_webPage.size());
+ if (m_webPage.corePage()->settings().acceleratedDrawingEnabled())
</ins><span class="cx"> m_nonCompositedContentLayer->setAcceleratesDrawing(true);
</span><span class="cx">
</span><span class="cx"> #ifndef NDEBUG
</span><span class="lines">@@ -187,6 +165,22 @@
</span><span class="cx"> m_nonCompositedContentLayer->setNeedsDisplay();
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+bool LayerTreeHostGtk::makeContextCurrent()
+{
+ if (!m_layerTreeContext.contextID) {
+ m_context = nullptr;
+ return false;
+ }
+
+ if (!m_context) {
+ m_context = GLContext::createContextForWindow(reinterpret_cast<GLNativeWindowType>(m_layerTreeContext.contextID), GLContext::sharingContext());
+ if (!m_context)
+ return false;
+ }
+
+ return m_context->makeContextCurrent();
+}
+
</ins><span class="cx"> LayerTreeHostGtk::~LayerTreeHostGtk()
</span><span class="cx"> {
</span><span class="cx"> ASSERT(!m_isValid);
</span><span class="lines">@@ -279,7 +273,7 @@
</span><span class="cx"> m_nonCompositedContentLayer->deviceOrPageScaleFactorChanged();
</span><span class="cx">
</span><span class="cx"> m_scaleMatrix.makeIdentity();
</span><del>- m_scaleMatrix.scale(m_webPage->deviceScaleFactor() * m_webPage->pageScaleFactor());
</del><ins>+ m_scaleMatrix.scale(m_webPage.deviceScaleFactor() * m_webPage.pageScaleFactor());
</ins><span class="cx"> downcast<GraphicsLayerTextureMapper>(*m_rootLayer).layer().setTransform(m_scaleMatrix);
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -291,17 +285,17 @@
</span><span class="cx"> void LayerTreeHostGtk::paintContents(const GraphicsLayer* graphicsLayer, GraphicsContext& graphicsContext, GraphicsLayerPaintingPhase, const FloatRect& clipRect)
</span><span class="cx"> {
</span><span class="cx"> if (graphicsLayer == m_nonCompositedContentLayer.get())
</span><del>- m_webPage->drawRect(graphicsContext, enclosingIntRect(clipRect));
</del><ins>+ m_webPage.drawRect(graphicsContext, enclosingIntRect(clipRect));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> float LayerTreeHostGtk::deviceScaleFactor() const
</span><span class="cx"> {
</span><del>- return m_webPage->deviceScaleFactor();
</del><ins>+ return m_webPage.deviceScaleFactor();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> float LayerTreeHostGtk::pageScaleFactor() const
</span><span class="cx"> {
</span><del>- return m_webPage->pageScaleFactor();
</del><ins>+ return m_webPage.pageScaleFactor();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> bool LayerTreeHostGtk::renderFrame()
</span><span class="lines">@@ -312,11 +306,11 @@
</span><span class="cx">
</span><span class="cx"> bool LayerTreeHostGtk::flushPendingLayerChanges()
</span><span class="cx"> {
</span><del>- bool viewportIsStable = m_webPage->corePage()->mainFrame().view()->viewportIsStable();
</del><ins>+ bool viewportIsStable = m_webPage.corePage()->mainFrame().view()->viewportIsStable();
</ins><span class="cx"> m_rootLayer->flushCompositingStateForThisLayerOnly(viewportIsStable);
</span><span class="cx"> m_nonCompositedContentLayer->flushCompositingStateForThisLayerOnly(viewportIsStable);
</span><span class="cx">
</span><del>- if (!m_webPage->corePage()->mainFrame().view()->flushCompositingStateIncludingSubframes())
</del><ins>+ if (!m_webPage.corePage()->mainFrame().view()->flushCompositingStateIncludingSubframes())
</ins><span class="cx"> return false;
</span><span class="cx">
</span><span class="cx"> if (m_viewOverlayRootLayer)
</span><span class="lines">@@ -354,7 +348,7 @@
</span><span class="cx"> {
</span><span class="cx"> {
</span><span class="cx"> RefPtr<LayerTreeHostGtk> protect(this);
</span><del>- m_webPage->layoutIfNeeded();
</del><ins>+ m_webPage.layoutIfNeeded();
</ins><span class="cx">
</span><span class="cx"> if (!m_isValid)
</span><span class="cx"> return;
</span><span class="lines">@@ -371,7 +365,7 @@
</span><span class="cx">
</span><span class="cx"> if (m_notifyAfterScheduledLayerFlush) {
</span><span class="cx"> // Let the drawing area know that we've done a flush of the layer changes.
</span><del>- static_cast<DrawingAreaImpl*>(m_webPage->drawingArea())->layerHostDidFlushLayers();
</del><ins>+ static_cast<DrawingAreaImpl*>(m_webPage.drawingArea())->layerHostDidFlushLayers();
</ins><span class="cx"> m_notifyAfterScheduledLayerFlush = false;
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="lines">@@ -401,7 +395,7 @@
</span><span class="cx">
</span><span class="cx"> void LayerTreeHostGtk::pageBackgroundTransparencyChanged()
</span><span class="cx"> {
</span><del>- m_nonCompositedContentLayer->setContentsOpaque(m_webPage->drawsBackground());
</del><ins>+ m_nonCompositedContentLayer->setContentsOpaque(m_webPage.drawsBackground());
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void LayerTreeHostGtk::cancelPendingLayerFlush()
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessWebPagegtkLayerTreeHostGtkh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/WebPage/gtk/LayerTreeHostGtk.h (201801 => 201802)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/WebPage/gtk/LayerTreeHostGtk.h 2016-06-08 09:06:07 UTC (rev 201801)
+++ trunk/Source/WebKit2/WebProcess/WebPage/gtk/LayerTreeHostGtk.h 2016-06-08 12:13:11 UTC (rev 201802)
</span><span class="lines">@@ -41,16 +41,14 @@
</span><span class="cx">
</span><span class="cx"> class LayerTreeHostGtk final : public LayerTreeHost, WebCore::GraphicsLayerClient {
</span><span class="cx"> public:
</span><del>- static PassRefPtr<LayerTreeHostGtk> create(WebPage*);
</del><ins>+ static Ref<LayerTreeHostGtk> create(WebPage&);
</ins><span class="cx"> virtual ~LayerTreeHostGtk();
</span><span class="cx">
</span><del>-protected:
- explicit LayerTreeHostGtk(WebPage*);
</del><ins>+private:
+ explicit LayerTreeHostGtk(WebPage&);
</ins><span class="cx">
</span><span class="cx"> WebCore::GraphicsLayer* rootLayer() const { return m_rootLayer.get(); }
</span><span class="cx">
</span><del>- void initialize();
-
</del><span class="cx"> // LayerTreeHost
</span><span class="cx"> void scheduleLayerFlush() override;
</span><span class="cx"> void setLayerFlushSchedulingEnabled(bool layerFlushingEnabled) override;
</span><span class="lines">@@ -64,8 +62,6 @@
</span><span class="cx">
</span><span class="cx"> void setNativeSurfaceHandleForCompositing(uint64_t) override;
</span><span class="cx">
</span><del>-private:
-
</del><span class="cx"> class RenderFrameScheduler {
</span><span class="cx"> public:
</span><span class="cx"> RenderFrameScheduler(std::function<bool()>);
</span></span></pre>
</div>
</div>
</body>
</html>