<!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>[187795] 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/187795">187795</a></dd>
<dt>Author</dt> <dd>gyuyoung.kim@webkit.org</dd>
<dt>Date</dt> <dd>2015-08-03 18:16:59 -0700 (Mon, 03 Aug 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>[CoordinatedGraphics] Rearrange uses of USE_COORDINATED_GRAPHICS_MULTIPROCESS
https://bugs.webkit.org/show_bug.cgi?id=147256
Reviewed by Benjamin Poulain.
Reduce uses of USE_COORDINATED_GRAPHICS_MULTIPROCESS guard in order to fix build
breaks when USE_COORDINATED_GRAPHICS_MULTIPROCESS is off. This is first step to switch
between multiprocess model to thread model.
* PlatformEfl.cmake:
* Shared/DrawingAreaInfo.h:
* UIProcess/API/C/CoordinatedGraphics/WKView.cpp:
(WKViewFindZoomableAreaForRect):
* UIProcess/CoordinatedGraphics/CoordinatedDrawingAreaProxy.cpp:
(WebKit::CoordinatedDrawingAreaProxy::CoordinatedDrawingAreaProxy):
* UIProcess/CoordinatedGraphics/CoordinatedLayerTreeHostProxy.cpp:
(WebKit::CoordinatedLayerTreeHostProxy::commitCoordinatedGraphicsState):
* UIProcess/CoordinatedGraphics/CoordinatedLayerTreeHostProxy.h:
* UIProcess/CoordinatedGraphics/PageViewportController.cpp:
(WebKit::PageViewportController::pageTransitionViewportReady):
* UIProcess/CoordinatedGraphics/WebPageProxyCoordinatedGraphics.cpp:
* UIProcess/CoordinatedGraphics/WebView.cpp:
* UIProcess/CoordinatedGraphics/WebView.h:
* UIProcess/WebPageProxy.cpp:
(WebKit::WebPageProxy::commitPageTransitionViewport):
* UIProcess/WebPageProxy.h:
* WebProcess/WebPage/CoordinatedGraphics/CoordinatedDrawingArea.cpp:
(WebKit::CoordinatedDrawingArea::CoordinatedDrawingArea):
* WebProcess/WebPage/CoordinatedGraphics/CoordinatedDrawingArea.h:
* WebProcess/WebPage/CoordinatedGraphics/WebPageCoordinatedGraphics.cpp:
* WebProcess/WebPage/DrawingAreaImpl.cpp:
(WebKit::DrawingAreaImpl::DrawingAreaImpl):
* WebProcess/WebPage/DrawingAreaImpl.h:
* WebProcess/WebPage/LayerTreeHost.cpp:
(WebKit::LayerTreeHost::create):
* WebProcess/WebPage/WebPage.cpp:
(WebKit::WebPage::sendViewportAttributesChanged):
(WebKit::WebPage::pageDidRequestScroll):
* WebProcess/WebPage/WebPage.h:
* WebProcess/WebPage/WebPage.messages.in:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeLog</a></li>
<li><a href="#trunkSourceWebKit2PlatformEflcmake">trunk/Source/WebKit2/PlatformEfl.cmake</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="#trunkSourceWebKit2UIProcessCoordinatedGraphicsCoordinatedDrawingAreaProxycpp">trunk/Source/WebKit2/UIProcess/CoordinatedGraphics/CoordinatedDrawingAreaProxy.cpp</a></li>
<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="#trunkSourceWebKit2UIProcessCoordinatedGraphicsPageViewportControllercpp">trunk/Source/WebKit2/UIProcess/CoordinatedGraphics/PageViewportController.cpp</a></li>
<li><a href="#trunkSourceWebKit2UIProcessCoordinatedGraphicsWebPageProxyCoordinatedGraphicscpp">trunk/Source/WebKit2/UIProcess/CoordinatedGraphics/WebPageProxyCoordinatedGraphics.cpp</a></li>
<li><a href="#trunkSourceWebKit2UIProcessCoordinatedGraphicsWebViewcpp">trunk/Source/WebKit2/UIProcess/CoordinatedGraphics/WebView.cpp</a></li>
<li><a href="#trunkSourceWebKit2UIProcessCoordinatedGraphicsWebViewh">trunk/Source/WebKit2/UIProcess/CoordinatedGraphics/WebView.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="#trunkSourceWebKit2WebProcessWebPageCoordinatedGraphicsCoordinatedDrawingAreacpp">trunk/Source/WebKit2/WebProcess/WebPage/CoordinatedGraphics/CoordinatedDrawingArea.cpp</a></li>
<li><a href="#trunkSourceWebKit2WebProcessWebPageCoordinatedGraphicsCoordinatedDrawingAreah">trunk/Source/WebKit2/WebProcess/WebPage/CoordinatedGraphics/CoordinatedDrawingArea.h</a></li>
<li><a href="#trunkSourceWebKit2WebProcessWebPageCoordinatedGraphicsWebPageCoordinatedGraphicscpp">trunk/Source/WebKit2/WebProcess/WebPage/CoordinatedGraphics/WebPageCoordinatedGraphics.cpp</a></li>
<li><a href="#trunkSourceWebKit2WebProcessWebPageDrawingAreaImplcpp">trunk/Source/WebKit2/WebProcess/WebPage/DrawingAreaImpl.cpp</a></li>
<li><a href="#trunkSourceWebKit2WebProcessWebPageDrawingAreaImplh">trunk/Source/WebKit2/WebProcess/WebPage/DrawingAreaImpl.h</a></li>
<li><a href="#trunkSourceWebKit2WebProcessWebPageLayerTreeHostcpp">trunk/Source/WebKit2/WebProcess/WebPage/LayerTreeHost.cpp</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>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (187794 => 187795)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2015-08-04 01:14:38 UTC (rev 187794)
+++ trunk/Source/WebKit2/ChangeLog 2015-08-04 01:16:59 UTC (rev 187795)
</span><span class="lines">@@ -1,3 +1,46 @@
</span><ins>+2015-08-03 Gyuyoung Kim <gyuyoung.kim@webkit.org>
+
+ [CoordinatedGraphics] Rearrange uses of USE_COORDINATED_GRAPHICS_MULTIPROCESS
+ https://bugs.webkit.org/show_bug.cgi?id=147256
+
+ Reviewed by Benjamin Poulain.
+
+ Reduce uses of USE_COORDINATED_GRAPHICS_MULTIPROCESS guard in order to fix build
+ breaks when USE_COORDINATED_GRAPHICS_MULTIPROCESS is off. This is first step to switch
+ between multiprocess model to thread model.
+
+ * PlatformEfl.cmake:
+ * Shared/DrawingAreaInfo.h:
+ * UIProcess/API/C/CoordinatedGraphics/WKView.cpp:
+ (WKViewFindZoomableAreaForRect):
+ * UIProcess/CoordinatedGraphics/CoordinatedDrawingAreaProxy.cpp:
+ (WebKit::CoordinatedDrawingAreaProxy::CoordinatedDrawingAreaProxy):
+ * UIProcess/CoordinatedGraphics/CoordinatedLayerTreeHostProxy.cpp:
+ (WebKit::CoordinatedLayerTreeHostProxy::commitCoordinatedGraphicsState):
+ * UIProcess/CoordinatedGraphics/CoordinatedLayerTreeHostProxy.h:
+ * UIProcess/CoordinatedGraphics/PageViewportController.cpp:
+ (WebKit::PageViewportController::pageTransitionViewportReady):
+ * UIProcess/CoordinatedGraphics/WebPageProxyCoordinatedGraphics.cpp:
+ * UIProcess/CoordinatedGraphics/WebView.cpp:
+ * UIProcess/CoordinatedGraphics/WebView.h:
+ * UIProcess/WebPageProxy.cpp:
+ (WebKit::WebPageProxy::commitPageTransitionViewport):
+ * UIProcess/WebPageProxy.h:
+ * WebProcess/WebPage/CoordinatedGraphics/CoordinatedDrawingArea.cpp:
+ (WebKit::CoordinatedDrawingArea::CoordinatedDrawingArea):
+ * WebProcess/WebPage/CoordinatedGraphics/CoordinatedDrawingArea.h:
+ * WebProcess/WebPage/CoordinatedGraphics/WebPageCoordinatedGraphics.cpp:
+ * WebProcess/WebPage/DrawingAreaImpl.cpp:
+ (WebKit::DrawingAreaImpl::DrawingAreaImpl):
+ * WebProcess/WebPage/DrawingAreaImpl.h:
+ * WebProcess/WebPage/LayerTreeHost.cpp:
+ (WebKit::LayerTreeHost::create):
+ * WebProcess/WebPage/WebPage.cpp:
+ (WebKit::WebPage::sendViewportAttributesChanged):
+ (WebKit::WebPage::pageDidRequestScroll):
+ * WebProcess/WebPage/WebPage.h:
+ * WebProcess/WebPage/WebPage.messages.in:
+
</ins><span class="cx"> 2015-08-03 Matt Rajca <mrajca@apple.com>
</span><span class="cx">
</span><span class="cx"> Media Session: let UI clients query whether a media element is paused
</span></span></pre></div>
<a id="trunkSourceWebKit2PlatformEflcmake"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/PlatformEfl.cmake (187794 => 187795)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/PlatformEfl.cmake 2015-08-04 01:14:38 UTC (rev 187794)
+++ trunk/Source/WebKit2/PlatformEfl.cmake 2015-08-04 01:16:59 UTC (rev 187795)
</span><span class="lines">@@ -209,6 +209,8 @@
</span><span class="cx">
</span><span class="cx"> WebProcess/WebCoreSupport/soup/WebFrameNetworkingContext.cpp
</span><span class="cx">
</span><ins>+ WebProcess/WebPage/DrawingAreaImpl.cpp
+
</ins><span class="cx"> WebProcess/WebPage/CoordinatedGraphics/CoordinatedDrawingArea.cpp
</span><span class="cx"> WebProcess/WebPage/CoordinatedGraphics/CoordinatedLayerTreeHost.cpp
</span><span class="cx"> WebProcess/WebPage/CoordinatedGraphics/WebPageCoordinatedGraphics.cpp
</span></span></pre></div>
<a id="trunkSourceWebKit2SharedDrawingAreaInfoh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Shared/DrawingAreaInfo.h (187794 => 187795)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Shared/DrawingAreaInfo.h 2015-08-04 01:14:38 UTC (rev 187794)
+++ trunk/Source/WebKit2/Shared/DrawingAreaInfo.h 2015-08-04 01:16:59 UTC (rev 187795)
</span><span class="lines">@@ -38,7 +38,7 @@
</span><span class="cx"> #if USE(COORDINATED_GRAPHICS_MULTIPROCESS)
</span><span class="cx"> DrawingAreaTypeCoordinated
</span><span class="cx"> #else
</span><del>- DrawingAreaTypeImpl,
</del><ins>+ DrawingAreaTypeImpl
</ins><span class="cx"> #endif
</span><span class="cx"> #endif
</span><span class="cx"> };
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPICCoordinatedGraphicsWKViewcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/API/C/CoordinatedGraphics/WKView.cpp (187794 => 187795)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/C/CoordinatedGraphics/WKView.cpp 2015-08-04 01:14:38 UTC (rev 187794)
+++ trunk/Source/WebKit2/UIProcess/API/C/CoordinatedGraphics/WKView.cpp 2015-08-04 01:16:59 UTC (rev 187795)
</span><span class="lines">@@ -191,8 +191,13 @@
</span><span class="cx">
</span><span class="cx"> void WKViewFindZoomableAreaForRect(WKViewRef viewRef, WKRect wkRect)
</span><span class="cx"> {
</span><ins>+#if USE(COORDINATED_GRAPHICS_MULTIPROCESS)
</ins><span class="cx"> IntRect rect = toIntRect(wkRect);
</span><span class="cx"> toImpl(viewRef)->findZoomableAreaForPoint(rect.center(), rect.size());
</span><ins>+#else
+ UNUSED_PARAM(viewRef);
+ UNUSED_PARAM(wkRect);
+#endif
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> WKSize WKViewGetContentsSize(WKViewRef viewRef)
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessCoordinatedGraphicsCoordinatedDrawingAreaProxycpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/CoordinatedGraphics/CoordinatedDrawingAreaProxy.cpp (187794 => 187795)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/CoordinatedGraphics/CoordinatedDrawingAreaProxy.cpp 2015-08-04 01:14:38 UTC (rev 187794)
+++ trunk/Source/WebKit2/UIProcess/CoordinatedGraphics/CoordinatedDrawingAreaProxy.cpp 2015-08-04 01:16:59 UTC (rev 187795)
</span><span class="lines">@@ -45,7 +45,11 @@
</span><span class="cx"> namespace WebKit {
</span><span class="cx">
</span><span class="cx"> CoordinatedDrawingAreaProxy::CoordinatedDrawingAreaProxy(WebPageProxy& webPageProxy)
</span><ins>+#if USE(COORDINATED_GRAPHICS_MULTIPROCESS)
</ins><span class="cx"> : DrawingAreaProxy(DrawingAreaTypeCoordinated, webPageProxy)
</span><ins>+#else
+ : DrawingAreaProxy(DrawingAreaTypeImpl, webPageProxy)
+#endif
</ins><span class="cx"> , m_currentBackingStoreStateID(0)
</span><span class="cx"> , m_nextBackingStoreStateID(0)
</span><span class="cx"> , m_isWaitingForDidUpdateBackingStoreState(false)
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessCoordinatedGraphicsCoordinatedLayerTreeHostProxycpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/CoordinatedGraphics/CoordinatedLayerTreeHostProxy.cpp (187794 => 187795)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/CoordinatedGraphics/CoordinatedLayerTreeHostProxy.cpp 2015-08-04 01:14:38 UTC (rev 187794)
+++ trunk/Source/WebKit2/UIProcess/CoordinatedGraphics/CoordinatedLayerTreeHostProxy.cpp 2015-08-04 01:16:59 UTC (rev 187795)
</span><span class="lines">@@ -65,7 +65,7 @@
</span><span class="cx"> });
</span><span class="cx">
</span><span class="cx"> updateViewport();
</span><del>-#if USE(COORDINATED_GRAPHICS)
</del><ins>+#if USE(COORDINATED_GRAPHICS_MULTIPROCESS)
</ins><span class="cx"> m_drawingAreaProxy->page().didRenderFrame(graphicsState.contentsSize, graphicsState.coveredRect);
</span><span class="cx"> #endif
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessCoordinatedGraphicsCoordinatedLayerTreeHostProxyh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/CoordinatedGraphics/CoordinatedLayerTreeHostProxy.h (187794 => 187795)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/CoordinatedGraphics/CoordinatedLayerTreeHostProxy.h 2015-08-04 01:14:38 UTC (rev 187794)
+++ trunk/Source/WebKit2/UIProcess/CoordinatedGraphics/CoordinatedLayerTreeHostProxy.h 2015-08-04 01:16:59 UTC (rev 187795)
</span><span class="lines">@@ -21,7 +21,7 @@
</span><span class="cx"> #ifndef CoordinatedLayerTreeHostProxy_h
</span><span class="cx"> #define CoordinatedLayerTreeHostProxy_h
</span><span class="cx">
</span><del>-#if USE(COORDINATED_GRAPHICS_MULTIPROCESS)
</del><ins>+#if USE(COORDINATED_GRAPHICS)
</ins><span class="cx">
</span><span class="cx"> #include "CoordinatedGraphicsArgumentCoders.h"
</span><span class="cx"> #include "CoordinatedGraphicsScene.h"
</span><span class="lines">@@ -69,6 +69,6 @@
</span><span class="cx">
</span><span class="cx"> } // namespace WebKit
</span><span class="cx">
</span><del>-#endif // USE(COORDINATED_GRAPHICS_MULTIPROCESS)
</del><ins>+#endif // USE(COORDINATED_GRAPHICS)
</ins><span class="cx">
</span><span class="cx"> #endif // CoordinatedLayerTreeHostProxy_h
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessCoordinatedGraphicsPageViewportControllercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/CoordinatedGraphics/PageViewportController.cpp (187794 => 187795)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/CoordinatedGraphics/PageViewportController.cpp 2015-08-04 01:14:38 UTC (rev 187794)
+++ trunk/Source/WebKit2/UIProcess/CoordinatedGraphics/PageViewportController.cpp 2015-08-04 01:16:59 UTC (rev 187795)
</span><span class="lines">@@ -215,11 +215,13 @@
</span><span class="cx"> applyScaleAfterRenderingContents(innerBoundedViewportScale(initialScale));
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+#if USE(COORDINATED_GRAPHICS_MULTIPROCESS)
</ins><span class="cx"> // At this point we should already have received the first viewport arguments and the requested scroll
</span><span class="cx"> // position for the newly loaded page and sent our reactions to the web process. It's now safe to tell
</span><span class="cx"> // the web process to start rendering the new page contents and possibly re-use the current tiles.
</span><span class="cx"> // This assumes that all messages have been handled in order and that nothing has been pushed back on the event loop.
</span><span class="cx"> m_webPageProxy->commitPageTransitionViewport();
</span><ins>+#endif
</ins><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="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/CoordinatedGraphics/WebPageProxyCoordinatedGraphics.cpp (187794 => 187795)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/CoordinatedGraphics/WebPageProxyCoordinatedGraphics.cpp 2015-08-04 01:14:38 UTC (rev 187794)
+++ trunk/Source/WebKit2/UIProcess/CoordinatedGraphics/WebPageProxyCoordinatedGraphics.cpp 2015-08-04 01:16:59 UTC (rev 187795)
</span><span class="lines">@@ -37,6 +37,7 @@
</span><span class="cx">
</span><span class="cx"> namespace WebKit {
</span><span class="cx">
</span><ins>+#if USE(COORDINATED_GRAPHICS_MULTIPROCESS)
</ins><span class="cx"> void WebPageProxy::findZoomableAreaForPoint(const IntPoint& point, const IntSize& area)
</span><span class="cx"> {
</span><span class="cx"> if (!isValid())
</span><span class="lines">@@ -49,6 +50,7 @@
</span><span class="cx"> {
</span><span class="cx"> m_pageClient.didFindZoomableArea(target, area);
</span><span class="cx"> }
</span><ins>+#endif
</ins><span class="cx">
</span><span class="cx"> } // namespace WebKit
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessCoordinatedGraphicsWebViewcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/CoordinatedGraphics/WebView.cpp (187794 => 187795)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/CoordinatedGraphics/WebView.cpp 2015-08-04 01:14:38 UTC (rev 187794)
+++ trunk/Source/WebKit2/UIProcess/CoordinatedGraphics/WebView.cpp 2015-08-04 01:16:59 UTC (rev 187795)
</span><span class="lines">@@ -519,6 +519,7 @@
</span><span class="cx"> m_client.didChangeViewportAttributes(this, attr);
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+#if USE(COORDINATED_GRAPHICS_MULTIPROCESS)
</ins><span class="cx"> void WebView::pageDidRequestScroll(const IntPoint& position)
</span><span class="cx"> {
</span><span class="cx"> FloatPoint uiPosition(position);
</span><span class="lines">@@ -541,6 +542,7 @@
</span><span class="cx"> {
</span><span class="cx"> m_page->findZoomableAreaForPoint(transformFromScene().mapPoint(point), transformFromScene().mapSize(size));
</span><span class="cx"> }
</span><ins>+#endif
</ins><span class="cx">
</span><span class="cx"> } // namespace WebKit
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessCoordinatedGraphicsWebViewh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/CoordinatedGraphics/WebView.h (187794 => 187795)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/CoordinatedGraphics/WebView.h 2015-08-04 01:14:38 UTC (rev 187794)
+++ trunk/Source/WebKit2/UIProcess/CoordinatedGraphics/WebView.h 2015-08-04 01:16:59 UTC (rev 187795)
</span><span class="lines">@@ -94,7 +94,9 @@
</span><span class="cx"> bool requestExitFullScreen();
</span><span class="cx"> #endif
</span><span class="cx">
</span><ins>+#if USE(COORDINATED_GRAPHICS_MULTIPROCESS)
</ins><span class="cx"> void findZoomableAreaForPoint(const WebCore::IntPoint&, const WebCore::IntSize&);
</span><ins>+#endif
</ins><span class="cx">
</span><span class="cx"> // View client.
</span><span class="cx"> void initializeClient(const WKViewClientBase*);
</span><span class="lines">@@ -147,9 +149,11 @@
</span><span class="cx">
</span><span class="cx"> virtual void didCommitLoadForMainFrame(const String& mimeType, bool useCustomContentProvider) override;
</span><span class="cx">
</span><ins>+#if USE(COORDINATED_GRAPHICS_MULTIPROCESS)
</ins><span class="cx"> virtual void pageDidRequestScroll(const WebCore::IntPoint&) override;
</span><span class="cx"> virtual void didRenderFrame(const WebCore::IntSize& contentsSize, const WebCore::IntRect& coveredRect) override;
</span><span class="cx"> virtual void pageTransitionViewportReady() override;
</span><ins>+#endif
</ins><span class="cx">
</span><span class="cx"> virtual void setCursor(const WebCore::Cursor&) override;
</span><span class="cx"> virtual void setCursorHiddenUntilMouseMoves(bool) override;
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessWebPageProxycpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/WebPageProxy.cpp (187794 => 187795)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/WebPageProxy.cpp 2015-08-04 01:14:38 UTC (rev 187794)
+++ trunk/Source/WebKit2/UIProcess/WebPageProxy.cpp 2015-08-04 01:16:59 UTC (rev 187795)
</span><span class="lines">@@ -1578,16 +1578,6 @@
</span><span class="cx"> }
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>-#if USE(COORDINATED_GRAPHICS_MULTIPROCESS)
-void WebPageProxy::commitPageTransitionViewport()
-{
- if (!isValid())
- return;
-
- process().send(Messages::WebPage::CommitPageTransitionViewport(), m_pageID);
-}
-#endif
-
</del><span class="cx"> #if ENABLE(DRAG_SUPPORT)
</span><span class="cx"> void WebPageProxy::dragEntered(DragData& dragData, const String& dragStorageName)
</span><span class="cx"> {
</span><span class="lines">@@ -3798,6 +3788,13 @@
</span><span class="cx"> m_pageClient.didRenderFrame(contentsSize, coveredRect);
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+void WebPageProxy::commitPageTransitionViewport()
+{
+ if (!isValid())
+ return;
+
+ process().send(Messages::WebPage::CommitPageTransitionViewport(), m_pageID);
+}
</ins><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> void WebPageProxy::didChangeViewportProperties(const ViewportAttributes& attr)
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessWebPageProxyh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/WebPageProxy.h (187794 => 187795)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/WebPageProxy.h 2015-08-04 01:14:38 UTC (rev 187794)
+++ trunk/Source/WebKit2/UIProcess/WebPageProxy.h 2015-08-04 01:16:59 UTC (rev 187795)
</span><span class="lines">@@ -529,6 +529,7 @@
</span><span class="cx">
</span><span class="cx"> #if USE(COORDINATED_GRAPHICS_MULTIPROCESS)
</span><span class="cx"> void didRenderFrame(const WebCore::IntSize& contentsSize, const WebCore::IntRect& coveredRect);
</span><ins>+ void commitPageTransitionViewport();
</ins><span class="cx"> #endif
</span><span class="cx"> #if PLATFORM(EFL)
</span><span class="cx"> void setThemePath(const String&);
</span><span class="lines">@@ -610,10 +611,6 @@
</span><span class="cx"> void setBackgroundColor(const WebCore::Color& color) { m_backgroundColor = color; }
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>-#if USE(COORDINATED_GRAPHICS_MULTIPROCESS)
- void commitPageTransitionViewport();
-#endif
-
</del><span class="cx"> void handleMouseEvent(const NativeWebMouseEvent&);
</span><span class="cx"> void handleWheelEvent(const NativeWebWheelEvent&);
</span><span class="cx"> void handleKeyboardEvent(const NativeWebKeyboardEvent&);
</span><span class="lines">@@ -880,7 +877,7 @@
</span><span class="cx">
</span><span class="cx"> WebPageCreationParameters creationParameters();
</span><span class="cx">
</span><del>-#if USE(COORDINATED_GRAPHICS)
</del><ins>+#if USE(COORDINATED_GRAPHICS_MULTIPROCESS)
</ins><span class="cx"> void findZoomableAreaForPoint(const WebCore::IntPoint&, const WebCore::IntSize&);
</span><span class="cx"> #endif
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessWebPageCoordinatedGraphicsCoordinatedDrawingAreacpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/WebPage/CoordinatedGraphics/CoordinatedDrawingArea.cpp (187794 => 187795)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/WebPage/CoordinatedGraphics/CoordinatedDrawingArea.cpp 2015-08-04 01:14:38 UTC (rev 187794)
+++ trunk/Source/WebKit2/WebProcess/WebPage/CoordinatedGraphics/CoordinatedDrawingArea.cpp 2015-08-04 01:16:59 UTC (rev 187795)
</span><span class="lines">@@ -56,7 +56,11 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> CoordinatedDrawingArea::CoordinatedDrawingArea(WebPage& webPage, const WebPageCreationParameters& parameters)
</span><ins>+#if USE(COORDINATED_GRAPHICS_MULTIPROCESS)
</ins><span class="cx"> : DrawingArea(DrawingAreaTypeCoordinated, webPage)
</span><ins>+#else
+ : DrawingArea(DrawingAreaTypeImpl, webPage)
+#endif
</ins><span class="cx"> , m_backingStoreStateID(0)
</span><span class="cx"> , m_isPaintingEnabled(true)
</span><span class="cx"> , m_inUpdateBackingStoreState(false)
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessWebPageCoordinatedGraphicsCoordinatedDrawingAreah"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/WebPage/CoordinatedGraphics/CoordinatedDrawingArea.h (187794 => 187795)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/WebPage/CoordinatedGraphics/CoordinatedDrawingArea.h 2015-08-04 01:14:38 UTC (rev 187794)
+++ trunk/Source/WebKit2/WebProcess/WebPage/CoordinatedGraphics/CoordinatedDrawingArea.h 2015-08-04 01:16:59 UTC (rev 187795)
</span><span class="lines">@@ -68,6 +68,10 @@
</span><span class="cx"> virtual void didReceiveCoordinatedLayerTreeHostMessage(IPC::Connection&, IPC::MessageDecoder&);
</span><span class="cx"> #endif
</span><span class="cx">
</span><ins>+#if USE(TEXTURE_MAPPER_GL) && PLATFORM(GTK)
+ virtual void setNativeSurfaceHandleForCompositing(uint64_t) override { };
+#endif
+
</ins><span class="cx"> virtual void viewStateDidChange(WebCore::ViewState::Flags, bool /* wantsDidUpdateViewState */, const Vector<uint64_t>& /* callbackIDs */) override;
</span><span class="cx"> virtual void attachViewOverlayGraphicsLayer(WebCore::Frame*, WebCore::GraphicsLayer*) override;
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessWebPageCoordinatedGraphicsWebPageCoordinatedGraphicscpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/WebPage/CoordinatedGraphics/WebPageCoordinatedGraphics.cpp (187794 => 187795)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/WebPage/CoordinatedGraphics/WebPageCoordinatedGraphics.cpp 2015-08-04 01:14:38 UTC (rev 187794)
+++ trunk/Source/WebKit2/WebProcess/WebPage/CoordinatedGraphics/WebPageCoordinatedGraphics.cpp 2015-08-04 01:16:59 UTC (rev 187795)
</span><span class="lines">@@ -44,6 +44,7 @@
</span><span class="cx">
</span><span class="cx"> namespace WebKit {
</span><span class="cx">
</span><ins>+#if USE(COORDINATED_GRAPHICS_MULTIPROCESS)
</ins><span class="cx"> void WebPage::findZoomableAreaForPoint(const IntPoint& point, const IntSize& area)
</span><span class="cx"> {
</span><span class="cx"> UNUSED_PARAM(area);
</span><span class="lines">@@ -84,6 +85,7 @@
</span><span class="cx">
</span><span class="cx"> send(Messages::WebPageProxy::DidFindZoomableArea(point, zoomableArea));
</span><span class="cx"> }
</span><ins>+#endif
</ins><span class="cx">
</span><span class="cx"> } // namespace WebKit
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessWebPageDrawingAreaImplcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/WebPage/DrawingAreaImpl.cpp (187794 => 187795)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/WebPage/DrawingAreaImpl.cpp 2015-08-04 01:14:38 UTC (rev 187794)
+++ trunk/Source/WebKit2/WebProcess/WebPage/DrawingAreaImpl.cpp 2015-08-04 01:16:59 UTC (rev 187795)
</span><span class="lines">@@ -50,7 +50,11 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> DrawingAreaImpl::DrawingAreaImpl(WebPage& webPage, const WebPageCreationParameters& parameters)
</span><ins>+#if USE(COORDINATED_GRAPHICS_MULTIPROCESS)
+ : DrawingArea(DrawingAreaTypeCoordinated, webPage)
+#else
</ins><span class="cx"> : DrawingArea(DrawingAreaTypeImpl, webPage)
</span><ins>+#endif
</ins><span class="cx"> , m_backingStoreStateID(0)
</span><span class="cx"> , m_isPaintingEnabled(true)
</span><span class="cx"> , m_inUpdateBackingStoreState(false)
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessWebPageDrawingAreaImplh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/WebPage/DrawingAreaImpl.h (187794 => 187795)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/WebPage/DrawingAreaImpl.h 2015-08-04 01:14:38 UTC (rev 187794)
+++ trunk/Source/WebKit2/WebProcess/WebPage/DrawingAreaImpl.h 2015-08-04 01:16:59 UTC (rev 187795)
</span><span class="lines">@@ -74,6 +74,10 @@
</span><span class="cx"> virtual void setNativeSurfaceHandleForCompositing(uint64_t) override;
</span><span class="cx"> #endif
</span><span class="cx">
</span><ins>+#if USE(COORDINATED_GRAPHICS_MULTIPROCESS)
+ virtual void didReceiveCoordinatedLayerTreeHostMessage(IPC::Connection&, IPC::MessageDecoder&) override { };
+#endif
+
</ins><span class="cx"> // IPC message handlers.
</span><span class="cx"> virtual void updateBackingStoreState(uint64_t backingStoreStateID, bool respondImmediately, float deviceScaleFactor, const WebCore::IntSize&, const WebCore::IntSize& scrollOffset) override;
</span><span class="cx"> virtual void didUpdate() override;
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessWebPageLayerTreeHostcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/WebPage/LayerTreeHost.cpp (187794 => 187795)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/WebPage/LayerTreeHost.cpp 2015-08-04 01:14:38 UTC (rev 187794)
+++ trunk/Source/WebKit2/WebProcess/WebPage/LayerTreeHost.cpp 2015-08-04 01:16:59 UTC (rev 187795)
</span><span class="lines">@@ -40,10 +40,10 @@
</span><span class="cx">
</span><span class="cx"> PassRefPtr<LayerTreeHost> LayerTreeHost::create(WebPage* webPage)
</span><span class="cx"> {
</span><del>-#if USE(COORDINATED_GRAPHICS_MULTIPROCESS)
</del><ins>+#if USE(COORDINATED_GRAPHICS_THREADED)
+ return ThreadedCoordinatedLayerTreeHost::create(webPage);
+#elif USE(COORDINATED_GRAPHICS_MULTIPROCESS)
</ins><span class="cx"> return CoordinatedLayerTreeHost::create(webPage);
</span><del>-#elif USE(COORDINATED_GRAPHICS_THREADED)
- return ThreadedCoordinatedLayerTreeHost::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="trunkSourceWebKit2WebProcessWebPageWebPagecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/WebPage/WebPage.cpp (187794 => 187795)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/WebPage/WebPage.cpp 2015-08-04 01:14:38 UTC (rev 187794)
+++ trunk/Source/WebKit2/WebProcess/WebPage/WebPage.cpp 2015-08-04 01:16:59 UTC (rev 187795)
</span><span class="lines">@@ -1299,11 +1299,11 @@
</span><span class="cx"> // This also takes care of the relayout.
</span><span class="cx"> setFixedLayoutSize(roundedIntSize(attr.layoutSize));
</span><span class="cx">
</span><del>-#if USE(COORDINATED_GRAPHICS_MULTIPROCESS)
- send(Messages::WebPageProxy::DidChangeViewportProperties(attr));
-#else
</del><ins>+#if USE(COORDINATED_GRAPHICS_THREADED)
</ins><span class="cx"> if (m_drawingArea->layerTreeHost())
</span><span class="cx"> m_drawingArea->layerTreeHost()->didChangeViewportProperties(attr);
</span><ins>+#else
+ send(Messages::WebPageProxy::DidChangeViewportProperties(attr));
</ins><span class="cx"> #endif
</span><span class="cx"> }
</span><span class="cx"> #endif
</span><span class="lines">@@ -1851,10 +1851,10 @@
</span><span class="cx"> #if USE(COORDINATED_GRAPHICS)
</span><span class="cx"> void WebPage::pageDidRequestScroll(const IntPoint& point)
</span><span class="cx"> {
</span><del>-#if USE(COORDINATED_GRAPHICS_MULTIPROCESS)
</del><ins>+#if USE(COORDINATED_GRAPHICS_THREADED)
+ drawingArea()->scroll(IntRect(point, IntSize()), IntSize());
+#elif USE(COORDINATED_GRAPHICS_MULTIPROCESS)
</ins><span class="cx"> send(Messages::WebPageProxy::PageDidRequestScroll(point));
</span><del>-#elif USE(COORDINATED_GRAPHICS_THREADED)
- drawingArea()->scroll(IntRect(point, IntSize()), IntSize());
</del><span class="cx"> #endif
</span><span class="cx"> }
</span><span class="cx"> #endif
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessWebPageWebPageh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/WebPage/WebPage.h (187794 => 187795)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/WebPage/WebPage.h 2015-08-04 01:14:38 UTC (rev 187794)
+++ trunk/Source/WebKit2/WebProcess/WebPage/WebPage.h 2015-08-04 01:16:59 UTC (rev 187795)
</span><span class="lines">@@ -572,6 +572,10 @@
</span><span class="cx"> void sendViewportAttributesChanged();
</span><span class="cx"> #endif
</span><span class="cx">
</span><ins>+#if USE(COORDINATED_GRAPHICS_MULTIPROCESS)
+ void commitPageTransitionViewport();
+#endif
+
</ins><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">@@ -610,10 +614,6 @@
</span><span class="cx"> void setThemePath(const String&);
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>-#if USE(COORDINATED_GRAPHICS_MULTIPROCESS)
- void commitPageTransitionViewport();
-#endif
-
</del><span class="cx"> #if PLATFORM(GTK)
</span><span class="cx"> void setComposition(const String& text, const Vector<WebCore::CompositionUnderline>& underlines, uint64_t selectionStart, uint64_t selectionEnd, uint64_t replacementRangeStart, uint64_t replacementRangeLength);
</span><span class="cx"> void confirmComposition(const String& text, int64_t selectionStart, int64_t selectionLength);
</span></span></pre>
</div>
</div>
</body>
</html>