<!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>[211350] 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/211350">211350</a></dd>
<dt>Author</dt> <dd>carlosgc@webkit.org</dd>
<dt>Date</dt> <dd>2017-01-29 02:06:30 -0800 (Sun, 29 Jan 2017)</dd>
</dl>
<h3>Log Message</h3>
<pre>[Coordinated Graphics] WebPage shouldn't use the layerTreeHost directly
https://bugs.webkit.org/show_bug.cgi?id=167494
Reviewed by Michael Catanzaro.
In Coordinated Graphics we have a couple of methods that the WebPage uses directly from the layer tree host,
instead of using the drawing area interface. This patch adds DrawingArea::didChangeViewportAttributes and
DrawingArea::deviceOrPageScaleFactorChanged and renames LayerTreeHost::didChangeViewportProperties as
LayerTreeHost::didChangeViewportAttributes for consistency.
* Shared/CoordinatedGraphics/SimpleViewportController.cpp:
(WebKit::SimpleViewportController::didChangeViewportAttributes): Receive an rvalue reference to avoid copies.
* Shared/CoordinatedGraphics/SimpleViewportController.h:
* WebProcess/WebPage/AcceleratedDrawingArea.cpp:
(WebKit::AcceleratedDrawingArea::didChangeViewportAttributes): Forward it to the layer tree host if any.
(WebKit::AcceleratedDrawingArea::deviceOrPageScaleFactorChanged): Ditto.
* WebProcess/WebPage/AcceleratedDrawingArea.h:
* WebProcess/WebPage/CoordinatedGraphics/ThreadedCoordinatedLayerTreeHost.cpp:
(WebKit::ThreadedCoordinatedLayerTreeHost::didChangeViewportAttributes): Renamed and updated to pass an rvalue reference.
(WebKit::ThreadedCoordinatedLayerTreeHost::didChangeViewportProperties): Deleted.
* WebProcess/WebPage/CoordinatedGraphics/ThreadedCoordinatedLayerTreeHost.h:
* WebProcess/WebPage/DrawingArea.h:
* WebProcess/WebPage/LayerTreeHost.h:
(WebKit::LayerTreeHost::didChangeViewportAttributes): Renamed and updated to pass an rvalue reference.
(WebKit::LayerTreeHost::didChangeViewportProperties): Deleted.
* WebProcess/WebPage/WebPage.cpp:
(WebKit::WebPage::sendViewportAttributesChanged): Use the drawing area.
(WebKit::WebPage::scalePage): Ditto
(WebKit::WebPage::setDeviceScaleFactor): Ditto.
(WebKit::WebPage::viewportPropertiesDidChange): Ditto.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeLog</a></li>
<li><a href="#trunkSourceWebKit2SharedCoordinatedGraphicsSimpleViewportControllercpp">trunk/Source/WebKit2/Shared/CoordinatedGraphics/SimpleViewportController.cpp</a></li>
<li><a href="#trunkSourceWebKit2SharedCoordinatedGraphicsSimpleViewportControllerh">trunk/Source/WebKit2/Shared/CoordinatedGraphics/SimpleViewportController.h</a></li>
<li><a href="#trunkSourceWebKit2WebProcessWebPageAcceleratedDrawingAreacpp">trunk/Source/WebKit2/WebProcess/WebPage/AcceleratedDrawingArea.cpp</a></li>
<li><a href="#trunkSourceWebKit2WebProcessWebPageAcceleratedDrawingAreah">trunk/Source/WebKit2/WebProcess/WebPage/AcceleratedDrawingArea.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="#trunkSourceWebKit2WebProcessWebPageDrawingAreah">trunk/Source/WebKit2/WebProcess/WebPage/DrawingArea.h</a></li>
<li><a href="#trunkSourceWebKit2WebProcessWebPageLayerTreeHosth">trunk/Source/WebKit2/WebProcess/WebPage/LayerTreeHost.h</a></li>
<li><a href="#trunkSourceWebKit2WebProcessWebPageWebPagecpp">trunk/Source/WebKit2/WebProcess/WebPage/WebPage.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (211349 => 211350)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2017-01-29 07:30:39 UTC (rev 211349)
+++ trunk/Source/WebKit2/ChangeLog 2017-01-29 10:06:30 UTC (rev 211350)
</span><span class="lines">@@ -1,3 +1,36 @@
</span><ins>+2017-01-29 Carlos Garcia Campos <cgarcia@igalia.com>
+
+ [Coordinated Graphics] WebPage shouldn't use the layerTreeHost directly
+ https://bugs.webkit.org/show_bug.cgi?id=167494
+
+ Reviewed by Michael Catanzaro.
+
+ In Coordinated Graphics we have a couple of methods that the WebPage uses directly from the layer tree host,
+ instead of using the drawing area interface. This patch adds DrawingArea::didChangeViewportAttributes and
+ DrawingArea::deviceOrPageScaleFactorChanged and renames LayerTreeHost::didChangeViewportProperties as
+ LayerTreeHost::didChangeViewportAttributes for consistency.
+
+ * Shared/CoordinatedGraphics/SimpleViewportController.cpp:
+ (WebKit::SimpleViewportController::didChangeViewportAttributes): Receive an rvalue reference to avoid copies.
+ * Shared/CoordinatedGraphics/SimpleViewportController.h:
+ * WebProcess/WebPage/AcceleratedDrawingArea.cpp:
+ (WebKit::AcceleratedDrawingArea::didChangeViewportAttributes): Forward it to the layer tree host if any.
+ (WebKit::AcceleratedDrawingArea::deviceOrPageScaleFactorChanged): Ditto.
+ * WebProcess/WebPage/AcceleratedDrawingArea.h:
+ * WebProcess/WebPage/CoordinatedGraphics/ThreadedCoordinatedLayerTreeHost.cpp:
+ (WebKit::ThreadedCoordinatedLayerTreeHost::didChangeViewportAttributes): Renamed and updated to pass an rvalue reference.
+ (WebKit::ThreadedCoordinatedLayerTreeHost::didChangeViewportProperties): Deleted.
+ * WebProcess/WebPage/CoordinatedGraphics/ThreadedCoordinatedLayerTreeHost.h:
+ * WebProcess/WebPage/DrawingArea.h:
+ * WebProcess/WebPage/LayerTreeHost.h:
+ (WebKit::LayerTreeHost::didChangeViewportAttributes): Renamed and updated to pass an rvalue reference.
+ (WebKit::LayerTreeHost::didChangeViewportProperties): Deleted.
+ * WebProcess/WebPage/WebPage.cpp:
+ (WebKit::WebPage::sendViewportAttributesChanged): Use the drawing area.
+ (WebKit::WebPage::scalePage): Ditto
+ (WebKit::WebPage::setDeviceScaleFactor): Ditto.
+ (WebKit::WebPage::viewportPropertiesDidChange): Ditto.
+
</ins><span class="cx"> 2017-01-28 Carlos Garcia Campos <cgarcia@igalia.com>
</span><span class="cx">
</span><span class="cx"> [Threaded Compositor] Crash when detaching the CoordinatedGraphicsScene
</span></span></pre></div>
<a id="trunkSourceWebKit2SharedCoordinatedGraphicsSimpleViewportControllercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Shared/CoordinatedGraphics/SimpleViewportController.cpp (211349 => 211350)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Shared/CoordinatedGraphics/SimpleViewportController.cpp 2017-01-29 07:30:39 UTC (rev 211349)
+++ trunk/Source/WebKit2/Shared/CoordinatedGraphics/SimpleViewportController.cpp 2017-01-29 10:06:30 UTC (rev 211350)
</span><span class="lines">@@ -57,7 +57,7 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void SimpleViewportController::didChangeViewportAttributes(const ViewportAttributes& newAttributes)
</del><ins>+void SimpleViewportController::didChangeViewportAttributes(ViewportAttributes&& newAttributes)
</ins><span class="cx"> {
</span><span class="cx"> if (newAttributes.layoutSize.isEmpty()) {
</span><span class="cx"> resetViewportToDefaultState();
</span><span class="lines">@@ -66,7 +66,7 @@
</span><span class="cx">
</span><span class="cx"> m_hasViewportAttribute = true;
</span><span class="cx">
</span><del>- m_rawAttributes = newAttributes;
</del><ins>+ m_rawAttributes = WTFMove(newAttributes);
</ins><span class="cx"> m_allowsUserScaling = m_rawAttributes.userScalable;
</span><span class="cx"> m_initiallyFitToViewport = m_rawAttributes.initialScale < 0;
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2SharedCoordinatedGraphicsSimpleViewportControllerh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Shared/CoordinatedGraphics/SimpleViewportController.h (211349 => 211350)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Shared/CoordinatedGraphics/SimpleViewportController.h 2017-01-29 07:30:39 UTC (rev 211349)
+++ trunk/Source/WebKit2/Shared/CoordinatedGraphics/SimpleViewportController.h 2017-01-29 10:06:30 UTC (rev 211350)
</span><span class="lines">@@ -41,7 +41,7 @@
</span><span class="cx">
</span><span class="cx"> void didChangeViewportSize(const WebCore::IntSize&);
</span><span class="cx"> void didChangeContentsSize(const WebCore::IntSize&);
</span><del>- void didChangeViewportAttributes(const WebCore::ViewportAttributes&);
</del><ins>+ void didChangeViewportAttributes(WebCore::ViewportAttributes&&);
</ins><span class="cx"> void didScroll(const WebCore::IntPoint&);
</span><span class="cx">
</span><span class="cx"> WebCore::FloatRect visibleContentsRect() const;
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessWebPageAcceleratedDrawingAreacpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/WebPage/AcceleratedDrawingArea.cpp (211349 => 211350)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/WebPage/AcceleratedDrawingArea.cpp 2017-01-29 07:30:39 UTC (rev 211349)
+++ trunk/Source/WebKit2/WebProcess/WebPage/AcceleratedDrawingArea.cpp 2017-01-29 10:06:30 UTC (rev 211350)
</span><span class="lines">@@ -371,6 +371,22 @@
</span><span class="cx"> }
</span><span class="cx"> #endif
</span><span class="cx">
</span><ins>+#if USE(COORDINATED_GRAPHICS_THREADED)
+void AcceleratedDrawingArea::didChangeViewportAttributes(ViewportAttributes&& attrs)
+{
+ if (m_layerTreeHost)
+ m_layerTreeHost->didChangeViewportAttributes(WTFMove(attrs));
+}
+#endif
+
+#if USE(COORDINATED_GRAPHICS) || USE(TEXTURE_MAPPER)
+void AcceleratedDrawingArea::deviceOrPageScaleFactorChanged()
+{
+ if (m_layerTreeHost)
+ m_layerTreeHost->deviceOrPageScaleFactorChanged();
+}
+#endif
+
</ins><span class="cx"> void AcceleratedDrawingArea::activityStateDidChange(ActivityState::Flags changed, bool, const Vector<uint64_t>&)
</span><span class="cx"> {
</span><span class="cx"> if (changed & ActivityState::IsVisible) {
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessWebPageAcceleratedDrawingAreah"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/WebPage/AcceleratedDrawingArea.h (211349 => 211350)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/WebPage/AcceleratedDrawingArea.h 2017-01-29 07:30:39 UTC (rev 211349)
+++ trunk/Source/WebKit2/WebProcess/WebPage/AcceleratedDrawingArea.h 2017-01-29 10:06:30 UTC (rev 211350)
</span><span class="lines">@@ -73,6 +73,14 @@
</span><span class="cx">
</span><span class="cx"> void layerHostDidFlushLayers() override;
</span><span class="cx">
</span><ins>+#if USE(COORDINATED_GRAPHICS_THREADED)
+ void didChangeViewportAttributes(WebCore::ViewportAttributes&&) override;
+#endif
+
+#if USE(COORDINATED_GRAPHICS) || USE(TEXTURE_MAPPER)
+ void deviceOrPageScaleFactorChanged() override;
+#endif
+
</ins><span class="cx"> // IPC message handlers.
</span><span class="cx"> void updateBackingStoreState(uint64_t backingStoreStateID, bool respondImmediately, float deviceScaleFactor, const WebCore::IntSize&, const WebCore::IntSize& scrollOffset) override;
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessWebPageCoordinatedGraphicsThreadedCoordinatedLayerTreeHostcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/WebPage/CoordinatedGraphics/ThreadedCoordinatedLayerTreeHost.cpp (211349 => 211350)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/WebPage/CoordinatedGraphics/ThreadedCoordinatedLayerTreeHost.cpp 2017-01-29 07:30:39 UTC (rev 211349)
+++ trunk/Source/WebKit2/WebProcess/WebPage/CoordinatedGraphics/ThreadedCoordinatedLayerTreeHost.cpp 2017-01-29 10:06:30 UTC (rev 211350)
</span><span class="lines">@@ -139,9 +139,9 @@
</span><span class="cx"> didChangeViewport();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void ThreadedCoordinatedLayerTreeHost::didChangeViewportProperties(const ViewportAttributes& attr)
</del><ins>+void ThreadedCoordinatedLayerTreeHost::didChangeViewportAttributes(ViewportAttributes&& attr)
</ins><span class="cx"> {
</span><del>- m_viewportController.didChangeViewportAttributes(attr);
</del><ins>+ m_viewportController.didChangeViewportAttributes(WTFMove(attr));
</ins><span class="cx"> didChangeViewport();
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessWebPageCoordinatedGraphicsThreadedCoordinatedLayerTreeHosth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/WebPage/CoordinatedGraphics/ThreadedCoordinatedLayerTreeHost.h (211349 => 211350)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/WebPage/CoordinatedGraphics/ThreadedCoordinatedLayerTreeHost.h 2017-01-29 07:30:39 UTC (rev 211349)
+++ trunk/Source/WebKit2/WebProcess/WebPage/CoordinatedGraphics/ThreadedCoordinatedLayerTreeHost.h 2017-01-29 10:06:30 UTC (rev 211350)
</span><span class="lines">@@ -59,7 +59,7 @@
</span><span class="cx"> void pageBackgroundTransparencyChanged() override;
</span><span class="cx">
</span><span class="cx"> void contentsSizeChanged(const WebCore::IntSize&) override;
</span><del>- void didChangeViewportProperties(const WebCore::ViewportAttributes&) override;
</del><ins>+ void didChangeViewportAttributes(WebCore::ViewportAttributes&&) override;
</ins><span class="cx">
</span><span class="cx"> void invalidate() override;
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessWebPageDrawingAreah"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/WebPage/DrawingArea.h (211349 => 211350)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/WebPage/DrawingArea.h 2017-01-29 07:30:39 UTC (rev 211349)
+++ trunk/Source/WebKit2/WebProcess/WebPage/DrawingArea.h 2017-01-29 10:06:30 UTC (rev 211350)
</span><span class="lines">@@ -52,6 +52,7 @@
</span><span class="cx"> class GraphicsLayer;
</span><span class="cx"> class GraphicsLayerFactory;
</span><span class="cx"> class MachSendRight;
</span><ins>+struct ViewportAttributes;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> namespace WebKit {
</span><span class="lines">@@ -140,6 +141,14 @@
</span><span class="cx">
</span><span class="cx"> virtual void layerHostDidFlushLayers() { };
</span><span class="cx">
</span><ins>+#if USE(COORDINATED_GRAPHICS_THREADED)
+ virtual void didChangeViewportAttributes(WebCore::ViewportAttributes&&) = 0;
+#endif
+
+#if USE(COORDINATED_GRAPHICS) || USE(TEXTURE_MAPPER)
+ virtual void deviceOrPageScaleFactorChanged() = 0;
+#endif
+
</ins><span class="cx"> protected:
</span><span class="cx"> DrawingArea(DrawingAreaType, WebPage&);
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessWebPageLayerTreeHosth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/WebPage/LayerTreeHost.h (211349 => 211350)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/WebPage/LayerTreeHost.h 2017-01-29 07:30:39 UTC (rev 211349)
+++ trunk/Source/WebKit2/WebProcess/WebPage/LayerTreeHost.h 2017-01-29 10:06:30 UTC (rev 211350)
</span><span class="lines">@@ -71,7 +71,6 @@
</span><span class="cx"> virtual void forceRepaint() = 0;
</span><span class="cx"> virtual bool forceRepaintAsync(uint64_t /*callbackID*/) { return false; }
</span><span class="cx"> virtual void sizeDidChange(const WebCore::IntSize& newSize) = 0;
</span><del>- virtual void deviceOrPageScaleFactorChanged() = 0;
</del><span class="cx"> virtual void pageBackgroundTransparencyChanged() = 0;
</span><span class="cx">
</span><span class="cx"> virtual void pauseRendering();
</span><span class="lines">@@ -85,7 +84,7 @@
</span><span class="cx">
</span><span class="cx"> #if USE(COORDINATED_GRAPHICS_THREADED)
</span><span class="cx"> virtual void contentsSizeChanged(const WebCore::IntSize&) { };
</span><del>- virtual void didChangeViewportProperties(const WebCore::ViewportAttributes&) { };
</del><ins>+ virtual void didChangeViewportAttributes(WebCore::ViewportAttributes&&) { };
</ins><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> #if USE(COORDINATED_GRAPHICS)
</span><span class="lines">@@ -96,6 +95,10 @@
</span><span class="cx"> virtual void setNativeSurfaceHandleForCompositing(uint64_t) { };
</span><span class="cx"> #endif
</span><span class="cx">
</span><ins>+#if USE(COORDINATED_GRAPHICS) || USE(TEXTURE_MAPPER)
+ virtual void deviceOrPageScaleFactorChanged() = 0;
+#endif
+
</ins><span class="cx"> virtual void setViewOverlayRootLayer(WebCore::GraphicsLayer* viewOverlayRootLayer) { m_viewOverlayRootLayer = viewOverlayRootLayer; }
</span><span class="cx">
</span><span class="cx"> protected:
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessWebPageWebPagecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/WebPage/WebPage.cpp (211349 => 211350)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/WebPage/WebPage.cpp 2017-01-29 07:30:39 UTC (rev 211349)
+++ trunk/Source/WebKit2/WebProcess/WebPage/WebPage.cpp 2017-01-29 10:06:30 UTC (rev 211350)
</span><span class="lines">@@ -237,10 +237,6 @@
</span><span class="cx"> #include <wtf/RefCountedLeakCounter.h>
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>-#if USE(COORDINATED_GRAPHICS) || USE(TEXTURE_MAPPER)
-#include "LayerTreeHost.h"
-#endif
-
</del><span class="cx"> #if USE(COORDINATED_GRAPHICS_MULTIPROCESS)
</span><span class="cx"> #include "CoordinatedLayerTreeHostMessages.h"
</span><span class="cx"> #endif
</span><span class="lines">@@ -1429,8 +1425,7 @@
</span><span class="cx"> setFixedLayoutSize(roundedIntSize(attr.layoutSize));
</span><span class="cx">
</span><span class="cx"> #if USE(COORDINATED_GRAPHICS_THREADED)
</span><del>- if (m_drawingArea->layerTreeHost())
- m_drawingArea->layerTreeHost()->didChangeViewportProperties(attr);
</del><ins>+ m_drawingArea->didChangeViewportAttributes(WTFMove(attr));
</ins><span class="cx"> #else
</span><span class="cx"> send(Messages::WebPageProxy::DidChangeViewportProperties(attr));
</span><span class="cx"> #endif
</span><span class="lines">@@ -1588,8 +1583,7 @@
</span><span class="cx"> pluginView->pageScaleFactorDidChange();
</span><span class="cx">
</span><span class="cx"> #if USE(COORDINATED_GRAPHICS) || USE(TEXTURE_MAPPER)
</span><del>- if (m_drawingArea->layerTreeHost())
- m_drawingArea->layerTreeHost()->deviceOrPageScaleFactorChanged();
</del><ins>+ m_drawingArea->deviceOrPageScaleFactorChanged();
</ins><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> send(Messages::WebPageProxy::PageScaleFactorDidChange(scale));
</span><span class="lines">@@ -1666,8 +1660,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> #if USE(COORDINATED_GRAPHICS) || USE(TEXTURE_MAPPER)
</span><del>- if (m_drawingArea->layerTreeHost())
- m_drawingArea->layerTreeHost()->deviceOrPageScaleFactorChanged();
</del><ins>+ m_drawingArea->deviceOrPageScaleFactorChanged();
</ins><span class="cx"> #endif
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -1751,8 +1744,8 @@
</span><span class="cx"> if (view && view->useFixedLayout())
</span><span class="cx"> sendViewportAttributesChanged(viewportArguments);
</span><span class="cx"> #if USE(COORDINATED_GRAPHICS_THREADED)
</span><del>- else if (auto* layerTreeHost = m_drawingArea->layerTreeHost())
- layerTreeHost->didChangeViewportProperties(ViewportAttributes());
</del><ins>+ else
+ m_drawingArea->didChangeViewportAttributes(ViewportAttributes());
</ins><span class="cx"> #endif
</span><span class="cx"> #endif
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>