<!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>[173166] 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/173166">173166</a></dd>
<dt>Author</dt> <dd>commit-queue@webkit.org</dd>
<dt>Date</dt> <dd>2014-09-01 19:05:04 -0700 (Mon, 01 Sep 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Build break on the EFL port since <a href="http://trac.webkit.org/projects/webkit/changeset/173163">r173163</a>
https://bugs.webkit.org/show_bug.cgi?id=136443
Unreviewed build fix.
Patch by Ryuan Choi <ryuan.choi@gmail.com> on 2014-09-01
* UIProcess/BackingStore.cpp:
(WebKit::BackingStore::BackingStore):
* UIProcess/BackingStore.h:
* UIProcess/CoordinatedGraphics/CoordinatedDrawingAreaProxy.cpp:
(WebKit::CoordinatedDrawingAreaProxy::CoordinatedDrawingAreaProxy):
(WebKit::CoordinatedDrawingAreaProxy::updateViewport):
(WebKit::CoordinatedDrawingAreaProxy::contentsRect):
(WebKit::CoordinatedDrawingAreaProxy::update):
(WebKit::CoordinatedDrawingAreaProxy::didUpdateBackingStoreState):
(WebKit::CoordinatedDrawingAreaProxy::incorporateUpdate):
(WebKit::CoordinatedDrawingAreaProxy::sendUpdateBackingStoreState):
(WebKit::CoordinatedDrawingAreaProxy::waitForAndDispatchDidUpdateBackingStoreState):
(WebKit::CoordinatedDrawingAreaProxy::enterAcceleratedCompositingMode):
(WebKit::CoordinatedDrawingAreaProxy::exitAcceleratedCompositingMode):
(WebKit::CoordinatedDrawingAreaProxy::updateAcceleratedCompositingMode):
* UIProcess/CoordinatedGraphics/CoordinatedDrawingAreaProxy.h:
(WebKit::CoordinatedDrawingAreaProxy::page):
* UIProcess/CoordinatedGraphics/CoordinatedLayerTreeHostProxy.cpp:
(WebKit::CoordinatedLayerTreeHostProxy::CoordinatedLayerTreeHostProxy):
(WebKit::CoordinatedLayerTreeHostProxy::~CoordinatedLayerTreeHostProxy):
(WebKit::CoordinatedLayerTreeHostProxy::commitCoordinatedGraphicsState):
(WebKit::CoordinatedLayerTreeHostProxy::setVisibleContentsRect):
(WebKit::CoordinatedLayerTreeHostProxy::renderNextFrame):
(WebKit::CoordinatedLayerTreeHostProxy::purgeBackingStores):
(WebKit::CoordinatedLayerTreeHostProxy::commitScrollOffset):
* UIProcess/CoordinatedGraphics/WebView.cpp:
(WebKit::WebView::createDrawingAreaProxy):
* UIProcess/cairo/BackingStoreCairo.cpp:
(WebKit::BackingStore::incorporateUpdate):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeLog</a></li>
<li><a href="#trunkSourceWebKit2UIProcessBackingStorecpp">trunk/Source/WebKit2/UIProcess/BackingStore.cpp</a></li>
<li><a href="#trunkSourceWebKit2UIProcessBackingStoreh">trunk/Source/WebKit2/UIProcess/BackingStore.h</a></li>
<li><a href="#trunkSourceWebKit2UIProcessCoordinatedGraphicsCoordinatedDrawingAreaProxycpp">trunk/Source/WebKit2/UIProcess/CoordinatedGraphics/CoordinatedDrawingAreaProxy.cpp</a></li>
<li><a href="#trunkSourceWebKit2UIProcessCoordinatedGraphicsCoordinatedDrawingAreaProxyh">trunk/Source/WebKit2/UIProcess/CoordinatedGraphics/CoordinatedDrawingAreaProxy.h</a></li>
<li><a href="#trunkSourceWebKit2UIProcessCoordinatedGraphicsCoordinatedLayerTreeHostProxycpp">trunk/Source/WebKit2/UIProcess/CoordinatedGraphics/CoordinatedLayerTreeHostProxy.cpp</a></li>
<li><a href="#trunkSourceWebKit2UIProcessCoordinatedGraphicsWebViewcpp">trunk/Source/WebKit2/UIProcess/CoordinatedGraphics/WebView.cpp</a></li>
<li><a href="#trunkSourceWebKit2UIProcesscairoBackingStoreCairocpp">trunk/Source/WebKit2/UIProcess/cairo/BackingStoreCairo.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (173165 => 173166)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2014-09-02 00:12:06 UTC (rev 173165)
+++ trunk/Source/WebKit2/ChangeLog 2014-09-02 02:05:04 UTC (rev 173166)
</span><span class="lines">@@ -1,3 +1,40 @@
</span><ins>+2014-09-01 Ryuan Choi <ryuan.choi@gmail.com>
+
+ Build break on the EFL port since r173163
+ https://bugs.webkit.org/show_bug.cgi?id=136443
+
+ Unreviewed build fix.
+
+ * UIProcess/BackingStore.cpp:
+ (WebKit::BackingStore::BackingStore):
+ * UIProcess/BackingStore.h:
+ * UIProcess/CoordinatedGraphics/CoordinatedDrawingAreaProxy.cpp:
+ (WebKit::CoordinatedDrawingAreaProxy::CoordinatedDrawingAreaProxy):
+ (WebKit::CoordinatedDrawingAreaProxy::updateViewport):
+ (WebKit::CoordinatedDrawingAreaProxy::contentsRect):
+ (WebKit::CoordinatedDrawingAreaProxy::update):
+ (WebKit::CoordinatedDrawingAreaProxy::didUpdateBackingStoreState):
+ (WebKit::CoordinatedDrawingAreaProxy::incorporateUpdate):
+ (WebKit::CoordinatedDrawingAreaProxy::sendUpdateBackingStoreState):
+ (WebKit::CoordinatedDrawingAreaProxy::waitForAndDispatchDidUpdateBackingStoreState):
+ (WebKit::CoordinatedDrawingAreaProxy::enterAcceleratedCompositingMode):
+ (WebKit::CoordinatedDrawingAreaProxy::exitAcceleratedCompositingMode):
+ (WebKit::CoordinatedDrawingAreaProxy::updateAcceleratedCompositingMode):
+ * UIProcess/CoordinatedGraphics/CoordinatedDrawingAreaProxy.h:
+ (WebKit::CoordinatedDrawingAreaProxy::page):
+ * UIProcess/CoordinatedGraphics/CoordinatedLayerTreeHostProxy.cpp:
+ (WebKit::CoordinatedLayerTreeHostProxy::CoordinatedLayerTreeHostProxy):
+ (WebKit::CoordinatedLayerTreeHostProxy::~CoordinatedLayerTreeHostProxy):
+ (WebKit::CoordinatedLayerTreeHostProxy::commitCoordinatedGraphicsState):
+ (WebKit::CoordinatedLayerTreeHostProxy::setVisibleContentsRect):
+ (WebKit::CoordinatedLayerTreeHostProxy::renderNextFrame):
+ (WebKit::CoordinatedLayerTreeHostProxy::purgeBackingStores):
+ (WebKit::CoordinatedLayerTreeHostProxy::commitScrollOffset):
+ * UIProcess/CoordinatedGraphics/WebView.cpp:
+ (WebKit::WebView::createDrawingAreaProxy):
+ * UIProcess/cairo/BackingStoreCairo.cpp:
+ (WebKit::BackingStore::incorporateUpdate):
+
</ins><span class="cx"> 2014-09-01 Tim Horton <timothy_horton@apple.com>
</span><span class="cx">
</span><span class="cx"> Remove two unused WebKit2 PDF-related preferences
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessBackingStorecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/BackingStore.cpp (173165 => 173166)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/BackingStore.cpp 2014-09-02 00:12:06 UTC (rev 173165)
+++ trunk/Source/WebKit2/UIProcess/BackingStore.cpp 2014-09-02 02:05:04 UTC (rev 173166)
</span><span class="lines">@@ -33,7 +33,7 @@
</span><span class="cx">
</span><span class="cx"> namespace WebKit {
</span><span class="cx">
</span><del>-BackingStore::BackingStore(const IntSize& size, float deviceScaleFactor, WebPageProxy* webPageProxy)
</del><ins>+BackingStore::BackingStore(const IntSize& size, float deviceScaleFactor, WebPageProxy& webPageProxy)
</ins><span class="cx"> : m_size(size)
</span><span class="cx"> , m_deviceScaleFactor(deviceScaleFactor)
</span><span class="cx"> , m_webPageProxy(webPageProxy)
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessBackingStoreh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/BackingStore.h (173165 => 173166)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/BackingStore.h 2014-09-02 00:12:06 UTC (rev 173165)
+++ trunk/Source/WebKit2/UIProcess/BackingStore.h 2014-09-02 02:05:04 UTC (rev 173166)
</span><span class="lines">@@ -45,7 +45,7 @@
</span><span class="cx"> WTF_MAKE_NONCOPYABLE(BackingStore);
</span><span class="cx">
</span><span class="cx"> public:
</span><del>- BackingStore(const WebCore::IntSize&, float deviceScaleFactor, WebPageProxy*);
</del><ins>+ BackingStore(const WebCore::IntSize&, float deviceScaleFactor, WebPageProxy&);
</ins><span class="cx"> ~BackingStore();
</span><span class="cx">
</span><span class="cx"> const WebCore::IntSize& size() const { return m_size; }
</span><span class="lines">@@ -64,7 +64,7 @@
</span><span class="cx">
</span><span class="cx"> WebCore::IntSize m_size;
</span><span class="cx"> float m_deviceScaleFactor;
</span><del>- WebPageProxy* m_webPageProxy;
</del><ins>+ WebPageProxy& m_webPageProxy;
</ins><span class="cx">
</span><span class="cx"> #if USE(CAIRO)
</span><span class="cx"> OwnPtr<WebCore::WidgetBackingStore> m_backingStore;
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessCoordinatedGraphicsCoordinatedDrawingAreaProxycpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/CoordinatedGraphics/CoordinatedDrawingAreaProxy.cpp (173165 => 173166)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/CoordinatedGraphics/CoordinatedDrawingAreaProxy.cpp 2014-09-02 00:12:06 UTC (rev 173165)
+++ trunk/Source/WebKit2/UIProcess/CoordinatedGraphics/CoordinatedDrawingAreaProxy.cpp 2014-09-02 02:05:04 UTC (rev 173166)
</span><span class="lines">@@ -44,7 +44,7 @@
</span><span class="cx">
</span><span class="cx"> namespace WebKit {
</span><span class="cx">
</span><del>-CoordinatedDrawingAreaProxy::CoordinatedDrawingAreaProxy(WebPageProxy* webPageProxy)
</del><ins>+CoordinatedDrawingAreaProxy::CoordinatedDrawingAreaProxy(WebPageProxy& webPageProxy)
</ins><span class="cx"> : DrawingAreaProxy(DrawingAreaTypeCoordinated, webPageProxy)
</span><span class="cx"> , m_currentBackingStoreStateID(0)
</span><span class="cx"> , m_nextBackingStoreStateID(0)
</span><span class="lines">@@ -54,7 +54,7 @@
</span><span class="cx"> , m_discardBackingStoreTimer(RunLoop::current(), this, &CoordinatedDrawingAreaProxy::discardBackingStore)
</span><span class="cx"> {
</span><span class="cx"> // Construct the proxy early to allow messages to be sent to the web process while AC is entered there.
</span><del>- if (webPageProxy->pageGroup().preferences().forceCompositingMode())
</del><ins>+ if (webPageProxy.pageGroup().preferences().forceCompositingMode())
</ins><span class="cx"> m_coordinatedLayerTreeHostProxy = adoptPtr(new CoordinatedLayerTreeHostProxy(this));
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -110,12 +110,12 @@
</span><span class="cx">
</span><span class="cx"> void CoordinatedDrawingAreaProxy::updateViewport()
</span><span class="cx"> {
</span><del>- m_webPageProxy->setViewNeedsDisplay(viewportVisibleRect());
</del><ins>+ m_webPageProxy.setViewNeedsDisplay(viewportVisibleRect());
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> WebCore::IntRect CoordinatedDrawingAreaProxy::contentsRect() const
</span><span class="cx"> {
</span><del>- return IntRect(IntPoint::zero(), m_webPageProxy->viewSize());
</del><ins>+ return IntRect(IntPoint::zero(), m_webPageProxy.viewSize());
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void CoordinatedDrawingAreaProxy::sizeDidChange()
</span><span class="lines">@@ -162,7 +162,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 CoordinatedDrawingAreaProxy::didUpdateBackingStoreState(uint64_t backingStoreStateID, const UpdateInfo& updateInfo, const LayerTreeContext& layerTreeContext)
</span><span class="lines">@@ -174,7 +174,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">@@ -248,17 +248,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 CoordinatedDrawingAreaProxy::backingStoreStateDidChange(RespondImmediatelyOrNot respondImmediatelyOrNot)
</span><span class="lines">@@ -271,24 +271,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">@@ -302,9 +302,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">@@ -313,7 +313,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, in seconds, we use when waiting for a DidUpdateBackingStoreState message when we're asked to paint.
</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 CoordinatedDrawingAreaProxy::enterAcceleratedCompositingMode(const LayerTreeContext& layerTreeContext)
</span><span class="lines">@@ -322,7 +322,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"> if (!m_coordinatedLayerTreeHostProxy)
</span><span class="cx"> m_coordinatedLayerTreeHostProxy = adoptPtr(new CoordinatedLayerTreeHostProxy(this));
</span><span class="cx"> }
</span><span class="lines">@@ -338,7 +338,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 CoordinatedDrawingAreaProxy::updateAcceleratedCompositingMode(const LayerTreeContext& layerTreeContext)
</span><span class="lines">@@ -346,7 +346,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 CoordinatedDrawingAreaProxy::discardBackingStoreSoon()
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessCoordinatedGraphicsCoordinatedDrawingAreaProxyh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/CoordinatedGraphics/CoordinatedDrawingAreaProxy.h (173165 => 173166)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/CoordinatedGraphics/CoordinatedDrawingAreaProxy.h 2014-09-02 00:12:06 UTC (rev 173165)
+++ trunk/Source/WebKit2/UIProcess/CoordinatedGraphics/CoordinatedDrawingAreaProxy.h 2014-09-02 02:05:04 UTC (rev 173166)
</span><span class="lines">@@ -45,7 +45,7 @@
</span><span class="cx">
</span><span class="cx"> class CoordinatedDrawingAreaProxy : public DrawingAreaProxy {
</span><span class="cx"> public:
</span><del>- explicit CoordinatedDrawingAreaProxy(WebPageProxy*);
</del><ins>+ explicit CoordinatedDrawingAreaProxy(WebPageProxy&);
</ins><span class="cx"> virtual ~CoordinatedDrawingAreaProxy();
</span><span class="cx">
</span><span class="cx"> void paint(BackingStore::PlatformGraphicsContext, const WebCore::IntRect&, WebCore::Region& unpaintedRegion);
</span><span class="lines">@@ -63,7 +63,7 @@
</span><span class="cx"> WebCore::IntRect contentsRect() const;
</span><span class="cx"> void updateViewport();
</span><span class="cx">
</span><del>- WebPageProxy* page() { return m_webPageProxy; }
</del><ins>+ WebPageProxy& page() { return m_webPageProxy; }
</ins><span class="cx"> private:
</span><span class="cx"> // DrawingAreaProxy
</span><span class="cx"> virtual void sizeDidChange();
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessCoordinatedGraphicsCoordinatedLayerTreeHostProxycpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/CoordinatedGraphics/CoordinatedLayerTreeHostProxy.cpp (173165 => 173166)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/CoordinatedGraphics/CoordinatedLayerTreeHostProxy.cpp 2014-09-02 00:12:06 UTC (rev 173165)
+++ trunk/Source/WebKit2/UIProcess/CoordinatedGraphics/CoordinatedLayerTreeHostProxy.cpp 2014-09-02 02:05:04 UTC (rev 173166)
</span><span class="lines">@@ -38,12 +38,12 @@
</span><span class="cx"> : m_drawingAreaProxy(drawingAreaProxy)
</span><span class="cx"> , m_scene(adoptRef(new CoordinatedGraphicsScene(this)))
</span><span class="cx"> {
</span><del>- m_drawingAreaProxy->page()->process().addMessageReceiver(Messages::CoordinatedLayerTreeHostProxy::messageReceiverName(), m_drawingAreaProxy->page()->pageID(), *this);
</del><ins>+ m_drawingAreaProxy->page().process().addMessageReceiver(Messages::CoordinatedLayerTreeHostProxy::messageReceiverName(), m_drawingAreaProxy->page().pageID(), *this);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> CoordinatedLayerTreeHostProxy::~CoordinatedLayerTreeHostProxy()
</span><span class="cx"> {
</span><del>- m_drawingAreaProxy->page()->process().removeMessageReceiver(Messages::CoordinatedLayerTreeHostProxy::messageReceiverName(), m_drawingAreaProxy->page()->pageID());
</del><ins>+ m_drawingAreaProxy->page().process().removeMessageReceiver(Messages::CoordinatedLayerTreeHostProxy::messageReceiverName(), m_drawingAreaProxy->page().pageID());
</ins><span class="cx"> m_scene->detach();
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -66,7 +66,7 @@
</span><span class="cx">
</span><span class="cx"> updateViewport();
</span><span class="cx"> #if USE(TILED_BACKING_STORE)
</span><del>- m_drawingAreaProxy->page()->didRenderFrame(graphicsState.contentsSize, graphicsState.coveredRect);
</del><ins>+ m_drawingAreaProxy->page().didRenderFrame(graphicsState.contentsSize, graphicsState.coveredRect);
</ins><span class="cx"> #endif
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -82,19 +82,19 @@
</span><span class="cx"> if (rect == m_lastSentVisibleRect && trajectoryVector == m_lastSentTrajectoryVector)
</span><span class="cx"> return;
</span><span class="cx">
</span><del>- m_drawingAreaProxy->page()->process().send(Messages::CoordinatedLayerTreeHost::SetVisibleContentsRect(rect, trajectoryVector), m_drawingAreaProxy->page()->pageID());
</del><ins>+ m_drawingAreaProxy->page().process().send(Messages::CoordinatedLayerTreeHost::SetVisibleContentsRect(rect, trajectoryVector), m_drawingAreaProxy->page().pageID());
</ins><span class="cx"> m_lastSentVisibleRect = rect;
</span><span class="cx"> m_lastSentTrajectoryVector = trajectoryVector;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void CoordinatedLayerTreeHostProxy::renderNextFrame()
</span><span class="cx"> {
</span><del>- m_drawingAreaProxy->page()->process().send(Messages::CoordinatedLayerTreeHost::RenderNextFrame(), m_drawingAreaProxy->page()->pageID());
</del><ins>+ m_drawingAreaProxy->page().process().send(Messages::CoordinatedLayerTreeHost::RenderNextFrame(), m_drawingAreaProxy->page().pageID());
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void CoordinatedLayerTreeHostProxy::purgeBackingStores()
</span><span class="cx"> {
</span><del>- m_drawingAreaProxy->page()->process().send(Messages::CoordinatedLayerTreeHost::PurgeBackingStores(), m_drawingAreaProxy->page()->pageID());
</del><ins>+ m_drawingAreaProxy->page().process().send(Messages::CoordinatedLayerTreeHost::PurgeBackingStores(), m_drawingAreaProxy->page().pageID());
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void CoordinatedLayerTreeHostProxy::setBackgroundColor(const Color& color)
</span><span class="lines">@@ -107,7 +107,7 @@
</span><span class="cx">
</span><span class="cx"> void CoordinatedLayerTreeHostProxy::commitScrollOffset(uint32_t layerID, const IntSize& offset)
</span><span class="cx"> {
</span><del>- m_drawingAreaProxy->page()->process().send(Messages::CoordinatedLayerTreeHost::CommitScrollOffset(layerID, offset), m_drawingAreaProxy->page()->pageID());
</del><ins>+ m_drawingAreaProxy->page().process().send(Messages::CoordinatedLayerTreeHost::CommitScrollOffset(layerID, offset), m_drawingAreaProxy->page().pageID());
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessCoordinatedGraphicsWebViewcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/CoordinatedGraphics/WebView.cpp (173165 => 173166)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/CoordinatedGraphics/WebView.cpp 2014-09-02 00:12:06 UTC (rev 173165)
+++ trunk/Source/WebKit2/UIProcess/CoordinatedGraphics/WebView.cpp 2014-09-02 02:05:04 UTC (rev 173166)
</span><span class="lines">@@ -286,7 +286,7 @@
</span><span class="cx">
</span><span class="cx"> std::unique_ptr<DrawingAreaProxy> WebView::createDrawingAreaProxy()
</span><span class="cx"> {
</span><del>- return std::make_unique<CoordinatedDrawingAreaProxy>(page());
</del><ins>+ return std::make_unique<CoordinatedDrawingAreaProxy>(*m_page);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void WebView::setViewNeedsDisplay(const WebCore::IntRect& area)
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcesscairoBackingStoreCairocpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/cairo/BackingStoreCairo.cpp (173165 => 173166)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/cairo/BackingStoreCairo.cpp 2014-09-02 00:12:06 UTC (rev 173165)
+++ trunk/Source/WebKit2/UIProcess/cairo/BackingStoreCairo.cpp 2014-09-02 02:05:04 UTC (rev 173166)
</span><span class="lines">@@ -73,9 +73,9 @@
</span><span class="cx"> {
</span><span class="cx"> if (!m_backingStore)
</span><span class="cx"> #if PLATFORM(EFL)
</span><del>- m_backingStore = WidgetBackingStoreCairo::create(EwkView::toEvasObject(toAPI(m_webPageProxy)), size(), deviceScaleFactor());
</del><ins>+ m_backingStore = WidgetBackingStoreCairo::create(EwkView::toEvasObject(toAPI(&m_webPageProxy)), size(), deviceScaleFactor());
</ins><span class="cx"> #else
</span><del>- m_backingStore = createBackingStoreForGTK(m_webPageProxy->viewWidget(), size(), deviceScaleFactor());
</del><ins>+ m_backingStore = createBackingStoreForGTK(m_webPageProxy.viewWidget(), size(), deviceScaleFactor());
</ins><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> scroll(updateInfo.scrollRect, updateInfo.scrollOffset);
</span></span></pre>
</div>
</div>
</body>
</html>