<!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>[173168] 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/173168">173168</a></dd>
<dt>Author</dt> <dd>philn@webkit.org</dd>
<dt>Date</dt> <dd>2014-09-02 01:06:17 -0700 (Tue, 02 Sep 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Unreviewed, GTK build fix after <a href="http://trac.webkit.org/projects/webkit/changeset/173163">r173163</a>.
* UIProcess/API/gtk/PageClientImpl.cpp:
(WebKit::PageClientImpl::createDrawingAreaProxy):
* UIProcess/DrawingAreaProxyImpl.cpp:
(WebKit::DrawingAreaProxyImpl::DrawingAreaProxyImpl):
(WebKit::DrawingAreaProxyImpl::update):
(WebKit::DrawingAreaProxyImpl::didUpdateBackingStoreState):
(WebKit::DrawingAreaProxyImpl::incorporateUpdate):
(WebKit::DrawingAreaProxyImpl::sendUpdateBackingStoreState):
(WebKit::DrawingAreaProxyImpl::waitForAndDispatchDidUpdateBackingStoreState):
(WebKit::DrawingAreaProxyImpl::enterAcceleratedCompositingMode):
(WebKit::DrawingAreaProxyImpl::exitAcceleratedCompositingMode):
(WebKit::DrawingAreaProxyImpl::updateAcceleratedCompositingMode):
* UIProcess/DrawingAreaProxyImpl.h:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeLog</a></li>
<li><a href="#trunkSourceWebKit2UIProcessAPIgtkPageClientImplcpp">trunk/Source/WebKit2/UIProcess/API/gtk/PageClientImpl.cpp</a></li>
<li><a href="#trunkSourceWebKit2UIProcessDrawingAreaProxyImplcpp">trunk/Source/WebKit2/UIProcess/DrawingAreaProxyImpl.cpp</a></li>
<li><a href="#trunkSourceWebKit2UIProcessDrawingAreaProxyImplh">trunk/Source/WebKit2/UIProcess/DrawingAreaProxyImpl.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (173167 => 173168)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2014-09-02 04:43:50 UTC (rev 173167)
+++ trunk/Source/WebKit2/ChangeLog 2014-09-02 08:06:17 UTC (rev 173168)
</span><span class="lines">@@ -1,3 +1,21 @@
</span><ins>+2014-09-02 Philippe Normand <pnormand@igalia.com>
+
+ Unreviewed, GTK build fix after r173163.
+
+ * UIProcess/API/gtk/PageClientImpl.cpp:
+ (WebKit::PageClientImpl::createDrawingAreaProxy):
+ * UIProcess/DrawingAreaProxyImpl.cpp:
+ (WebKit::DrawingAreaProxyImpl::DrawingAreaProxyImpl):
+ (WebKit::DrawingAreaProxyImpl::update):
+ (WebKit::DrawingAreaProxyImpl::didUpdateBackingStoreState):
+ (WebKit::DrawingAreaProxyImpl::incorporateUpdate):
+ (WebKit::DrawingAreaProxyImpl::sendUpdateBackingStoreState):
+ (WebKit::DrawingAreaProxyImpl::waitForAndDispatchDidUpdateBackingStoreState):
+ (WebKit::DrawingAreaProxyImpl::enterAcceleratedCompositingMode):
+ (WebKit::DrawingAreaProxyImpl::exitAcceleratedCompositingMode):
+ (WebKit::DrawingAreaProxyImpl::updateAcceleratedCompositingMode):
+ * UIProcess/DrawingAreaProxyImpl.h:
+
</ins><span class="cx"> 2014-09-01 Timothy Horton <timothy_horton@apple.com>
</span><span class="cx">
</span><span class="cx"> Fix the iOS build.
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPIgtkPageClientImplcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/API/gtk/PageClientImpl.cpp (173167 => 173168)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/gtk/PageClientImpl.cpp 2014-09-02 04:43:50 UTC (rev 173167)
+++ trunk/Source/WebKit2/UIProcess/API/gtk/PageClientImpl.cpp 2014-09-02 08:06:17 UTC (rev 173168)
</span><span class="lines">@@ -65,7 +65,7 @@
</span><span class="cx"> // PageClient's pure virtual functions
</span><span class="cx"> std::unique_ptr<DrawingAreaProxy> PageClientImpl::createDrawingAreaProxy()
</span><span class="cx"> {
</span><del>- return std::make_unique<DrawingAreaProxyImpl>(webkitWebViewBaseGetPage(WEBKIT_WEB_VIEW_BASE(m_viewWidget)));
</del><ins>+ return std::make_unique<DrawingAreaProxyImpl>(*webkitWebViewBaseGetPage(WEBKIT_WEB_VIEW_BASE(m_viewWidget)));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void PageClientImpl::setViewNeedsDisplay(const WebCore::IntRect& rect)
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessDrawingAreaProxyImplcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/DrawingAreaProxyImpl.cpp (173167 => 173168)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/DrawingAreaProxyImpl.cpp 2014-09-02 04:43:50 UTC (rev 173167)
+++ trunk/Source/WebKit2/UIProcess/DrawingAreaProxyImpl.cpp 2014-09-02 08:06:17 UTC (rev 173168)
</span><span class="lines">@@ -40,7 +40,7 @@
</span><span class="cx">
</span><span class="cx"> namespace WebKit {
</span><span class="cx">
</span><del>-DrawingAreaProxyImpl::DrawingAreaProxyImpl(WebPageProxy* webPageProxy)
</del><ins>+DrawingAreaProxyImpl::DrawingAreaProxyImpl(WebPageProxy& webPageProxy)
</ins><span class="cx"> : DrawingAreaProxy(DrawingAreaTypeImpl, webPageProxy)
</span><span class="cx"> , m_currentBackingStoreStateID(0)
</span><span class="cx"> , m_nextBackingStoreStateID(0)
</span><span class="lines">@@ -137,7 +137,7 @@
</span><span class="cx"> // FIXME: Handle the case where the view is hidden.
</span><span class="cx">
</span><span class="cx"> incorporateUpdate(updateInfo);
</span><del>- m_webPageProxy->process().send(Messages::DrawingArea::DidUpdate(), m_webPageProxy->pageID());
</del><ins>+ m_webPageProxy.process().send(Messages::DrawingArea::DidUpdate(), m_webPageProxy.pageID());
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void DrawingAreaProxyImpl::didUpdateBackingStoreState(uint64_t backingStoreStateID, const UpdateInfo& updateInfo, const LayerTreeContext& layerTreeContext)
</span><span class="lines">@@ -149,7 +149,7 @@
</span><span class="cx"> m_isWaitingForDidUpdateBackingStoreState = false;
</span><span class="cx">
</span><span class="cx"> // Stop the responsiveness timer that was started in sendUpdateBackingStoreState.
</span><del>- m_webPageProxy->process().responsivenessTimer()->stop();
</del><ins>+ m_webPageProxy.process().responsivenessTimer()->stop();
</ins><span class="cx">
</span><span class="cx"> if (layerTreeContext != m_layerTreeContext) {
</span><span class="cx"> if (!m_layerTreeContext.isEmpty()) {
</span><span class="lines">@@ -223,17 +223,17 @@
</span><span class="cx"> bool shouldScroll = !updateInfo.scrollRect.isEmpty();
</span><span class="cx">
</span><span class="cx"> if (shouldScroll)
</span><del>- m_webPageProxy->scrollView(updateInfo.scrollRect, updateInfo.scrollOffset);
</del><ins>+ m_webPageProxy.scrollView(updateInfo.scrollRect, updateInfo.scrollOffset);
</ins><span class="cx">
</span><del>- if (shouldScroll && !m_webPageProxy->canScrollView())
- m_webPageProxy->setViewNeedsDisplay(IntRect(IntPoint(), m_webPageProxy->viewSize()));
</del><ins>+ if (shouldScroll && !m_webPageProxy.canScrollView())
+ m_webPageProxy.setViewNeedsDisplay(IntRect(IntPoint(), m_webPageProxy.viewSize()));
</ins><span class="cx"> else {
</span><span class="cx"> for (size_t i = 0; i < updateInfo.updateRects.size(); ++i)
</span><del>- m_webPageProxy->setViewNeedsDisplay(updateInfo.updateRects[i]);
</del><ins>+ m_webPageProxy.setViewNeedsDisplay(updateInfo.updateRects[i]);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if (shouldScroll)
</span><del>- m_webPageProxy->displayView();
</del><ins>+ m_webPageProxy.displayView();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void DrawingAreaProxyImpl::backingStoreStateDidChange(RespondImmediatelyOrNot respondImmediatelyOrNot)
</span><span class="lines">@@ -246,24 +246,24 @@
</span><span class="cx"> {
</span><span class="cx"> ASSERT(m_currentBackingStoreStateID < m_nextBackingStoreStateID);
</span><span class="cx">
</span><del>- if (!m_webPageProxy->isValid())
</del><ins>+ if (!m_webPageProxy.isValid())
</ins><span class="cx"> return;
</span><span class="cx">
</span><span class="cx"> if (m_isWaitingForDidUpdateBackingStoreState)
</span><span class="cx"> return;
</span><span class="cx">
</span><del>- if (m_webPageProxy->viewSize().isEmpty() && !m_webPageProxy->useFixedLayout())
</del><ins>+ if (m_webPageProxy.viewSize().isEmpty() && !m_webPageProxy.useFixedLayout())
</ins><span class="cx"> return;
</span><span class="cx">
</span><span class="cx"> m_isWaitingForDidUpdateBackingStoreState = respondImmediatelyOrNot == RespondImmediately;
</span><span class="cx">
</span><del>- m_webPageProxy->process().send(Messages::DrawingArea::UpdateBackingStoreState(m_nextBackingStoreStateID, respondImmediatelyOrNot == RespondImmediately, m_webPageProxy->deviceScaleFactor(), m_size, m_scrollOffset), m_webPageProxy->pageID());
</del><ins>+ m_webPageProxy.process().send(Messages::DrawingArea::UpdateBackingStoreState(m_nextBackingStoreStateID, respondImmediatelyOrNot == RespondImmediately, m_webPageProxy.deviceScaleFactor(), m_size, m_scrollOffset), m_webPageProxy.pageID());
</ins><span class="cx"> m_scrollOffset = IntSize();
</span><span class="cx">
</span><span class="cx"> if (m_isWaitingForDidUpdateBackingStoreState) {
</span><span class="cx"> // Start the responsiveness timer. We will stop it when we hear back from the WebProcess
</span><span class="cx"> // in didUpdateBackingStoreState.
</span><del>- m_webPageProxy->process().responsivenessTimer()->start();
</del><ins>+ m_webPageProxy.process().responsivenessTimer()->start();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if (m_isWaitingForDidUpdateBackingStoreState && !m_layerTreeContext.isEmpty()) {
</span><span class="lines">@@ -277,9 +277,9 @@
</span><span class="cx"> {
</span><span class="cx"> ASSERT(m_isWaitingForDidUpdateBackingStoreState);
</span><span class="cx">
</span><del>- if (!m_webPageProxy->isValid())
</del><ins>+ if (!m_webPageProxy.isValid())
</ins><span class="cx"> return;
</span><del>- if (m_webPageProxy->process().state() == WebProcessProxy::State::Launching)
</del><ins>+ if (m_webPageProxy.process().state() == WebProcessProxy::State::Launching)
</ins><span class="cx"> return;
</span><span class="cx">
</span><span class="cx"> // FIXME: waitForAndDispatchImmediately will always return the oldest DidUpdateBackingStoreState message that
</span><span class="lines">@@ -288,7 +288,7 @@
</span><span class="cx"> // choose the most recent one, or the one that is closest to our current size.
</span><span class="cx">
</span><span class="cx"> // The timeout we use when waiting for a DidUpdateBackingStoreState message when we're asked to paint is 500 milliseconds.
</span><del>- m_webPageProxy->process().connection()->waitForAndDispatchImmediately<Messages::DrawingAreaProxy::DidUpdateBackingStoreState>(m_webPageProxy->pageID(), std::chrono::milliseconds(500));
</del><ins>+ m_webPageProxy.process().connection()->waitForAndDispatchImmediately<Messages::DrawingAreaProxy::DidUpdateBackingStoreState>(m_webPageProxy.pageID(), std::chrono::milliseconds(500));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void DrawingAreaProxyImpl::enterAcceleratedCompositingMode(const LayerTreeContext& layerTreeContext)
</span><span class="lines">@@ -297,7 +297,7 @@
</span><span class="cx">
</span><span class="cx"> m_backingStore = nullptr;
</span><span class="cx"> m_layerTreeContext = layerTreeContext;
</span><del>- m_webPageProxy->enterAcceleratedCompositingMode(layerTreeContext);
</del><ins>+ m_webPageProxy.enterAcceleratedCompositingMode(layerTreeContext);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void DrawingAreaProxyImpl::exitAcceleratedCompositingMode()
</span><span class="lines">@@ -305,7 +305,7 @@
</span><span class="cx"> ASSERT(isInAcceleratedCompositingMode());
</span><span class="cx">
</span><span class="cx"> m_layerTreeContext = LayerTreeContext();
</span><del>- m_webPageProxy->exitAcceleratedCompositingMode();
</del><ins>+ m_webPageProxy.exitAcceleratedCompositingMode();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void DrawingAreaProxyImpl::updateAcceleratedCompositingMode(const LayerTreeContext& layerTreeContext)
</span><span class="lines">@@ -313,7 +313,7 @@
</span><span class="cx"> ASSERT(isInAcceleratedCompositingMode());
</span><span class="cx">
</span><span class="cx"> m_layerTreeContext = layerTreeContext;
</span><del>- m_webPageProxy->updateAcceleratedCompositingMode(layerTreeContext);
</del><ins>+ m_webPageProxy.updateAcceleratedCompositingMode(layerTreeContext);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void DrawingAreaProxyImpl::discardBackingStoreSoon()
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessDrawingAreaProxyImplh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/DrawingAreaProxyImpl.h (173167 => 173168)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/DrawingAreaProxyImpl.h 2014-09-02 04:43:50 UTC (rev 173167)
+++ trunk/Source/WebKit2/UIProcess/DrawingAreaProxyImpl.h 2014-09-02 08:06:17 UTC (rev 173168)
</span><span class="lines">@@ -39,7 +39,7 @@
</span><span class="cx">
</span><span class="cx"> class DrawingAreaProxyImpl : public DrawingAreaProxy {
</span><span class="cx"> public:
</span><del>- explicit DrawingAreaProxyImpl(WebPageProxy*);
</del><ins>+ explicit DrawingAreaProxyImpl(WebPageProxy&);
</ins><span class="cx"> virtual ~DrawingAreaProxyImpl();
</span><span class="cx">
</span><span class="cx"> void paint(BackingStore::PlatformGraphicsContext, const WebCore::IntRect&, WebCore::Region& unpaintedRegion);
</span></span></pre>
</div>
</div>
</body>
</html>