<!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>[212608] 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/212608">212608</a></dd>
<dt>Author</dt> <dd>mcatanzaro@igalia.com</dd>
<dt>Date</dt> <dd>2017-02-18 15:08:17 -0800 (Sat, 18 Feb 2017)</dd>
</dl>
<h3>Log Message</h3>
<pre>Remove COORDINATED_GRAPHICS_MULTIPROCESS
https://bugs.webkit.org/show_bug.cgi?id=168514
Reviewed by Darin Adler.
Source/WebCore:
* platform/graphics/gstreamer/MediaPlayerPrivateGStreamerBase.cpp:
* platform/graphics/gstreamer/MediaPlayerPrivateGStreamerBase.h:
Source/WebKit2:
* Shared/DrawingAreaInfo.h:
* UIProcess/API/C/CoordinatedGraphics/WKView.cpp:
(WKViewFindZoomableAreaForRect):
* UIProcess/AcceleratedDrawingAreaProxy.cpp:
(WebKit::AcceleratedDrawingAreaProxy::AcceleratedDrawingAreaProxy):
* UIProcess/AcceleratedDrawingAreaProxy.h:
(WebKit::AcceleratedDrawingAreaProxy::coordinatedLayerTreeHostProxy): Deleted.
* UIProcess/CoordinatedGraphics/CoordinatedLayerTreeHostProxy.cpp: Removed.
* UIProcess/CoordinatedGraphics/CoordinatedLayerTreeHostProxy.h: Removed.
* UIProcess/CoordinatedGraphics/CoordinatedLayerTreeHostProxy.messages.in: Removed.
* UIProcess/CoordinatedGraphics/PageViewportController.cpp:
(WebKit::PageViewportController::pageTransitionViewportReady):
* UIProcess/CoordinatedGraphics/WebPageProxyCoordinatedGraphics.cpp: Removed.
* UIProcess/DrawingAreaProxy.h:
* UIProcess/PageClient.h:
* UIProcess/WebPageProxy.cpp:
(WebKit::WebPageProxy::pageDidRequestScroll): Deleted.
(WebKit::WebPageProxy::pageTransitionViewportReady): Deleted.
(WebKit::WebPageProxy::didRenderFrame): Deleted.
(WebKit::WebPageProxy::commitPageTransitionViewport): Deleted.
* UIProcess/WebPageProxy.h:
* UIProcess/WebPageProxy.messages.in:
* WebProcess/WebPage/AcceleratedDrawingArea.cpp:
(WebKit::AcceleratedDrawingArea::AcceleratedDrawingArea):
(WebKit::AcceleratedDrawingArea::updateBackingStoreState):
(WebKit::AcceleratedDrawingArea::didReceiveCoordinatedLayerTreeHostMessage): Deleted.
* WebProcess/WebPage/AcceleratedDrawingArea.h:
* WebProcess/WebPage/CoordinatedGraphics/CoordinatedLayerTreeHost.cpp:
(WebKit::CoordinatedLayerTreeHost::CoordinatedLayerTreeHost):
(WebKit::CoordinatedLayerTreeHost::commitSceneState):
(WebKit::CoordinatedLayerTreeHost::createCoordinatedSurface):
* WebProcess/WebPage/CoordinatedGraphics/CoordinatedLayerTreeHost.h:
* WebProcess/WebPage/CoordinatedGraphics/WebPageCoordinatedGraphics.cpp: Removed.
* WebProcess/WebPage/DrawingArea.cpp:
(WebKit::DrawingArea::create):
* WebProcess/WebPage/DrawingArea.h:
* WebProcess/WebPage/LayerTreeHost.cpp:
(WebKit::LayerTreeHost::create):
* WebProcess/WebPage/LayerTreeHost.h:
* WebProcess/WebPage/WebPage.cpp:
(WebKit::WebPage::~WebPage):
(WebKit::WebPage::pageDidRequestScroll):
(WebKit::WebPage::didCompletePageTransition):
(WebKit::WebPage::didReceiveMessage):
(WebKit::WebPage::commitPageTransitionViewport): Deleted.
* WebProcess/WebPage/WebPage.h:
* WebProcess/WebPage/WebPage.messages.in:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicsgstreamerMediaPlayerPrivateGStreamerBasecpp">trunk/Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamerBase.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicsgstreamerMediaPlayerPrivateGStreamerBaseh">trunk/Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamerBase.h</a></li>
<li><a href="#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeLog</a></li>
<li><a href="#trunkSourceWebKit2SharedDrawingAreaInfoh">trunk/Source/WebKit2/Shared/DrawingAreaInfo.h</a></li>
<li><a href="#trunkSourceWebKit2UIProcessAPICCoordinatedGraphicsWKViewcpp">trunk/Source/WebKit2/UIProcess/API/C/CoordinatedGraphics/WKView.cpp</a></li>
<li><a href="#trunkSourceWebKit2UIProcessAcceleratedDrawingAreaProxycpp">trunk/Source/WebKit2/UIProcess/AcceleratedDrawingAreaProxy.cpp</a></li>
<li><a href="#trunkSourceWebKit2UIProcessAcceleratedDrawingAreaProxyh">trunk/Source/WebKit2/UIProcess/AcceleratedDrawingAreaProxy.h</a></li>
<li><a href="#trunkSourceWebKit2UIProcessCoordinatedGraphicsPageViewportControllercpp">trunk/Source/WebKit2/UIProcess/CoordinatedGraphics/PageViewportController.cpp</a></li>
<li><a href="#trunkSourceWebKit2UIProcessDrawingAreaProxyh">trunk/Source/WebKit2/UIProcess/DrawingAreaProxy.h</a></li>
<li><a href="#trunkSourceWebKit2UIProcessWebPageProxycpp">trunk/Source/WebKit2/UIProcess/WebPageProxy.cpp</a></li>
<li><a href="#trunkSourceWebKit2UIProcessWebPageProxyh">trunk/Source/WebKit2/UIProcess/WebPageProxy.h</a></li>
<li><a href="#trunkSourceWebKit2UIProcessWebPageProxymessagesin">trunk/Source/WebKit2/UIProcess/WebPageProxy.messages.in</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="#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="#trunkSourceWebKit2WebProcessWebPageDrawingAreacpp">trunk/Source/WebKit2/WebProcess/WebPage/DrawingArea.cpp</a></li>
<li><a href="#trunkSourceWebKit2WebProcessWebPageDrawingAreah">trunk/Source/WebKit2/WebProcess/WebPage/DrawingArea.h</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="#trunkSourceWebKit2WebProcessWebPageWebPagecpp">trunk/Source/WebKit2/WebProcess/WebPage/WebPage.cpp</a></li>
<li><a href="#trunkSourceWebKit2WebProcessWebPageWebPageh">trunk/Source/WebKit2/WebProcess/WebPage/WebPage.h</a></li>
<li><a href="#trunkSourceWebKit2WebProcessWebPageWebPagemessagesin">trunk/Source/WebKit2/WebProcess/WebPage/WebPage.messages.in</a></li>
</ul>
<h3>Removed Paths</h3>
<ul>
<li><a href="#trunkSourceWebKit2UIProcessCoordinatedGraphicsCoordinatedLayerTreeHostProxycpp">trunk/Source/WebKit2/UIProcess/CoordinatedGraphics/CoordinatedLayerTreeHostProxy.cpp</a></li>
<li><a href="#trunkSourceWebKit2UIProcessCoordinatedGraphicsCoordinatedLayerTreeHostProxyh">trunk/Source/WebKit2/UIProcess/CoordinatedGraphics/CoordinatedLayerTreeHostProxy.h</a></li>
<li><a href="#trunkSourceWebKit2UIProcessCoordinatedGraphicsCoordinatedLayerTreeHostProxymessagesin">trunk/Source/WebKit2/UIProcess/CoordinatedGraphics/CoordinatedLayerTreeHostProxy.messages.in</a></li>
<li><a href="#trunkSourceWebKit2UIProcessCoordinatedGraphicsWebPageProxyCoordinatedGraphicscpp">trunk/Source/WebKit2/UIProcess/CoordinatedGraphics/WebPageProxyCoordinatedGraphics.cpp</a></li>
<li><a href="#trunkSourceWebKit2WebProcessWebPageCoordinatedGraphicsWebPageCoordinatedGraphicscpp">trunk/Source/WebKit2/WebProcess/WebPage/CoordinatedGraphics/WebPageCoordinatedGraphics.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (212607 => 212608)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2017-02-18 10:30:59 UTC (rev 212607)
+++ trunk/Source/WebCore/ChangeLog 2017-02-18 23:08:17 UTC (rev 212608)
</span><span class="lines">@@ -1,3 +1,13 @@
</span><ins>+2017-02-18 Michael Catanzaro <mcatanzaro@igalia.com>
+
+ Remove COORDINATED_GRAPHICS_MULTIPROCESS
+ https://bugs.webkit.org/show_bug.cgi?id=168514
+
+ Reviewed by Darin Adler.
+
+ * platform/graphics/gstreamer/MediaPlayerPrivateGStreamerBase.cpp:
+ * platform/graphics/gstreamer/MediaPlayerPrivateGStreamerBase.h:
+
</ins><span class="cx"> 2017-02-17 Simon Fraser <simon.fraser@apple.com>
</span><span class="cx">
</span><span class="cx"> Allow properties in CSSProperties.json that don't trigger code generation
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsgstreamerMediaPlayerPrivateGStreamerBasecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamerBase.cpp (212607 => 212608)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamerBase.cpp 2017-02-18 10:30:59 UTC (rev 212607)
+++ trunk/Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamerBase.cpp 2017-02-18 23:08:17 UTC (rev 212608)
</span><span class="lines">@@ -618,7 +618,7 @@
</span><span class="cx"> m_renderingCanBeAccelerated = m_player && m_player->client().mediaPlayerAcceleratedCompositingEnabled() && m_player->client().mediaPlayerRenderingCanBeAccelerated(m_player);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-#if USE(TEXTURE_MAPPER_GL) && !USE(COORDINATED_GRAPHICS_MULTIPROCESS)
</del><ins>+#if USE(TEXTURE_MAPPER_GL)
</ins><span class="cx"> void MediaPlayerPrivateGStreamerBase::updateTexture(BitmapTextureGL& texture, GstVideoInfo& videoInfo)
</span><span class="cx"> {
</span><span class="cx"> GstBuffer* buffer = gst_sample_get_buffer(m_sample.get());
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsgstreamerMediaPlayerPrivateGStreamerBaseh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamerBase.h (212607 => 212608)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamerBase.h 2017-02-18 10:30:59 UTC (rev 212607)
+++ trunk/Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamerBase.h 2017-02-18 23:08:17 UTC (rev 212608)
</span><span class="lines">@@ -210,7 +210,7 @@
</span><span class="cx"> mutable FloatSize m_videoSize;
</span><span class="cx"> bool m_usingFallbackVideoSink;
</span><span class="cx"> bool m_renderingCanBeAccelerated { false };
</span><del>-#if USE(TEXTURE_MAPPER_GL) && !USE(COORDINATED_GRAPHICS_MULTIPROCESS)
</del><ins>+#if USE(TEXTURE_MAPPER_GL)
</ins><span class="cx"> void updateTexture(BitmapTextureGL&, GstVideoInfo&);
</span><span class="cx"> #endif
</span><span class="cx"> #if USE(GSTREAMER_GL)
</span></span></pre></div>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (212607 => 212608)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2017-02-18 10:30:59 UTC (rev 212607)
+++ trunk/Source/WebKit2/ChangeLog 2017-02-18 23:08:17 UTC (rev 212608)
</span><span class="lines">@@ -1,5 +1,60 @@
</span><span class="cx"> 2017-02-18 Michael Catanzaro <mcatanzaro@igalia.com>
</span><span class="cx">
</span><ins>+ Remove COORDINATED_GRAPHICS_MULTIPROCESS
+ https://bugs.webkit.org/show_bug.cgi?id=168514
+
+ Reviewed by Darin Adler.
+
+ * Shared/DrawingAreaInfo.h:
+ * UIProcess/API/C/CoordinatedGraphics/WKView.cpp:
+ (WKViewFindZoomableAreaForRect):
+ * UIProcess/AcceleratedDrawingAreaProxy.cpp:
+ (WebKit::AcceleratedDrawingAreaProxy::AcceleratedDrawingAreaProxy):
+ * UIProcess/AcceleratedDrawingAreaProxy.h:
+ (WebKit::AcceleratedDrawingAreaProxy::coordinatedLayerTreeHostProxy): Deleted.
+ * UIProcess/CoordinatedGraphics/CoordinatedLayerTreeHostProxy.cpp: Removed.
+ * UIProcess/CoordinatedGraphics/CoordinatedLayerTreeHostProxy.h: Removed.
+ * UIProcess/CoordinatedGraphics/CoordinatedLayerTreeHostProxy.messages.in: Removed.
+ * UIProcess/CoordinatedGraphics/PageViewportController.cpp:
+ (WebKit::PageViewportController::pageTransitionViewportReady):
+ * UIProcess/CoordinatedGraphics/WebPageProxyCoordinatedGraphics.cpp: Removed.
+ * UIProcess/DrawingAreaProxy.h:
+ * UIProcess/PageClient.h:
+ * UIProcess/WebPageProxy.cpp:
+ (WebKit::WebPageProxy::pageDidRequestScroll): Deleted.
+ (WebKit::WebPageProxy::pageTransitionViewportReady): Deleted.
+ (WebKit::WebPageProxy::didRenderFrame): Deleted.
+ (WebKit::WebPageProxy::commitPageTransitionViewport): Deleted.
+ * UIProcess/WebPageProxy.h:
+ * UIProcess/WebPageProxy.messages.in:
+ * WebProcess/WebPage/AcceleratedDrawingArea.cpp:
+ (WebKit::AcceleratedDrawingArea::AcceleratedDrawingArea):
+ (WebKit::AcceleratedDrawingArea::updateBackingStoreState):
+ (WebKit::AcceleratedDrawingArea::didReceiveCoordinatedLayerTreeHostMessage): Deleted.
+ * WebProcess/WebPage/AcceleratedDrawingArea.h:
+ * WebProcess/WebPage/CoordinatedGraphics/CoordinatedLayerTreeHost.cpp:
+ (WebKit::CoordinatedLayerTreeHost::CoordinatedLayerTreeHost):
+ (WebKit::CoordinatedLayerTreeHost::commitSceneState):
+ (WebKit::CoordinatedLayerTreeHost::createCoordinatedSurface):
+ * WebProcess/WebPage/CoordinatedGraphics/CoordinatedLayerTreeHost.h:
+ * WebProcess/WebPage/CoordinatedGraphics/WebPageCoordinatedGraphics.cpp: Removed.
+ * WebProcess/WebPage/DrawingArea.cpp:
+ (WebKit::DrawingArea::create):
+ * WebProcess/WebPage/DrawingArea.h:
+ * WebProcess/WebPage/LayerTreeHost.cpp:
+ (WebKit::LayerTreeHost::create):
+ * WebProcess/WebPage/LayerTreeHost.h:
+ * WebProcess/WebPage/WebPage.cpp:
+ (WebKit::WebPage::~WebPage):
+ (WebKit::WebPage::pageDidRequestScroll):
+ (WebKit::WebPage::didCompletePageTransition):
+ (WebKit::WebPage::didReceiveMessage):
+ (WebKit::WebPage::commitPageTransitionViewport): Deleted.
+ * WebProcess/WebPage/WebPage.h:
+ * WebProcess/WebPage/WebPage.messages.in:
+
+2017-02-18 Michael Catanzaro <mcatanzaro@igalia.com>
+
</ins><span class="cx"> [GTK] Cannot paste primary selection into web view in Wayland
</span><span class="cx"> https://bugs.webkit.org/show_bug.cgi?id=166949
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2SharedDrawingAreaInfoh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Shared/DrawingAreaInfo.h (212607 => 212608)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Shared/DrawingAreaInfo.h 2017-02-18 10:30:59 UTC (rev 212607)
+++ trunk/Source/WebKit2/Shared/DrawingAreaInfo.h 2017-02-18 23:08:17 UTC (rev 212608)
</span><span class="lines">@@ -35,12 +35,8 @@
</span><span class="cx"> #endif
</span><span class="cx"> DrawingAreaTypeRemoteLayerTree,
</span><span class="cx"> #else
</span><del>-#if USE(COORDINATED_GRAPHICS_MULTIPROCESS)
- DrawingAreaTypeCoordinated
-#else
</del><span class="cx"> DrawingAreaTypeImpl
</span><span class="cx"> #endif
</span><del>-#endif
</del><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> } // namespace WebKit
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPICCoordinatedGraphicsWKViewcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/API/C/CoordinatedGraphics/WKView.cpp (212607 => 212608)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/C/CoordinatedGraphics/WKView.cpp 2017-02-18 10:30:59 UTC (rev 212607)
+++ trunk/Source/WebKit2/UIProcess/API/C/CoordinatedGraphics/WKView.cpp 2017-02-18 23:08:17 UTC (rev 212608)
</span><span class="lines">@@ -185,15 +185,8 @@
</span><span class="cx"> return toImpl(view)->opacity();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void WKViewFindZoomableAreaForRect(WKViewRef viewRef, WKRect wkRect)
</del><ins>+void WKViewFindZoomableAreaForRect(WKViewRef, WKRect)
</ins><span class="cx"> {
</span><del>-#if USE(COORDINATED_GRAPHICS_MULTIPROCESS)
- IntRect rect = toIntRect(wkRect);
- toImpl(viewRef)->findZoomableAreaForPoint(rect.center(), rect.size());
-#else
- UNUSED_PARAM(viewRef);
- UNUSED_PARAM(wkRect);
-#endif
</del><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> WKSize WKViewGetContentsSize(WKViewRef viewRef)
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAcceleratedDrawingAreaProxycpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/AcceleratedDrawingAreaProxy.cpp (212607 => 212608)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/AcceleratedDrawingAreaProxy.cpp 2017-02-18 10:30:59 UTC (rev 212607)
+++ trunk/Source/WebKit2/UIProcess/AcceleratedDrawingAreaProxy.cpp 2017-02-18 23:08:17 UTC (rev 212608)
</span><span class="lines">@@ -37,10 +37,6 @@
</span><span class="cx"> #include "WebProcessProxy.h"
</span><span class="cx"> #include <WebCore/Region.h>
</span><span class="cx">
</span><del>-#if USE(COORDINATED_GRAPHICS_MULTIPROCESS)
-#include "CoordinatedLayerTreeHostProxy.h"
-#endif
-
</del><span class="cx"> #if PLATFORM(WAYLAND)
</span><span class="cx"> #include "WaylandCompositor.h"
</span><span class="cx"> #include <WebCore/PlatformDisplay.h>
</span><span class="lines">@@ -51,16 +47,8 @@
</span><span class="cx"> namespace WebKit {
</span><span class="cx">
</span><span class="cx"> AcceleratedDrawingAreaProxy::AcceleratedDrawingAreaProxy(WebPageProxy& webPageProxy)
</span><del>-#if USE(COORDINATED_GRAPHICS_MULTIPROCESS)
- : DrawingAreaProxy(DrawingAreaTypeCoordinated, webPageProxy)
-#else
</del><span class="cx"> : DrawingAreaProxy(DrawingAreaTypeImpl, webPageProxy)
</span><del>-#endif
</del><span class="cx"> {
</span><del>-#if USE(COORDINATED_GRAPHICS_MULTIPROCESS)
- // Construct the proxy early to allow messages to be sent to the web process while AC is entered there.
- m_coordinatedLayerTreeHostProxy = std::make_unique<CoordinatedLayerTreeHostProxy>(webPageProxy);
-#endif
</del><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> AcceleratedDrawingAreaProxy::~AcceleratedDrawingAreaProxy()
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAcceleratedDrawingAreaProxyh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/AcceleratedDrawingAreaProxy.h (212607 => 212608)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/AcceleratedDrawingAreaProxy.h 2017-02-18 10:30:59 UTC (rev 212607)
+++ trunk/Source/WebKit2/UIProcess/AcceleratedDrawingAreaProxy.h 2017-02-18 23:08:17 UTC (rev 212608)
</span><span class="lines">@@ -32,8 +32,6 @@
</span><span class="cx">
</span><span class="cx"> namespace WebKit {
</span><span class="cx">
</span><del>-class CoordinatedLayerTreeHostProxy;
-
</del><span class="cx"> class AcceleratedDrawingAreaProxy : public DrawingAreaProxy {
</span><span class="cx"> public:
</span><span class="cx"> explicit AcceleratedDrawingAreaProxy(WebPageProxy&);
</span><span class="lines">@@ -42,10 +40,6 @@
</span><span class="cx"> bool isInAcceleratedCompositingMode() const { return alwaysUseCompositing() || !m_layerTreeContext.isEmpty(); }
</span><span class="cx"> void visibilityDidChange();
</span><span class="cx">
</span><del>-#if USE(COORDINATED_GRAPHICS_MULTIPROCESS)
- CoordinatedLayerTreeHostProxy& coordinatedLayerTreeHostProxy() const { return *m_coordinatedLayerTreeHostProxy.get(); }
-#endif
-
</del><span class="cx"> #if USE(TEXTURE_MAPPER_GL) && PLATFORM(GTK) && PLATFORM(X11) && !USE(REDIRECTED_XCOMPOSITE_WINDOW)
</span><span class="cx"> void setNativeSurfaceHandleForCompositing(uint64_t);
</span><span class="cx"> void destroyNativeSurfaceHandleForCompositing();
</span><span class="lines">@@ -76,10 +70,6 @@
</span><span class="cx">
</span><span class="cx"> bool alwaysUseCompositing() const;
</span><span class="cx">
</span><del>-#if USE(COORDINATED_GRAPHICS_MULTIPROCESS)
- std::unique_ptr<CoordinatedLayerTreeHostProxy> m_coordinatedLayerTreeHostProxy;
-#endif
-
</del><span class="cx"> // The state ID corresponding to our current backing store. Updated whenever we allocate
</span><span class="cx"> // a new backing store. Any messages received that correspond to an earlier state are ignored,
</span><span class="cx"> // as they don't apply to our current backing store.
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessCoordinatedGraphicsCoordinatedLayerTreeHostProxycpp"></a>
<div class="delfile"><h4>Deleted: trunk/Source/WebKit2/UIProcess/CoordinatedGraphics/CoordinatedLayerTreeHostProxy.cpp (212607 => 212608)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/CoordinatedGraphics/CoordinatedLayerTreeHostProxy.cpp 2017-02-18 10:30:59 UTC (rev 212607)
+++ trunk/Source/WebKit2/UIProcess/CoordinatedGraphics/CoordinatedLayerTreeHostProxy.cpp 2017-02-18 23:08:17 UTC (rev 212608)
</span><span class="lines">@@ -1,91 +0,0 @@
</span><del>-/*
- Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies)
- Copyright (C) 2013 Company 100, Inc.
-
- This library is free software; you can redistribute it and/or
- modify it under the terms of the GNU Library General Public
- License as published by the Free Software Foundation; either
- version 2 of the License, or (at your option) any later version.
-
- This library is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- Library General Public License for more details.
-
- You should have received a copy of the GNU Library General Public License
- along with this library; see the file COPYING.LIB. If not, write to
- the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
- Boston, MA 02110-1301, USA.
-*/
-
-#include "config.h"
-
-#if USE(COORDINATED_GRAPHICS_MULTIPROCESS)
-#include "CoordinatedLayerTreeHostProxy.h"
-
-#include "CoordinatedLayerTreeHostMessages.h"
-#include "CoordinatedLayerTreeHostProxyMessages.h"
-#include "WebPageProxy.h"
-#include "WebProcessProxy.h"
-#include <WebCore/CoordinatedGraphicsState.h>
-
-namespace WebKit {
-
-using namespace WebCore;
-
-CoordinatedLayerTreeHostProxy::CoordinatedLayerTreeHostProxy(WebPageProxy& webPageProxy)
- : m_webPageProxy(webPageProxy)
- , m_scene(adoptRef(new CoordinatedGraphicsScene(this)))
-{
- m_webPageProxy.process().addMessageReceiver(Messages::CoordinatedLayerTreeHostProxy::messageReceiverName(), m_webPageProxy.pageID(), *this);
-}
-
-CoordinatedLayerTreeHostProxy::~CoordinatedLayerTreeHostProxy()
-{
- m_webPageProxy.process().removeMessageReceiver(Messages::CoordinatedLayerTreeHostProxy::messageReceiverName(), m_webPageProxy.pageID());
- m_scene->detach();
-}
-
-void CoordinatedLayerTreeHostProxy::updateViewport()
-{
- m_webPageProxy.setViewNeedsDisplay(IntRect(IntPoint::zero(), m_webPageProxy.viewSize()));
-}
-
-void CoordinatedLayerTreeHostProxy::dispatchUpdate(std::function<void()> function)
-{
- m_scene->appendUpdate(WTFMove(function));
-}
-
-void CoordinatedLayerTreeHostProxy::commitCoordinatedGraphicsState(const CoordinatedGraphicsState& graphicsState)
-{
- RefPtr<CoordinatedGraphicsScene> sceneProtector(m_scene);
- dispatchUpdate([=] {
- sceneProtector->commitSceneState(graphicsState);
- });
-
- updateViewport();
- m_webPageProxy.didRenderFrame(graphicsState.contentsSize, graphicsState.coveredRect);
-}
-
-void CoordinatedLayerTreeHostProxy::setVisibleContentsRect(const FloatRect& rect, const FloatPoint& trajectoryVector)
-{
- if (rect == m_lastSentVisibleRect && trajectoryVector == m_lastSentTrajectoryVector)
- return;
-
- m_webPageProxy.process().send(Messages::CoordinatedLayerTreeHost::SetVisibleContentsRect(rect, trajectoryVector), m_webPageProxy.pageID());
- m_lastSentVisibleRect = rect;
- m_lastSentTrajectoryVector = trajectoryVector;
-}
-
-void CoordinatedLayerTreeHostProxy::renderNextFrame()
-{
- m_webPageProxy.process().send(Messages::CoordinatedLayerTreeHost::RenderNextFrame(), m_webPageProxy.pageID());
-}
-
-void CoordinatedLayerTreeHostProxy::commitScrollOffset(uint32_t layerID, const IntSize& offset)
-{
- m_webPageProxy.process().send(Messages::CoordinatedLayerTreeHost::CommitScrollOffset(layerID, offset), m_webPageProxy.pageID());
-}
-
-}
-#endif // USE(COORDINATED_GRAPHICS_MULTIPROCESS)
</del></span></pre></div>
<a id="trunkSourceWebKit2UIProcessCoordinatedGraphicsCoordinatedLayerTreeHostProxyh"></a>
<div class="delfile"><h4>Deleted: trunk/Source/WebKit2/UIProcess/CoordinatedGraphics/CoordinatedLayerTreeHostProxy.h (212607 => 212608)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/CoordinatedGraphics/CoordinatedLayerTreeHostProxy.h 2017-02-18 10:30:59 UTC (rev 212607)
+++ trunk/Source/WebKit2/UIProcess/CoordinatedGraphics/CoordinatedLayerTreeHostProxy.h 2017-02-18 23:08:17 UTC (rev 212608)
</span><span class="lines">@@ -1,73 +0,0 @@
</span><del>-/*
- Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies)
- Copyright (C) 2013 Company 100, Inc.
-
- This library is free software; you can redistribute it and/or
- modify it under the terms of the GNU Library General Public
- License as published by the Free Software Foundation; either
- version 2 of the License, or (at your option) any later version.
-
- This library is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- Library General Public License for more details.
-
- You should have received a copy of the GNU Library General Public License
- along with this library; see the file COPYING.LIB. If not, write to
- the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
- Boston, MA 02110-1301, USA.
-*/
-
-#ifndef CoordinatedLayerTreeHostProxy_h
-#define CoordinatedLayerTreeHostProxy_h
-
-#if USE(COORDINATED_GRAPHICS)
-
-#include "CoordinatedGraphicsArgumentCoders.h"
-#include "CoordinatedGraphicsScene.h"
-#include "MessageReceiver.h"
-#include <functional>
-
-namespace WebCore {
-struct CoordinatedGraphicsState;
-class IntSize;
-}
-
-namespace WebKit {
-
-class WebPageProxy;
-
-class CoordinatedLayerTreeHostProxy : public CoordinatedGraphicsSceneClient, public IPC::MessageReceiver {
- WTF_MAKE_NONCOPYABLE(CoordinatedLayerTreeHostProxy);
- WTF_MAKE_FAST_ALLOCATED;
-public:
- explicit CoordinatedLayerTreeHostProxy(WebPageProxy&);
- virtual ~CoordinatedLayerTreeHostProxy();
-
- void commitCoordinatedGraphicsState(const WebCore::CoordinatedGraphicsState&);
-
- void setVisibleContentsRect(const WebCore::FloatRect&, const WebCore::FloatPoint& trajectoryVector);
- CoordinatedGraphicsScene* coordinatedGraphicsScene() const { return m_scene.get(); }
-
- void updateViewport() override;
- void renderNextFrame() override;
-
- void commitScrollOffset(uint32_t layerID, const WebCore::IntSize& offset) override;
-
-protected:
- void dispatchUpdate(std::function<void()>);
-
- // IPC::MessageReceiver
- void didReceiveMessage(IPC::Connection&, IPC::Decoder&) override;
-
- WebPageProxy& m_webPageProxy;
- RefPtr<CoordinatedGraphicsScene> m_scene;
- WebCore::FloatRect m_lastSentVisibleRect;
- WebCore::FloatPoint m_lastSentTrajectoryVector;
-};
-
-} // namespace WebKit
-
-#endif // USE(COORDINATED_GRAPHICS)
-
-#endif // CoordinatedLayerTreeHostProxy_h
</del></span></pre></div>
<a id="trunkSourceWebKit2UIProcessCoordinatedGraphicsCoordinatedLayerTreeHostProxymessagesin"></a>
<div class="delfile"><h4>Deleted: trunk/Source/WebKit2/UIProcess/CoordinatedGraphics/CoordinatedLayerTreeHostProxy.messages.in (212607 => 212608)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/CoordinatedGraphics/CoordinatedLayerTreeHostProxy.messages.in 2017-02-18 10:30:59 UTC (rev 212607)
+++ trunk/Source/WebKit2/UIProcess/CoordinatedGraphics/CoordinatedLayerTreeHostProxy.messages.in 2017-02-18 23:08:17 UTC (rev 212608)
</span><span class="lines">@@ -1,26 +0,0 @@
</span><del>-#
-# Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies)
-# Copyright (C) 2013 Company 100, Inc.
-#
-# This library is free software; you can redistribute it and/or
-# modify it under the terms of the GNU Library General Public
-# License as published by the Free Software Foundation; either
-# version 2 of the License, or (at your option) any later version.
-#
-# This library is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-# Library General Public License for more details.
-#
-# You should have received a copy of the GNU Library General Public License
-# along with this library; see the file COPYING.LIB. If not, write to
-# the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
-# Boston, MA 02110-1301, USA.
-#
-
-#if USE(COORDINATED_GRAPHICS)
-messages -> CoordinatedLayerTreeHostProxy {
-
- CommitCoordinatedGraphicsState(struct WebCore::CoordinatedGraphicsState state)
-}
-#endif
</del></span></pre></div>
<a id="trunkSourceWebKit2UIProcessCoordinatedGraphicsPageViewportControllercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/CoordinatedGraphics/PageViewportController.cpp (212607 => 212608)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/CoordinatedGraphics/PageViewportController.cpp 2017-02-18 10:30:59 UTC (rev 212607)
+++ trunk/Source/WebKit2/UIProcess/CoordinatedGraphics/PageViewportController.cpp 2017-02-18 23:08:17 UTC (rev 212608)
</span><span class="lines">@@ -23,7 +23,6 @@
</span><span class="cx"> #include "PageViewportController.h"
</span><span class="cx">
</span><span class="cx"> #include "AcceleratedDrawingAreaProxy.h"
</span><del>-#include "CoordinatedLayerTreeHostProxy.h"
</del><span class="cx"> #include "PageViewportControllerClient.h"
</span><span class="cx"> #include "WebPageProxy.h"
</span><span class="cx"> #include <WebCore/FloatRect.h>
</span><span class="lines">@@ -196,14 +195,6 @@
</span><span class="cx"> float initialScale = m_initiallyFitToViewport ? m_minimumScaleToFit : m_rawAttributes.initialScale;
</span><span class="cx"> applyScaleAfterRenderingContents(innerBoundedViewportScale(initialScale));
</span><span class="cx"> }
</span><del>-
-#if USE(COORDINATED_GRAPHICS_MULTIPROCESS)
- // At this point we should already have received the first viewport arguments and the requested scroll
- // position for the newly loaded page and sent our reactions to the web process. It's now safe to tell
- // the web process to start rendering the new page contents and possibly re-use the current tiles.
- // This assumes that all messages have been handled in order and that nothing has been pushed back on the event loop.
- m_webPageProxy->commitPageTransitionViewport();
-#endif
</del><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void PageViewportController::pageDidRequestScroll(const IntPoint& cssPosition)
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessCoordinatedGraphicsWebPageProxyCoordinatedGraphicscpp"></a>
<div class="delfile"><h4>Deleted: trunk/Source/WebKit2/UIProcess/CoordinatedGraphics/WebPageProxyCoordinatedGraphics.cpp (212607 => 212608)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/CoordinatedGraphics/WebPageProxyCoordinatedGraphics.cpp 2017-02-18 10:30:59 UTC (rev 212607)
+++ trunk/Source/WebKit2/UIProcess/CoordinatedGraphics/WebPageProxyCoordinatedGraphics.cpp 2017-02-18 23:08:17 UTC (rev 212608)
</span><span class="lines">@@ -1,57 +0,0 @@
</span><del>-/*
- * Copyright (C) 2013 Nokia Corporation and/or its subsidiary(-ies)
- * Copyright (C) 2013 Samsung Electronics. All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in the
- * documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS''
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
- * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
- * THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#include "config.h"
-#if USE(COORDINATED_GRAPHICS)
-
-#include "WebPageProxy.h"
-
-#include "PageClient.h"
-#include "WebPageMessages.h"
-#include "WebProcessProxy.h"
-
-using namespace WebCore;
-
-namespace WebKit {
-
-#if USE(COORDINATED_GRAPHICS_MULTIPROCESS)
-void WebPageProxy::findZoomableAreaForPoint(const IntPoint& point, const IntSize& area)
-{
- if (!isValid())
- return;
-
- m_process->send(Messages::WebPage::FindZoomableAreaForPoint(point, area), m_pageID);
-}
-
-void WebPageProxy::didFindZoomableArea(const IntPoint& target, const IntRect& area)
-{
- m_pageClient.didFindZoomableArea(target, area);
-}
-#endif
-
-} // namespace WebKit
-
-#endif // USE(COORDINATED_GRAPHICS)
</del></span></pre></div>
<a id="trunkSourceWebKit2UIProcessDrawingAreaProxyh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/DrawingAreaProxy.h (212607 => 212608)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/DrawingAreaProxy.h 2017-02-18 10:30:59 UTC (rev 212607)
+++ trunk/Source/WebKit2/UIProcess/DrawingAreaProxy.h 2017-02-18 23:08:17 UTC (rev 212608)
</span><span class="lines">@@ -48,7 +48,6 @@
</span><span class="cx"> namespace WebKit {
</span><span class="cx">
</span><span class="cx"> class LayerTreeContext;
</span><del>-class CoordinatedLayerTreeHostProxy;
</del><span class="cx"> class UpdateInfo;
</span><span class="cx"> class WebPageProxy;
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessWebPageProxycpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/WebPageProxy.cpp (212607 => 212608)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/WebPageProxy.cpp 2017-02-18 10:30:59 UTC (rev 212607)
+++ trunk/Source/WebKit2/UIProcess/WebPageProxy.cpp 2017-02-18 23:08:17 UTC (rev 212608)
</span><span class="lines">@@ -136,10 +136,6 @@
</span><span class="cx"> #include "RemoteScrollingCoordinatorProxy.h"
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>-#if USE(COORDINATED_GRAPHICS_MULTIPROCESS)
-#include "CoordinatedLayerTreeHostProxyMessages.h"
-#endif
-
</del><span class="cx"> #if ENABLE(VIBRATION)
</span><span class="cx"> #include "WebVibrationProxy.h"
</span><span class="cx"> #endif
</span><span class="lines">@@ -4105,31 +4101,6 @@
</span><span class="cx"> m_uiClient->runBeforeUnloadConfirmPanel(this, message, frame, [reply](bool result) { reply->send(result); });
</span><span class="cx"> }
</span><span class="cx">
</span><del>-#if USE(COORDINATED_GRAPHICS_MULTIPROCESS)
-void WebPageProxy::pageDidRequestScroll(const IntPoint& point)
-{
- m_pageClient.pageDidRequestScroll(point);
-}
-
-void WebPageProxy::pageTransitionViewportReady()
-{
- m_pageClient.pageTransitionViewportReady();
-}
-
-void WebPageProxy::didRenderFrame(const WebCore::IntSize& contentsSize, const WebCore::IntRect& coveredRect)
-{
- m_pageClient.didRenderFrame(contentsSize, coveredRect);
-}
-
-void WebPageProxy::commitPageTransitionViewport()
-{
- if (!isValid())
- return;
-
- process().send(Messages::WebPage::CommitPageTransitionViewport(), m_pageID);
-}
-#endif
-
</del><span class="cx"> void WebPageProxy::didChangeViewportProperties(const ViewportAttributes& attr)
</span><span class="cx"> {
</span><span class="cx"> m_pageClient.didChangeViewportProperties(attr);
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessWebPageProxyh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/WebPageProxy.h (212607 => 212608)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/WebPageProxy.h 2017-02-18 10:30:59 UTC (rev 212607)
+++ trunk/Source/WebKit2/UIProcess/WebPageProxy.h 2017-02-18 23:08:17 UTC (rev 212608)
</span><span class="lines">@@ -903,10 +903,6 @@
</span><span class="cx">
</span><span class="cx"> WebPageCreationParameters creationParameters();
</span><span class="cx">
</span><del>-#if USE(COORDINATED_GRAPHICS_MULTIPROCESS)
- void findZoomableAreaForPoint(const WebCore::IntPoint&, const WebCore::IntSize&);
-#endif
-
</del><span class="cx"> void handleDownloadRequest(DownloadProxy*);
</span><span class="cx">
</span><span class="cx"> void advanceToNextMisspelling(bool startBeforeSelection);
</span><span class="lines">@@ -1337,12 +1333,6 @@
</span><span class="cx"> void clearNotifications(const Vector<uint64_t>& notificationIDs);
</span><span class="cx"> void didDestroyNotification(uint64_t notificationID);
</span><span class="cx">
</span><del>-#if USE(COORDINATED_GRAPHICS_MULTIPROCESS)
- void pageDidRequestScroll(const WebCore::IntPoint&);
- void pageTransitionViewportReady();
- void didFindZoomableArea(const WebCore::IntPoint&, const WebCore::IntRect&);
-#endif
-
</del><span class="cx"> void didChangeContentSize(const WebCore::IntSize&);
</span><span class="cx">
</span><span class="cx"> #if ENABLE(INPUT_TYPE_COLOR)
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessWebPageProxymessagesin"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/WebPageProxy.messages.in (212607 => 212608)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/WebPageProxy.messages.in 2017-02-18 10:30:59 UTC (rev 212607)
+++ trunk/Source/WebKit2/UIProcess/WebPageProxy.messages.in 2017-02-18 23:08:17 UTC (rev 212608)
</span><span class="lines">@@ -95,12 +95,6 @@
</span><span class="cx"> HandleInputMethodKeydown() -> (bool handled)
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>-#if USE(COORDINATED_GRAPHICS_MULTIPROCESS)
- PageDidRequestScroll(WebCore::IntPoint point)
- PageTransitionViewportReady()
- DidFindZoomableArea(WebCore::IntPoint target, WebCore::IntRect area)
-#endif
-
</del><span class="cx"> DidChangeContentSize(WebCore::IntSize newSize)
</span><span class="cx">
</span><span class="cx"> #if ENABLE(INPUT_TYPE_COLOR)
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessWebPageAcceleratedDrawingAreacpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/WebPage/AcceleratedDrawingArea.cpp (212607 => 212608)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/WebPage/AcceleratedDrawingArea.cpp 2017-02-18 10:30:59 UTC (rev 212607)
+++ trunk/Source/WebKit2/WebProcess/WebPage/AcceleratedDrawingArea.cpp 2017-02-18 23:08:17 UTC (rev 212608)
</span><span class="lines">@@ -50,11 +50,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> AcceleratedDrawingArea::AcceleratedDrawingArea(WebPage& webPage, const WebPageCreationParameters& parameters)
</span><del>-#if USE(COORDINATED_GRAPHICS_MULTIPROCESS)
- : DrawingArea(DrawingAreaTypeCoordinated, webPage)
-#else
</del><span class="cx"> : DrawingArea(DrawingAreaTypeImpl, webPage)
</span><del>-#endif
</del><span class="cx"> , m_exitCompositingTimer(RunLoop::main(), this, &AcceleratedDrawingArea::exitAcceleratedCompositingMode)
</span><span class="cx"> , m_discardPreviousLayerTreeHostTimer(RunLoop::main(), this, &AcceleratedDrawingArea::discardPreviousLayerTreeHost)
</span><span class="cx"> {
</span><span class="lines">@@ -235,16 +231,10 @@
</span><span class="cx"> m_webPage.layoutIfNeeded();
</span><span class="cx"> m_webPage.scrollMainFrameIfNotAtMaxScrollPosition(scrollOffset);
</span><span class="cx">
</span><del>-#if USE(COORDINATED_GRAPHICS_MULTIPROCESS)
- // Coordinated Graphics sets the size of the root layer to contents size.
- if (!m_webPage.useFixedLayout())
- m_layerTreeHost->sizeDidChange(m_webPage.size());
-#else
</del><span class="cx"> if (m_layerTreeHost)
</span><span class="cx"> m_layerTreeHost->sizeDidChange(m_webPage.size());
</span><span class="cx"> else if (m_previousLayerTreeHost)
</span><span class="cx"> m_previousLayerTreeHost->sizeDidChange(m_webPage.size());
</span><del>-#endif
</del><span class="cx"> } else {
</span><span class="cx"> ASSERT(size == m_webPage.size());
</span><span class="cx"> if (!m_shouldSendDidUpdateBackingStoreState) {
</span><span class="lines">@@ -403,13 +393,6 @@
</span><span class="cx"> m_previousLayerTreeHost = nullptr;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-#if USE(COORDINATED_GRAPHICS_MULTIPROCESS)
-void AcceleratedDrawingArea::didReceiveCoordinatedLayerTreeHostMessage(IPC::Connection& connection, IPC::Decoder& decoder)
-{
- m_layerTreeHost->didReceiveCoordinatedLayerTreeHostMessage(connection, decoder);
-}
-#endif
-
</del><span class="cx"> #if USE(TEXTURE_MAPPER_GL) && PLATFORM(GTK) && PLATFORM(X11) && !USE(REDIRECTED_XCOMPOSITE_WINDOW)
</span><span class="cx"> void AcceleratedDrawingArea::setNativeSurfaceHandleForCompositing(uint64_t handle)
</span><span class="cx"> {
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessWebPageAcceleratedDrawingAreah"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/WebPage/AcceleratedDrawingArea.h (212607 => 212608)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/WebPage/AcceleratedDrawingArea.h 2017-02-18 10:30:59 UTC (rev 212607)
+++ trunk/Source/WebKit2/WebProcess/WebPage/AcceleratedDrawingArea.h 2017-02-18 23:08:17 UTC (rev 212608)
</span><span class="lines">@@ -59,10 +59,6 @@
</span><span class="cx"> void scheduleCompositingLayerFlush() override;
</span><span class="cx"> void scheduleCompositingLayerFlushImmediately() override;
</span><span class="cx">
</span><del>-#if USE(COORDINATED_GRAPHICS_MULTIPROCESS)
- void didReceiveCoordinatedLayerTreeHostMessage(IPC::Connection&, IPC::Decoder&) override;
-#endif
-
</del><span class="cx"> #if USE(TEXTURE_MAPPER_GL) && PLATFORM(GTK) && PLATFORM(X11) && !USE(REDIRECTED_XCOMPOSITE_WINDOW)
</span><span class="cx"> void setNativeSurfaceHandleForCompositing(uint64_t) override;
</span><span class="cx"> void destroyNativeSurfaceHandleForCompositing(bool&) override;
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessWebPageCoordinatedGraphicsCoordinatedLayerTreeHostcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/WebPage/CoordinatedGraphics/CoordinatedLayerTreeHost.cpp (212607 => 212608)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/WebPage/CoordinatedGraphics/CoordinatedLayerTreeHost.cpp 2017-02-18 10:30:59 UTC (rev 212607)
+++ trunk/Source/WebKit2/WebProcess/WebPage/CoordinatedGraphics/CoordinatedLayerTreeHost.cpp 2017-02-18 23:08:17 UTC (rev 212608)
</span><span class="lines">@@ -40,10 +40,6 @@
</span><span class="cx">
</span><span class="cx"> #if USE(COORDINATED_GRAPHICS_THREADED)
</span><span class="cx"> #include "ThreadSafeCoordinatedSurface.h"
</span><del>-#elif USE(COORDINATED_GRAPHICS_MULTIPROCESS)
-#include "CoordinatedGraphicsArgumentCoders.h"
-#include "CoordinatedLayerTreeHostProxyMessages.h"
-#include "WebCoreArgumentCoders.h"
</del><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> using namespace WebCore;
</span><span class="lines">@@ -65,9 +61,6 @@
</span><span class="cx"> , m_layerFlushTimer(RunLoop::main(), this, &CoordinatedLayerTreeHost::layerFlushTimerFired)
</span><span class="cx"> {
</span><span class="cx"> m_coordinator.createRootLayer(m_webPage.size());
</span><del>-#if USE(COORDINATED_GRAPHICS_MULTIPROCESS)
- m_layerTreeContext.contextID = downcast<CoordinatedGraphicsLayer>(*m_coordinator.rootLayer()).id();
-#endif
</del><span class="cx">
</span><span class="cx"> CoordinatedSurface::setFactory(createCoordinatedSurface);
</span><span class="cx"> scheduleLayerFlush();
</span><span class="lines">@@ -196,9 +189,6 @@
</span><span class="cx">
</span><span class="cx"> void CoordinatedLayerTreeHost::commitSceneState(const CoordinatedGraphicsState& state)
</span><span class="cx"> {
</span><del>-#if USE(COORDINATED_GRAPHICS_MULTIPROCESS)
- m_webPage.send(Messages::CoordinatedLayerTreeHostProxy::CommitCoordinatedGraphicsState(state));
-#endif
</del><span class="cx"> m_isWaitingForRenderer = true;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -206,8 +196,6 @@
</span><span class="cx"> {
</span><span class="cx"> #if USE(COORDINATED_GRAPHICS_THREADED)
</span><span class="cx"> return ThreadSafeCoordinatedSurface::create(size, flags);
</span><del>-#elif USE(COORDINATED_GRAPHICS_MULTIPROCESS)
- return WebCoordinatedSurface::create(size, flags);
</del><span class="cx"> #else
</span><span class="cx"> UNUSED_PARAM(size);
</span><span class="cx"> UNUSED_PARAM(flags);
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessWebPageCoordinatedGraphicsCoordinatedLayerTreeHosth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/WebPage/CoordinatedGraphics/CoordinatedLayerTreeHost.h (212607 => 212608)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/WebPage/CoordinatedGraphics/CoordinatedLayerTreeHost.h 2017-02-18 10:30:59 UTC (rev 212607)
+++ trunk/Source/WebKit2/WebProcess/WebPage/CoordinatedGraphics/CoordinatedLayerTreeHost.h 2017-02-18 23:08:17 UTC (rev 212608)
</span><span class="lines">@@ -76,10 +76,6 @@
</span><span class="cx"> private:
</span><span class="cx"> void layerFlushTimerFired();
</span><span class="cx">
</span><del>-#if USE(COORDINATED_GRAPHICS_MULTIPROCESS)
- void didReceiveCoordinatedLayerTreeHostMessage(IPC::Connection&, IPC::Decoder&) override;
-#endif
-
</del><span class="cx"> static RefPtr<WebCore::CoordinatedSurface> createCoordinatedSurface(const WebCore::IntSize&, WebCore::CoordinatedSurface::Flags);
</span><span class="cx">
</span><span class="cx"> CompositingCoordinator m_coordinator;
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessWebPageCoordinatedGraphicsWebPageCoordinatedGraphicscpp"></a>
<div class="delfile"><h4>Deleted: trunk/Source/WebKit2/WebProcess/WebPage/CoordinatedGraphics/WebPageCoordinatedGraphics.cpp (212607 => 212608)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/WebPage/CoordinatedGraphics/WebPageCoordinatedGraphics.cpp 2017-02-18 10:30:59 UTC (rev 212607)
+++ trunk/Source/WebKit2/WebProcess/WebPage/CoordinatedGraphics/WebPageCoordinatedGraphics.cpp 2017-02-18 23:08:17 UTC (rev 212608)
</span><span class="lines">@@ -1,92 +0,0 @@
</span><del>-/*
- * Copyright (C) 2013 Nokia Corporation and/or its subsidiary(-ies)
- * Copyright (C) 2013 Samsung Electronics. All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in the
- * documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS''
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
- * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
- * THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#include "config.h"
-#if USE(COORDINATED_GRAPHICS)
-
-#include "WebPage.h"
-
-#include "HitTestResult.h"
-#include "WebCoreArgumentCoders.h"
-#include "WebFrame.h"
-#include "WebPageProxyMessages.h"
-#include <WebCore/Document.h>
-#include <WebCore/EventHandler.h>
-#include <WebCore/Frame.h>
-#include <WebCore/FrameView.h>
-#include <WebCore/RenderObject.h>
-#include <WebCore/ScrollView.h>
-
-using namespace WebCore;
-
-namespace WebKit {
-
-#if USE(COORDINATED_GRAPHICS_MULTIPROCESS)
-void WebPage::findZoomableAreaForPoint(const IntPoint& point, const IntSize& area)
-{
- UNUSED_PARAM(area);
- Frame* mainframe = m_mainFrame->coreFrame();
- HitTestResult result = mainframe->eventHandler().hitTestResultAtPoint(mainframe->view()->windowToContents(point), HitTestRequest::ReadOnly | HitTestRequest::Active | HitTestRequest::IgnoreClipping | HitTestRequest::DisallowUserAgentShadowContent);
-
- Node* node = result.innerNode();
-
- if (!node)
- return;
-
- IntRect zoomableArea;
- if (RenderObject* renderer = node->renderer())
- zoomableArea = renderer->absoluteBoundingBoxRect();
-
- while (true) {
- bool found = !node->isTextNode() && !node->isShadowRoot();
-
- // No candidate found, bail out.
- if (!found && !node->parentNode())
- return;
-
- // Candidate found, and it is a better candidate than its parent.
- // NB: A parent is considered a better candidate if the node is
- // contained by it and it is the only child.
- if (found && (!node->parentNode() || !node->parentNode()->hasOneChild()))
- break;
-
- node = node->parentNode();
- if (RenderObject* renderer = node->renderer())
- zoomableArea.unite(renderer->absoluteBoundingBoxRect());
- }
-
- if (node->document().frame() && node->document().frame()->view()) {
- const ScrollView* view = node->document().frame()->view();
- zoomableArea = view->contentsToWindow(zoomableArea);
- }
-
- send(Messages::WebPageProxy::DidFindZoomableArea(point, zoomableArea));
-}
-#endif
-
-} // namespace WebKit
-
-#endif // USE(COORDINATED_GRAPHICS)
</del></span></pre></div>
<a id="trunkSourceWebKit2WebProcessWebPageDrawingAreacpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/WebPage/DrawingArea.cpp (212607 => 212608)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/WebPage/DrawingArea.cpp 2017-02-18 10:30:59 UTC (rev 212607)
+++ trunk/Source/WebKit2/WebProcess/WebPage/DrawingArea.cpp 2017-02-18 23:08:17 UTC (rev 212608)
</span><span class="lines">@@ -38,12 +38,8 @@
</span><span class="cx"> #include "RemoteLayerTreeDrawingArea.h"
</span><span class="cx"> #include "TiledCoreAnimationDrawingArea.h"
</span><span class="cx"> #else
</span><del>-#if USE(COORDINATED_GRAPHICS_MULTIPROCESS)
-#include "AcceleratedDrawingArea.h"
-#else
</del><span class="cx"> #include "DrawingAreaImpl.h"
</span><span class="cx"> #endif
</span><del>-#endif
</del><span class="cx">
</span><span class="cx"> using namespace WebCore;
</span><span class="cx">
</span><span class="lines">@@ -60,14 +56,9 @@
</span><span class="cx"> case DrawingAreaTypeRemoteLayerTree:
</span><span class="cx"> return std::make_unique<RemoteLayerTreeDrawingArea>(webPage, parameters);
</span><span class="cx"> #else
</span><del>-#if USE(COORDINATED_GRAPHICS_MULTIPROCESS)
- case DrawingAreaTypeCoordinated:
- return std::make_unique<AcceleratedDrawingArea>(webPage, parameters);
-#else
</del><span class="cx"> case DrawingAreaTypeImpl:
</span><span class="cx"> return std::make_unique<DrawingAreaImpl>(webPage, parameters);
</span><span class="cx"> #endif
</span><del>-#endif
</del><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> return nullptr;
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessWebPageDrawingAreah"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/WebPage/DrawingArea.h (212607 => 212608)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/WebPage/DrawingArea.h 2017-02-18 10:30:59 UTC (rev 212607)
+++ trunk/Source/WebKit2/WebProcess/WebPage/DrawingArea.h 2017-02-18 23:08:17 UTC (rev 212608)
</span><span class="lines">@@ -115,10 +115,6 @@
</span><span class="cx"> virtual RefPtr<WebCore::DisplayRefreshMonitor> createDisplayRefreshMonitor(WebCore::PlatformDisplayID);
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>-#if USE(COORDINATED_GRAPHICS_MULTIPROCESS)
- virtual void didReceiveCoordinatedLayerTreeHostMessage(IPC::Connection&, IPC::Decoder&) = 0;
-#endif
-
</del><span class="cx"> virtual void dispatchAfterEnsuringUpdatedScrollPosition(std::function<void ()>);
</span><span class="cx">
</span><span class="cx"> virtual void activityStateDidChange(WebCore::ActivityState::Flags, bool /* wantsDidUpdateActivityState */, const Vector<uint64_t>& /* callbackIDs */) { }
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessWebPageLayerTreeHostcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/WebPage/LayerTreeHost.cpp (212607 => 212608)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/WebPage/LayerTreeHost.cpp 2017-02-18 10:30:59 UTC (rev 212607)
+++ trunk/Source/WebKit2/WebProcess/WebPage/LayerTreeHost.cpp 2017-02-18 23:08:17 UTC (rev 212608)
</span><span class="lines">@@ -29,9 +29,7 @@
</span><span class="cx">
</span><span class="cx"> #include "LayerTreeHost.h"
</span><span class="cx">
</span><del>-#if USE(COORDINATED_GRAPHICS_MULTIPROCESS)
-#include "CoordinatedLayerTreeHost.h"
-#elif USE(COORDINATED_GRAPHICS_THREADED)
</del><ins>+#if USE(COORDINATED_GRAPHICS_THREADED)
</ins><span class="cx"> #include "ThreadedCoordinatedLayerTreeHost.h"
</span><span class="cx"> #elif PLATFORM(GTK) && USE(TEXTURE_MAPPER_GL)
</span><span class="cx"> #include "LayerTreeHostGtk.h"
</span><span class="lines">@@ -45,8 +43,6 @@
</span><span class="cx"> {
</span><span class="cx"> #if USE(COORDINATED_GRAPHICS_THREADED)
</span><span class="cx"> return ThreadedCoordinatedLayerTreeHost::create(webPage);
</span><del>-#elif USE(COORDINATED_GRAPHICS_MULTIPROCESS)
- return CoordinatedLayerTreeHost::create(webPage);
</del><span class="cx"> #elif PLATFORM(GTK) && USE(TEXTURE_MAPPER_GL)
</span><span class="cx"> return LayerTreeHostGtk::create(webPage);
</span><span class="cx"> #else
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessWebPageLayerTreeHosth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/WebPage/LayerTreeHost.h (212607 => 212608)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/WebPage/LayerTreeHost.h 2017-02-18 10:30:59 UTC (rev 212607)
+++ trunk/Source/WebKit2/WebProcess/WebPage/LayerTreeHost.h 2017-02-18 23:08:17 UTC (rev 212608)
</span><span class="lines">@@ -78,10 +78,6 @@
</span><span class="cx">
</span><span class="cx"> virtual WebCore::GraphicsLayerFactory* graphicsLayerFactory() { return nullptr; }
</span><span class="cx">
</span><del>-#if USE(COORDINATED_GRAPHICS_MULTIPROCESS)
- virtual void didReceiveCoordinatedLayerTreeHostMessage(IPC::Connection&, IPC::Decoder&) = 0;
-#endif
-
</del><span class="cx"> #if USE(COORDINATED_GRAPHICS_THREADED)
</span><span class="cx"> virtual void contentsSizeChanged(const WebCore::IntSize&) { };
</span><span class="cx"> virtual void didChangeViewportAttributes(WebCore::ViewportAttributes&&) { };
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessWebPageWebPagecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/WebPage/WebPage.cpp (212607 => 212608)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/WebPage/WebPage.cpp 2017-02-18 10:30:59 UTC (rev 212607)
+++ trunk/Source/WebKit2/WebProcess/WebPage/WebPage.cpp 2017-02-18 23:08:17 UTC (rev 212608)
</span><span class="lines">@@ -238,10 +238,6 @@
</span><span class="cx"> #include <wtf/RefCountedLeakCounter.h>
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>-#if USE(COORDINATED_GRAPHICS_MULTIPROCESS)
-#include "CoordinatedLayerTreeHostMessages.h"
-#endif
-
</del><span class="cx"> #if ENABLE(DATA_DETECTION)
</span><span class="cx"> #include <WebCore/DataDetection.h>
</span><span class="cx"> #endif
</span><span class="lines">@@ -520,9 +516,6 @@
</span><span class="cx"> webProcess.addMessageReceiver(Messages::WebPage::messageReceiverName(), m_pageID, *this);
</span><span class="cx">
</span><span class="cx"> // FIXME: This should be done in the object constructors, and the objects themselves should be message receivers.
</span><del>-#if USE(COORDINATED_GRAPHICS_MULTIPROCESS)
- webProcess.addMessageReceiver(Messages::CoordinatedLayerTreeHost::messageReceiverName(), m_pageID, *this);
-#endif
</del><span class="cx"> webProcess.addMessageReceiver(Messages::WebInspector::messageReceiverName(), m_pageID, *this);
</span><span class="cx"> webProcess.addMessageReceiver(Messages::WebInspectorUI::messageReceiverName(), m_pageID, *this);
</span><span class="cx"> webProcess.addMessageReceiver(Messages::RemoteWebInspectorUI::messageReceiverName(), m_pageID, *this);
</span><span class="lines">@@ -621,9 +614,6 @@
</span><span class="cx"> webProcess.removeMessageReceiver(Messages::WebPage::messageReceiverName(), m_pageID);
</span><span class="cx">
</span><span class="cx"> // FIXME: This should be done in the object destructors, and the objects themselves should be message receivers.
</span><del>-#if USE(COORDINATED_GRAPHICS_MULTIPROCESS)
- webProcess.removeMessageReceiver(Messages::CoordinatedLayerTreeHost::messageReceiverName(), m_pageID);
-#endif
</del><span class="cx"> webProcess.removeMessageReceiver(Messages::WebInspector::messageReceiverName(), m_pageID);
</span><span class="cx"> webProcess.removeMessageReceiver(Messages::WebInspectorUI::messageReceiverName(), m_pageID);
</span><span class="cx"> webProcess.removeMessageReceiver(Messages::RemoteWebInspectorUI::messageReceiverName(), m_pageID);
</span><span class="lines">@@ -2053,8 +2043,6 @@
</span><span class="cx"> {
</span><span class="cx"> #if USE(COORDINATED_GRAPHICS_THREADED)
</span><span class="cx"> drawingArea()->scroll(IntRect(point, IntSize()), IntSize());
</span><del>-#elif USE(COORDINATED_GRAPHICS_MULTIPROCESS)
- send(Messages::WebPageProxy::PageDidRequestScroll(point));
</del><span class="cx"> #endif
</span><span class="cx"> }
</span><span class="cx"> #endif
</span><span class="lines">@@ -2667,14 +2655,6 @@
</span><span class="cx">
</span><span class="cx"> void WebPage::didCompletePageTransition()
</span><span class="cx"> {
</span><del>-#if USE(COORDINATED_GRAPHICS_MULTIPROCESS)
- // m_mainFrame can be null since r170163.
- if (m_mainFrame && m_mainFrame->coreFrame()->view()->delegatesScrolling()) {
- // Wait until the UI process sent us the visible rect it wants rendered.
- send(Messages::WebPageProxy::PageTransitionViewportReady());
- } else
-#endif
-
</del><span class="cx"> m_drawingArea->setLayerTreeStateIsFrozen(false);
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -4000,14 +3980,6 @@
</span><span class="cx">
</span><span class="cx"> void WebPage::didReceiveMessage(IPC::Connection& connection, IPC::Decoder& decoder)
</span><span class="cx"> {
</span><del>-#if USE(COORDINATED_GRAPHICS_MULTIPROCESS)
- if (decoder.messageReceiverName() == Messages::CoordinatedLayerTreeHost::messageReceiverName()) {
- if (m_drawingArea)
- m_drawingArea->didReceiveCoordinatedLayerTreeHostMessage(connection, decoder);
- return;
- }
-#endif
-
</del><span class="cx"> if (decoder.messageReceiverName() == Messages::WebInspector::messageReceiverName()) {
</span><span class="cx"> if (WebInspector* inspector = this->inspector())
</span><span class="cx"> inspector->didReceiveMessage(connection, decoder);
</span><span class="lines">@@ -4507,13 +4479,6 @@
</span><span class="cx"> return platformCanHandleRequest(request);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-#if USE(COORDINATED_GRAPHICS_MULTIPROCESS)
-void WebPage::commitPageTransitionViewport()
-{
- m_drawingArea->setLayerTreeStateIsFrozen(false);
-}
-#endif
-
</del><span class="cx"> #if PLATFORM(COCOA)
</span><span class="cx"> void WebPage::handleAlternativeTextUIResult(const String& result)
</span><span class="cx"> {
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessWebPageWebPageh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/WebPage/WebPage.h (212607 => 212608)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/WebPage/WebPage.h 2017-02-18 10:30:59 UTC (rev 212607)
+++ trunk/Source/WebKit2/WebProcess/WebPage/WebPage.h 2017-02-18 23:08:17 UTC (rev 212608)
</span><span class="lines">@@ -610,10 +610,6 @@
</span><span class="cx"> void pageDidRequestScroll(const WebCore::IntPoint&);
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>-#if USE(COORDINATED_GRAPHICS_MULTIPROCESS)
- void commitPageTransitionViewport();
-#endif
-
</del><span class="cx"> #if ENABLE(CONTEXT_MENUS)
</span><span class="cx"> WebContextMenu* contextMenu();
</span><span class="cx"> WebContextMenu* contextMenuAtPointInWindow(const WebCore::IntPoint&);
</span><span class="lines">@@ -1149,10 +1145,6 @@
</span><span class="cx"> void sendViewportAttributesChanged(const WebCore::ViewportArguments&);
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>-#if USE(COORDINATED_GRAPHICS_MULTIPROCESS)
- void findZoomableAreaForPoint(const WebCore::IntPoint&, const WebCore::IntSize& area);
-#endif
-
</del><span class="cx"> void didChangeSelectedIndexForActivePopupMenu(int32_t newIndex);
</span><span class="cx"> void setTextForActivePopupMenu(int32_t index);
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessWebPageWebPagemessagesin"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/WebPage/WebPage.messages.in (212607 => 212608)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/WebPage/WebPage.messages.in 2017-02-18 10:30:59 UTC (rev 212607)
+++ trunk/Source/WebKit2/WebProcess/WebPage/WebPage.messages.in 2017-02-18 23:08:17 UTC (rev 212608)
</span><span class="lines">@@ -341,10 +341,6 @@
</span><span class="cx"> SetCanRunBeforeUnloadConfirmPanel(bool canRunBeforeUnloadConfirmPanel)
</span><span class="cx"> SetCanRunModal(bool canRunModal)
</span><span class="cx">
</span><del>-#if USE(COORDINATED_GRAPHICS_MULTIPROCESS)
- CommitPageTransitionViewport()
-#endif
-
</del><span class="cx"> #if PLATFORM(GTK)
</span><span class="cx"> SetComposition(String text, Vector<WebCore::CompositionUnderline> underlines, uint64_t selectionStart, uint64_t selectionEnd, uint64_t replacementRangeStart, uint64_t replacementRangeEnd)
</span><span class="cx"> ConfirmComposition(String text, int64_t selectionStart, int64_t selectionLength)
</span><span class="lines">@@ -392,10 +388,6 @@
</span><span class="cx"> SetMinimumLayoutSize(WebCore::IntSize minimumLayoutSize)
</span><span class="cx"> SetAutoSizingShouldExpandToViewHeight(bool shouldExpand)
</span><span class="cx">
</span><del>-#if USE(COORDINATED_GRAPHICS_MULTIPROCESS)
- FindZoomableAreaForPoint(WebCore::IntPoint point, WebCore::IntSize area)
-#endif
-
</del><span class="cx"> #if PLATFORM(COCOA)
</span><span class="cx"> HandleAlternativeTextUIResult(String result)
</span><span class="cx"> #endif
</span></span></pre>
</div>
</div>
</body>
</html>