<!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>[173163] 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/173163">173163</a></dd>
<dt>Author</dt> <dd>timothy_horton@apple.com</dd>
<dt>Date</dt> <dd>2014-09-01 16:04:12 -0700 (Mon, 01 Sep 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>DrawingAreaProxy and friends can hold on to WebPageProxy by reference
https://bugs.webkit.org/show_bug.cgi?id=136440
Reviewed by Dan Bernstein.
* UIProcess/API/mac/WKView.mm:
(-[WKView _createDrawingAreaProxy]):
* UIProcess/DrawingAreaProxy.cpp:
(WebKit::DrawingAreaProxy::DrawingAreaProxy):
(WebKit::DrawingAreaProxy::~DrawingAreaProxy):
(WebKit::DrawingAreaProxy::setExposedRect):
(WebKit::DrawingAreaProxy::exposedRectChangedTimerFired):
* UIProcess/DrawingAreaProxy.h:
* UIProcess/mac/RemoteLayerTreeDrawingAreaProxy.h:
* UIProcess/mac/RemoteLayerTreeDrawingAreaProxy.mm:
(WebKit::RemoteLayerTreeDrawingAreaProxy::RemoteLayerTreeDrawingAreaProxy):
(WebKit::RemoteLayerTreeDrawingAreaProxy::~RemoteLayerTreeDrawingAreaProxy):
(WebKit::RemoteLayerTreeDrawingAreaProxy::sizeDidChange):
(WebKit::RemoteLayerTreeDrawingAreaProxy::deviceScaleFactorDidChange):
(WebKit::RemoteLayerTreeDrawingAreaProxy::scaledExposedRect):
(WebKit::RemoteLayerTreeDrawingAreaProxy::sendUpdateGeometry):
(WebKit::RemoteLayerTreeDrawingAreaProxy::commitLayerTree):
(WebKit::RemoteLayerTreeDrawingAreaProxy::acceleratedAnimationDidStart):
(WebKit::RemoteLayerTreeDrawingAreaProxy::acceleratedAnimationDidEnd):
(WebKit::RemoteLayerTreeDrawingAreaProxy::indicatorLocation):
(WebKit::RemoteLayerTreeDrawingAreaProxy::indicatorScale):
(WebKit::RemoteLayerTreeDrawingAreaProxy::updateDebugIndicator):
(WebKit::RemoteLayerTreeDrawingAreaProxy::didRefreshDisplay):
(WebKit::RemoteLayerTreeDrawingAreaProxy::waitForDidUpdateViewState):
(WebKit::RemoteLayerTreeDrawingAreaProxy::dispatchAfterEnsuringDrawing):
* UIProcess/mac/TiledCoreAnimationDrawingAreaProxy.h:
* UIProcess/mac/TiledCoreAnimationDrawingAreaProxy.mm:
(WebKit::TiledCoreAnimationDrawingAreaProxy::TiledCoreAnimationDrawingAreaProxy):
(WebKit::TiledCoreAnimationDrawingAreaProxy::deviceScaleFactorDidChange):
(WebKit::TiledCoreAnimationDrawingAreaProxy::sizeDidChange):
(WebKit::TiledCoreAnimationDrawingAreaProxy::waitForPossibleGeometryUpdate):
(WebKit::TiledCoreAnimationDrawingAreaProxy::colorSpaceDidChange):
(WebKit::TiledCoreAnimationDrawingAreaProxy::minimumLayoutSizeDidChange):
(WebKit::TiledCoreAnimationDrawingAreaProxy::enterAcceleratedCompositingMode):
(WebKit::TiledCoreAnimationDrawingAreaProxy::updateAcceleratedCompositingMode):
(WebKit::TiledCoreAnimationDrawingAreaProxy::didUpdateGeometry):
(WebKit::TiledCoreAnimationDrawingAreaProxy::waitForDidUpdateViewState):
(WebKit::TiledCoreAnimationDrawingAreaProxy::intrinsicContentSizeDidChange):
(WebKit::TiledCoreAnimationDrawingAreaProxy::sendUpdateGeometry):
(WebKit::TiledCoreAnimationDrawingAreaProxy::adjustTransientZoom):
(WebKit::TiledCoreAnimationDrawingAreaProxy::commitTransientZoom):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeLog</a></li>
<li><a href="#trunkSourceWebKit2UIProcessAPImacWKViewmm">trunk/Source/WebKit2/UIProcess/API/mac/WKView.mm</a></li>
<li><a href="#trunkSourceWebKit2UIProcessDrawingAreaProxycpp">trunk/Source/WebKit2/UIProcess/DrawingAreaProxy.cpp</a></li>
<li><a href="#trunkSourceWebKit2UIProcessDrawingAreaProxyh">trunk/Source/WebKit2/UIProcess/DrawingAreaProxy.h</a></li>
<li><a href="#trunkSourceWebKit2UIProcessmacRemoteLayerTreeDrawingAreaProxyh">trunk/Source/WebKit2/UIProcess/mac/RemoteLayerTreeDrawingAreaProxy.h</a></li>
<li><a href="#trunkSourceWebKit2UIProcessmacRemoteLayerTreeDrawingAreaProxymm">trunk/Source/WebKit2/UIProcess/mac/RemoteLayerTreeDrawingAreaProxy.mm</a></li>
<li><a href="#trunkSourceWebKit2UIProcessmacTiledCoreAnimationDrawingAreaProxyh">trunk/Source/WebKit2/UIProcess/mac/TiledCoreAnimationDrawingAreaProxy.h</a></li>
<li><a href="#trunkSourceWebKit2UIProcessmacTiledCoreAnimationDrawingAreaProxymm">trunk/Source/WebKit2/UIProcess/mac/TiledCoreAnimationDrawingAreaProxy.mm</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (173162 => 173163)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2014-09-01 21:15:21 UTC (rev 173162)
+++ trunk/Source/WebKit2/ChangeLog 2014-09-01 23:04:12 UTC (rev 173163)
</span><span class="lines">@@ -1,3 +1,52 @@
</span><ins>+2014-09-01 Tim Horton <timothy_horton@apple.com>
+
+ DrawingAreaProxy and friends can hold on to WebPageProxy by reference
+ https://bugs.webkit.org/show_bug.cgi?id=136440
+
+ Reviewed by Dan Bernstein.
+
+ * UIProcess/API/mac/WKView.mm:
+ (-[WKView _createDrawingAreaProxy]):
+ * UIProcess/DrawingAreaProxy.cpp:
+ (WebKit::DrawingAreaProxy::DrawingAreaProxy):
+ (WebKit::DrawingAreaProxy::~DrawingAreaProxy):
+ (WebKit::DrawingAreaProxy::setExposedRect):
+ (WebKit::DrawingAreaProxy::exposedRectChangedTimerFired):
+ * UIProcess/DrawingAreaProxy.h:
+ * UIProcess/mac/RemoteLayerTreeDrawingAreaProxy.h:
+ * UIProcess/mac/RemoteLayerTreeDrawingAreaProxy.mm:
+ (WebKit::RemoteLayerTreeDrawingAreaProxy::RemoteLayerTreeDrawingAreaProxy):
+ (WebKit::RemoteLayerTreeDrawingAreaProxy::~RemoteLayerTreeDrawingAreaProxy):
+ (WebKit::RemoteLayerTreeDrawingAreaProxy::sizeDidChange):
+ (WebKit::RemoteLayerTreeDrawingAreaProxy::deviceScaleFactorDidChange):
+ (WebKit::RemoteLayerTreeDrawingAreaProxy::scaledExposedRect):
+ (WebKit::RemoteLayerTreeDrawingAreaProxy::sendUpdateGeometry):
+ (WebKit::RemoteLayerTreeDrawingAreaProxy::commitLayerTree):
+ (WebKit::RemoteLayerTreeDrawingAreaProxy::acceleratedAnimationDidStart):
+ (WebKit::RemoteLayerTreeDrawingAreaProxy::acceleratedAnimationDidEnd):
+ (WebKit::RemoteLayerTreeDrawingAreaProxy::indicatorLocation):
+ (WebKit::RemoteLayerTreeDrawingAreaProxy::indicatorScale):
+ (WebKit::RemoteLayerTreeDrawingAreaProxy::updateDebugIndicator):
+ (WebKit::RemoteLayerTreeDrawingAreaProxy::didRefreshDisplay):
+ (WebKit::RemoteLayerTreeDrawingAreaProxy::waitForDidUpdateViewState):
+ (WebKit::RemoteLayerTreeDrawingAreaProxy::dispatchAfterEnsuringDrawing):
+ * UIProcess/mac/TiledCoreAnimationDrawingAreaProxy.h:
+ * UIProcess/mac/TiledCoreAnimationDrawingAreaProxy.mm:
+ (WebKit::TiledCoreAnimationDrawingAreaProxy::TiledCoreAnimationDrawingAreaProxy):
+ (WebKit::TiledCoreAnimationDrawingAreaProxy::deviceScaleFactorDidChange):
+ (WebKit::TiledCoreAnimationDrawingAreaProxy::sizeDidChange):
+ (WebKit::TiledCoreAnimationDrawingAreaProxy::waitForPossibleGeometryUpdate):
+ (WebKit::TiledCoreAnimationDrawingAreaProxy::colorSpaceDidChange):
+ (WebKit::TiledCoreAnimationDrawingAreaProxy::minimumLayoutSizeDidChange):
+ (WebKit::TiledCoreAnimationDrawingAreaProxy::enterAcceleratedCompositingMode):
+ (WebKit::TiledCoreAnimationDrawingAreaProxy::updateAcceleratedCompositingMode):
+ (WebKit::TiledCoreAnimationDrawingAreaProxy::didUpdateGeometry):
+ (WebKit::TiledCoreAnimationDrawingAreaProxy::waitForDidUpdateViewState):
+ (WebKit::TiledCoreAnimationDrawingAreaProxy::intrinsicContentSizeDidChange):
+ (WebKit::TiledCoreAnimationDrawingAreaProxy::sendUpdateGeometry):
+ (WebKit::TiledCoreAnimationDrawingAreaProxy::adjustTransientZoom):
+ (WebKit::TiledCoreAnimationDrawingAreaProxy::commitTransientZoom):
+
</ins><span class="cx"> 2014-09-01 Gyuyoung Kim <gyuyoung.kim@samsung.com>
</span><span class="cx">
</span><span class="cx"> [CMAKE] Build warning by INTERFACE_LINK_LIBRARIES
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPImacWKViewmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/API/mac/WKView.mm (173162 => 173163)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/mac/WKView.mm 2014-09-01 21:15:21 UTC (rev 173162)
+++ trunk/Source/WebKit2/UIProcess/API/mac/WKView.mm 2014-09-01 23:04:12 UTC (rev 173163)
</span><span class="lines">@@ -2794,9 +2794,9 @@
</span><span class="cx"> - (std::unique_ptr<WebKit::DrawingAreaProxy>)_createDrawingAreaProxy
</span><span class="cx"> {
</span><span class="cx"> if ([[[NSUserDefaults standardUserDefaults] objectForKey:@"WebKit2UseRemoteLayerTreeDrawingArea"] boolValue])
</span><del>- return std::make_unique<RemoteLayerTreeDrawingAreaProxy>(_data->_page.get());
</del><ins>+ return std::make_unique<RemoteLayerTreeDrawingAreaProxy>(*_data->_page);
</ins><span class="cx">
</span><del>- return std::make_unique<TiledCoreAnimationDrawingAreaProxy>(_data->_page.get());
</del><ins>+ return std::make_unique<TiledCoreAnimationDrawingAreaProxy>(*_data->_page);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> - (BOOL)_isFocused
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessDrawingAreaProxycpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/DrawingAreaProxy.cpp (173162 => 173163)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/DrawingAreaProxy.cpp 2014-09-01 21:15:21 UTC (rev 173162)
+++ trunk/Source/WebKit2/UIProcess/DrawingAreaProxy.cpp 2014-09-01 23:04:12 UTC (rev 173163)
</span><span class="lines">@@ -35,20 +35,20 @@
</span><span class="cx">
</span><span class="cx"> namespace WebKit {
</span><span class="cx">
</span><del>-DrawingAreaProxy::DrawingAreaProxy(DrawingAreaType type, WebPageProxy* webPageProxy)
</del><ins>+DrawingAreaProxy::DrawingAreaProxy(DrawingAreaType type, WebPageProxy& webPageProxy)
</ins><span class="cx"> : m_type(type)
</span><span class="cx"> , m_webPageProxy(webPageProxy)
</span><del>- , m_size(webPageProxy->viewSize())
</del><ins>+ , m_size(webPageProxy.viewSize())
</ins><span class="cx"> #if PLATFORM(MAC)
</span><span class="cx"> , m_exposedRectChangedTimer(RunLoop::main(), this, &DrawingAreaProxy::exposedRectChangedTimerFired)
</span><span class="cx"> #endif
</span><span class="cx"> {
</span><del>- m_webPageProxy->process().addMessageReceiver(Messages::DrawingAreaProxy::messageReceiverName(), webPageProxy->pageID(), *this);
</del><ins>+ m_webPageProxy.process().addMessageReceiver(Messages::DrawingAreaProxy::messageReceiverName(), m_webPageProxy.pageID(), *this);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> DrawingAreaProxy::~DrawingAreaProxy()
</span><span class="cx"> {
</span><del>- m_webPageProxy->process().removeMessageReceiver(Messages::DrawingAreaProxy::messageReceiverName(), m_webPageProxy->pageID());
</del><ins>+ m_webPageProxy.process().removeMessageReceiver(Messages::DrawingAreaProxy::messageReceiverName(), m_webPageProxy.pageID());
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void DrawingAreaProxy::setSize(const IntSize& size, const IntSize& layerPosition, const IntSize& scrollOffset)
</span><span class="lines">@@ -65,7 +65,7 @@
</span><span class="cx"> #if PLATFORM(MAC)
</span><span class="cx"> void DrawingAreaProxy::setExposedRect(const FloatRect& exposedRect)
</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"> m_exposedRect = exposedRect;
</span><span class="lines">@@ -76,13 +76,13 @@
</span><span class="cx">
</span><span class="cx"> void DrawingAreaProxy::exposedRectChangedTimerFired()
</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_exposedRect == m_lastSentExposedRect)
</span><span class="cx"> return;
</span><span class="cx">
</span><del>- m_webPageProxy->process().send(Messages::DrawingArea::SetExposedRect(m_exposedRect), m_webPageProxy->pageID());
</del><ins>+ m_webPageProxy.process().send(Messages::DrawingArea::SetExposedRect(m_exposedRect), m_webPageProxy.pageID());
</ins><span class="cx"> m_lastSentExposedRect = m_exposedRect;
</span><span class="cx"> }
</span><span class="cx"> #endif // PLATFORM(MAC)
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessDrawingAreaProxyh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/DrawingAreaProxy.h (173162 => 173163)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/DrawingAreaProxy.h 2014-09-01 21:15:21 UTC (rev 173162)
+++ trunk/Source/WebKit2/UIProcess/DrawingAreaProxy.h 2014-09-01 23:04:12 UTC (rev 173163)
</span><span class="lines">@@ -91,10 +91,10 @@
</span><span class="cx"> virtual void hideContentUntilNextUpdate() { ASSERT_NOT_REACHED(); }
</span><span class="cx">
</span><span class="cx"> protected:
</span><del>- explicit DrawingAreaProxy(DrawingAreaType, WebPageProxy*);
</del><ins>+ explicit DrawingAreaProxy(DrawingAreaType, WebPageProxy&);
</ins><span class="cx">
</span><span class="cx"> DrawingAreaType m_type;
</span><del>- WebPageProxy* m_webPageProxy;
</del><ins>+ WebPageProxy& m_webPageProxy;
</ins><span class="cx">
</span><span class="cx"> WebCore::IntSize m_size;
</span><span class="cx"> WebCore::IntSize m_layerPosition;
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessmacRemoteLayerTreeDrawingAreaProxyh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/mac/RemoteLayerTreeDrawingAreaProxy.h (173162 => 173163)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/mac/RemoteLayerTreeDrawingAreaProxy.h 2014-09-01 21:15:21 UTC (rev 173162)
+++ trunk/Source/WebKit2/UIProcess/mac/RemoteLayerTreeDrawingAreaProxy.h 2014-09-01 23:04:12 UTC (rev 173163)
</span><span class="lines">@@ -41,7 +41,7 @@
</span><span class="cx">
</span><span class="cx"> class RemoteLayerTreeDrawingAreaProxy : public DrawingAreaProxy {
</span><span class="cx"> public:
</span><del>- explicit RemoteLayerTreeDrawingAreaProxy(WebPageProxy*);
</del><ins>+ explicit RemoteLayerTreeDrawingAreaProxy(WebPageProxy&);
</ins><span class="cx"> virtual ~RemoteLayerTreeDrawingAreaProxy();
</span><span class="cx">
</span><span class="cx"> const RemoteLayerTreeHost& remoteLayerTreeHost() const { return m_remoteLayerTreeHost; }
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessmacRemoteLayerTreeDrawingAreaProxymm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/mac/RemoteLayerTreeDrawingAreaProxy.mm (173162 => 173163)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/mac/RemoteLayerTreeDrawingAreaProxy.mm 2014-09-01 21:15:21 UTC (rev 173162)
+++ trunk/Source/WebKit2/UIProcess/mac/RemoteLayerTreeDrawingAreaProxy.mm 2014-09-01 23:04:12 UTC (rev 173163)
</span><span class="lines">@@ -98,7 +98,7 @@
</span><span class="cx">
</span><span class="cx"> namespace WebKit {
</span><span class="cx">
</span><del>-RemoteLayerTreeDrawingAreaProxy::RemoteLayerTreeDrawingAreaProxy(WebPageProxy* webPageProxy)
</del><ins>+RemoteLayerTreeDrawingAreaProxy::RemoteLayerTreeDrawingAreaProxy(WebPageProxy& webPageProxy)
</ins><span class="cx"> : DrawingAreaProxy(DrawingAreaTypeRemoteLayerTree, webPageProxy)
</span><span class="cx"> , m_remoteLayerTreeHost(*this)
</span><span class="cx"> , m_isWaitingForDidUpdateGeometry(false)
</span><span class="lines">@@ -115,16 +115,16 @@
</span><span class="cx"> IOSurfacePool::sharedPool().setPoolSize(0);
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>- m_webPageProxy->process().addMessageReceiver(Messages::RemoteLayerTreeDrawingAreaProxy::messageReceiverName(), m_webPageProxy->pageID(), *this);
</del><ins>+ m_webPageProxy.process().addMessageReceiver(Messages::RemoteLayerTreeDrawingAreaProxy::messageReceiverName(), m_webPageProxy.pageID(), *this);
</ins><span class="cx">
</span><del>- if (m_webPageProxy->preferences().tiledScrollingIndicatorVisible())
</del><ins>+ if (m_webPageProxy.preferences().tiledScrollingIndicatorVisible())
</ins><span class="cx"> initializeDebugIndicator();
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> RemoteLayerTreeDrawingAreaProxy::~RemoteLayerTreeDrawingAreaProxy()
</span><span class="cx"> {
</span><span class="cx"> m_callbacks.invalidate(CallbackBase::Error::OwnerWasInvalidated);
</span><del>- m_webPageProxy->process().removeMessageReceiver(Messages::RemoteLayerTreeDrawingAreaProxy::messageReceiverName(), m_webPageProxy->pageID());
</del><ins>+ m_webPageProxy.process().removeMessageReceiver(Messages::RemoteLayerTreeDrawingAreaProxy::messageReceiverName(), m_webPageProxy.pageID());
</ins><span class="cx">
</span><span class="cx"> #if PLATFORM(IOS)
</span><span class="cx"> [m_displayLinkHandler invalidate];
</span><span class="lines">@@ -133,7 +133,7 @@
</span><span class="cx">
</span><span class="cx"> void RemoteLayerTreeDrawingAreaProxy::sizeDidChange()
</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_isWaitingForDidUpdateGeometry)
</span><span class="lines">@@ -144,7 +144,7 @@
</span><span class="cx">
</span><span class="cx"> void RemoteLayerTreeDrawingAreaProxy::deviceScaleFactorDidChange()
</span><span class="cx"> {
</span><del>- m_webPageProxy->process().send(Messages::DrawingArea::SetDeviceScaleFactor(m_webPageProxy->deviceScaleFactor()), m_webPageProxy->pageID());
</del><ins>+ m_webPageProxy.process().send(Messages::DrawingArea::SetDeviceScaleFactor(m_webPageProxy.deviceScaleFactor()), m_webPageProxy.pageID());
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void RemoteLayerTreeDrawingAreaProxy::didUpdateGeometry()
</span><span class="lines">@@ -162,10 +162,10 @@
</span><span class="cx"> FloatRect RemoteLayerTreeDrawingAreaProxy::scaledExposedRect() const
</span><span class="cx"> {
</span><span class="cx"> #if PLATFORM(IOS)
</span><del>- return m_webPageProxy->exposedContentRect();
</del><ins>+ return m_webPageProxy.exposedContentRect();
</ins><span class="cx"> #else
</span><span class="cx"> FloatRect scaledExposedRect = exposedRect();
</span><del>- float scale = 1 / m_webPageProxy->pageScaleFactor();
</del><ins>+ float scale = 1 / m_webPageProxy.pageScaleFactor();
</ins><span class="cx"> scaledExposedRect.scale(scale, scale);
</span><span class="cx"> return scaledExposedRect;
</span><span class="cx"> #endif
</span><span class="lines">@@ -175,7 +175,7 @@
</span><span class="cx"> {
</span><span class="cx"> m_lastSentSize = m_size;
</span><span class="cx"> m_lastSentLayerPosition = m_layerPosition;
</span><del>- m_webPageProxy->process().send(Messages::DrawingArea::UpdateGeometry(m_size, m_layerPosition), m_webPageProxy->pageID());
</del><ins>+ m_webPageProxy.process().send(Messages::DrawingArea::UpdateGeometry(m_size, m_layerPosition), m_webPageProxy.pageID());
</ins><span class="cx"> m_isWaitingForDidUpdateGeometry = true;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -198,28 +198,28 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if (m_remoteLayerTreeHost.updateLayerTree(layerTreeTransaction))
</span><del>- m_webPageProxy->setAcceleratedCompositingRootLayer(m_remoteLayerTreeHost.rootLayer());
</del><ins>+ m_webPageProxy.setAcceleratedCompositingRootLayer(m_remoteLayerTreeHost.rootLayer());
</ins><span class="cx">
</span><span class="cx"> #if ENABLE(ASYNC_SCROLLING)
</span><span class="cx"> RemoteScrollingCoordinatorProxy::RequestedScrollInfo requestedScrollInfo;
</span><del>- m_webPageProxy->scrollingCoordinatorProxy()->updateScrollingTree(scrollingTreeTransaction, requestedScrollInfo);
</del><ins>+ m_webPageProxy.scrollingCoordinatorProxy()->updateScrollingTree(scrollingTreeTransaction, requestedScrollInfo);
</ins><span class="cx"> #endif
</span><span class="cx">
</span><del>- m_webPageProxy->didCommitLayerTree(layerTreeTransaction);
</del><ins>+ m_webPageProxy.didCommitLayerTree(layerTreeTransaction);
</ins><span class="cx">
</span><span class="cx"> #if ENABLE(ASYNC_SCROLLING)
</span><span class="cx"> #if PLATFORM(IOS)
</span><del>- if (m_webPageProxy->scrollingCoordinatorProxy()->hasFixedOrSticky()) {
</del><ins>+ if (m_webPageProxy.scrollingCoordinatorProxy()->hasFixedOrSticky()) {
</ins><span class="cx"> // If we got a new layer for a fixed or sticky node, its position from the WebProcess is probably stale. We need to re-run the "viewport" changed logic to udpate it with our UI-side state.
</span><del>- FloatRect customFixedPositionRect = m_webPageProxy->computeCustomFixedPositionRect(m_webPageProxy->unobscuredContentRect(), m_webPageProxy->displayedContentScale());
- m_webPageProxy->scrollingCoordinatorProxy()->viewportChangedViaDelegatedScrolling(m_webPageProxy->scrollingCoordinatorProxy()->rootScrollingNodeID(), customFixedPositionRect, m_webPageProxy->displayedContentScale());
</del><ins>+ FloatRect customFixedPositionRect = m_webPageProxy.computeCustomFixedPositionRect(m_webPageProxy.unobscuredContentRect(), m_webPageProxy.displayedContentScale());
+ m_webPageProxy.scrollingCoordinatorProxy()->viewportChangedViaDelegatedScrolling(m_webPageProxy.scrollingCoordinatorProxy()->rootScrollingNodeID(), customFixedPositionRect, m_webPageProxy.displayedContentScale());
</ins><span class="cx"> }
</span><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> // Handle requested scroll position updates from the scrolling tree transaction after didCommitLayerTree()
</span><span class="cx"> // has updated the view size based on the content size.
</span><span class="cx"> if (requestedScrollInfo.requestsScrollPositionUpdate)
</span><del>- m_webPageProxy->requestScroll(requestedScrollInfo.requestedScrollPosition, requestedScrollInfo.requestIsProgrammaticScroll);
</del><ins>+ m_webPageProxy.requestScroll(requestedScrollInfo.requestedScrollPosition, requestedScrollInfo.requestIsProgrammaticScroll);
</ins><span class="cx"> #endif // ENABLE(ASYNC_SCROLLING)
</span><span class="cx">
</span><span class="cx"> if (m_debugIndicatorLayerTreeHost) {
</span><span class="lines">@@ -238,12 +238,12 @@
</span><span class="cx">
</span><span class="cx"> void RemoteLayerTreeDrawingAreaProxy::acceleratedAnimationDidStart(uint64_t layerID, const String& key, double startTime)
</span><span class="cx"> {
</span><del>- m_webPageProxy->process().send(Messages::DrawingArea::AcceleratedAnimationDidStart(layerID, key, startTime), m_webPageProxy->pageID());
</del><ins>+ m_webPageProxy.process().send(Messages::DrawingArea::AcceleratedAnimationDidStart(layerID, key, startTime), m_webPageProxy.pageID());
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void RemoteLayerTreeDrawingAreaProxy::acceleratedAnimationDidEnd(uint64_t layerID, const String& key)
</span><span class="cx"> {
</span><del>- m_webPageProxy->process().send(Messages::DrawingArea::AcceleratedAnimationDidEnd(layerID, key), m_webPageProxy->pageID());
</del><ins>+ m_webPageProxy.process().send(Messages::DrawingArea::AcceleratedAnimationDidEnd(layerID, key), m_webPageProxy.pageID());
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> static const float indicatorInset = 10;
</span><span class="lines">@@ -258,15 +258,15 @@
</span><span class="cx">
</span><span class="cx"> FloatPoint RemoteLayerTreeDrawingAreaProxy::indicatorLocation() const
</span><span class="cx"> {
</span><del>- if (m_webPageProxy->delegatesScrolling()) {
</del><ins>+ if (m_webPageProxy.delegatesScrolling()) {
</ins><span class="cx"> #if PLATFORM(IOS)
</span><del>- FloatPoint tiledMapLocation = m_webPageProxy->unobscuredContentRect().location();
- float absoluteInset = indicatorInset / m_webPageProxy->displayedContentScale();
</del><ins>+ FloatPoint tiledMapLocation = m_webPageProxy.unobscuredContentRect().location();
+ float absoluteInset = indicatorInset / m_webPageProxy.displayedContentScale();
</ins><span class="cx"> tiledMapLocation += FloatSize(absoluteInset, absoluteInset);
</span><span class="cx"> #else
</span><span class="cx"> FloatPoint tiledMapLocation = exposedRect().location();
</span><span class="cx"> tiledMapLocation += FloatSize(indicatorInset, indicatorInset);
</span><del>- float scale = 1 / m_webPageProxy->pageScaleFactor();;
</del><ins>+ float scale = 1 / m_webPageProxy.pageScaleFactor();;
</ins><span class="cx"> tiledMapLocation.scale(scale, scale);
</span><span class="cx"> #endif
</span><span class="cx"> return tiledMapLocation;
</span><span class="lines">@@ -286,7 +286,7 @@
</span><span class="cx"> float RemoteLayerTreeDrawingAreaProxy::indicatorScale(IntSize contentsSize) const
</span><span class="cx"> {
</span><span class="cx"> // Pick a good scale.
</span><del>- IntSize viewSize = m_webPageProxy->viewSize();
</del><ins>+ IntSize viewSize = m_webPageProxy.viewSize();
</ins><span class="cx">
</span><span class="cx"> float scale = 1;
</span><span class="cx"> if (!contentsSize.isEmpty()) {
</span><span class="lines">@@ -311,7 +311,7 @@
</span><span class="cx"> [rootLayer addSublayer:m_tileMapHostLayer.get()];
</span><span class="cx">
</span><span class="cx"> // Pick a good scale.
</span><del>- IntSize viewSize = m_webPageProxy->viewSize();
</del><ins>+ IntSize viewSize = m_webPageProxy.viewSize();
</ins><span class="cx">
</span><span class="cx"> [m_tileMapHostLayer setBounds:FloatRect(FloatPoint(), contentsSize)];
</span><span class="cx"> [m_tileMapHostLayer setPosition:indicatorLocation()];
</span><span class="lines">@@ -328,7 +328,7 @@
</span><span class="cx">
</span><span class="cx"> [m_exposedRectIndicatorLayer setBorderWidth:counterScaledBorder];
</span><span class="cx">
</span><del>- if (m_webPageProxy->delegatesScrolling()) {
</del><ins>+ if (m_webPageProxy.delegatesScrolling()) {
</ins><span class="cx"> FloatRect scaledExposedRect = this->scaledExposedRect();
</span><span class="cx"> [m_exposedRectIndicatorLayer setPosition:scaledExposedRect.location()];
</span><span class="cx"> [m_exposedRectIndicatorLayer setBounds:FloatRect(FloatPoint(), scaledExposedRect.size())];
</span><span class="lines">@@ -375,17 +375,17 @@
</span><span class="cx">
</span><span class="cx"> void RemoteLayerTreeDrawingAreaProxy::didRefreshDisplay(double)
</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"> // Waiting for CA to commit is insufficient, because the render server can still be
</span><span class="cx"> // using our backing store. We can improve this by waiting for the render server to commit
</span><span class="cx"> // if we find API to do so, but for now we will make extra buffers if need be.
</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"> m_lastVisibleTransactionID = m_transactionIDForPendingCACommit;
</span><span class="cx">
</span><del>- m_webPageProxy->didUpdateViewState();
</del><ins>+ m_webPageProxy.didUpdateViewState();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void RemoteLayerTreeDrawingAreaProxy::waitForDidUpdateViewState()
</span><span class="lines">@@ -395,17 +395,17 @@
</span><span class="cx"> #else
</span><span class="cx"> auto viewStateUpdateTimeout = std::chrono::milliseconds(250);
</span><span class="cx"> #endif
</span><del>- m_webPageProxy->process().connection()->waitForAndDispatchImmediately<Messages::RemoteLayerTreeDrawingAreaProxy::CommitLayerTree>(m_webPageProxy->pageID(), viewStateUpdateTimeout, InterruptWaitingIfSyncMessageArrives);
</del><ins>+ m_webPageProxy.process().connection()->waitForAndDispatchImmediately<Messages::RemoteLayerTreeDrawingAreaProxy::CommitLayerTree>(m_webPageProxy.pageID(), viewStateUpdateTimeout, InterruptWaitingIfSyncMessageArrives);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void RemoteLayerTreeDrawingAreaProxy::dispatchAfterEnsuringDrawing(std::function<void (CallbackBase::Error)> callbackFunction)
</span><span class="cx"> {
</span><del>- if (!m_webPageProxy->isValid()) {
</del><ins>+ if (!m_webPageProxy.isValid()) {
</ins><span class="cx"> callbackFunction(CallbackBase::Error::OwnerWasInvalidated);
</span><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- m_webPageProxy->process().send(Messages::DrawingArea::AddTransactionCallbackID(m_callbacks.put(WTF::move(callbackFunction), nullptr)), m_webPageProxy->pageID());
</del><ins>+ m_webPageProxy.process().send(Messages::DrawingArea::AddTransactionCallbackID(m_callbacks.put(WTF::move(callbackFunction), nullptr)), m_webPageProxy.pageID());
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void RemoteLayerTreeDrawingAreaProxy::hideContentUntilNextUpdate()
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessmacTiledCoreAnimationDrawingAreaProxyh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/mac/TiledCoreAnimationDrawingAreaProxy.h (173162 => 173163)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/mac/TiledCoreAnimationDrawingAreaProxy.h 2014-09-01 21:15:21 UTC (rev 173162)
+++ trunk/Source/WebKit2/UIProcess/mac/TiledCoreAnimationDrawingAreaProxy.h 2014-09-01 23:04:12 UTC (rev 173163)
</span><span class="lines">@@ -34,7 +34,7 @@
</span><span class="cx">
</span><span class="cx"> class TiledCoreAnimationDrawingAreaProxy : public DrawingAreaProxy {
</span><span class="cx"> public:
</span><del>- explicit TiledCoreAnimationDrawingAreaProxy(WebPageProxy*);
</del><ins>+ explicit TiledCoreAnimationDrawingAreaProxy(WebPageProxy&);
</ins><span class="cx"> virtual ~TiledCoreAnimationDrawingAreaProxy();
</span><span class="cx">
</span><span class="cx"> private:
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessmacTiledCoreAnimationDrawingAreaProxymm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/mac/TiledCoreAnimationDrawingAreaProxy.mm (173162 => 173163)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/mac/TiledCoreAnimationDrawingAreaProxy.mm 2014-09-01 21:15:21 UTC (rev 173162)
+++ trunk/Source/WebKit2/UIProcess/mac/TiledCoreAnimationDrawingAreaProxy.mm 2014-09-01 23:04:12 UTC (rev 173163)
</span><span class="lines">@@ -40,7 +40,7 @@
</span><span class="cx">
</span><span class="cx"> namespace WebKit {
</span><span class="cx">
</span><del>-TiledCoreAnimationDrawingAreaProxy::TiledCoreAnimationDrawingAreaProxy(WebPageProxy* webPageProxy)
</del><ins>+TiledCoreAnimationDrawingAreaProxy::TiledCoreAnimationDrawingAreaProxy(WebPageProxy& webPageProxy)
</ins><span class="cx"> : DrawingAreaProxy(DrawingAreaTypeTiledCoreAnimation, webPageProxy)
</span><span class="cx"> , m_isWaitingForDidUpdateGeometry(false)
</span><span class="cx"> {
</span><span class="lines">@@ -52,12 +52,12 @@
</span><span class="cx">
</span><span class="cx"> void TiledCoreAnimationDrawingAreaProxy::deviceScaleFactorDidChange()
</span><span class="cx"> {
</span><del>- m_webPageProxy->process().send(Messages::DrawingArea::SetDeviceScaleFactor(m_webPageProxy->deviceScaleFactor()), m_webPageProxy->pageID());
</del><ins>+ m_webPageProxy.process().send(Messages::DrawingArea::SetDeviceScaleFactor(m_webPageProxy.deviceScaleFactor()), m_webPageProxy.pageID());
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void TiledCoreAnimationDrawingAreaProxy::sizeDidChange()
</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"> // We only want one UpdateGeometry message in flight at once, so if we've already sent one but
</span><span class="lines">@@ -73,20 +73,20 @@
</span><span class="cx"> if (!m_isWaitingForDidUpdateGeometry)
</span><span class="cx"> return;
</span><span class="cx">
</span><del>- if (m_webPageProxy->process().state() != WebProcessProxy::State::Running)
</del><ins>+ if (m_webPageProxy.process().state() != WebProcessProxy::State::Running)
</ins><span class="cx"> return;
</span><span class="cx">
</span><del>- m_webPageProxy->process().connection()->waitForAndDispatchImmediately<Messages::DrawingAreaProxy::DidUpdateGeometry>(m_webPageProxy->pageID(), timeout);
</del><ins>+ m_webPageProxy.process().connection()->waitForAndDispatchImmediately<Messages::DrawingAreaProxy::DidUpdateGeometry>(m_webPageProxy.pageID(), timeout);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void TiledCoreAnimationDrawingAreaProxy::colorSpaceDidChange()
</span><span class="cx"> {
</span><del>- m_webPageProxy->process().send(Messages::DrawingArea::SetColorSpace(m_webPageProxy->colorSpace()), m_webPageProxy->pageID());
</del><ins>+ m_webPageProxy.process().send(Messages::DrawingArea::SetColorSpace(m_webPageProxy.colorSpace()), m_webPageProxy.pageID());
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void TiledCoreAnimationDrawingAreaProxy::minimumLayoutSizeDidChange()
</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"> // We only want one UpdateGeometry message in flight at once, so if we've already sent one but
</span><span class="lines">@@ -99,7 +99,7 @@
</span><span class="cx">
</span><span class="cx"> void TiledCoreAnimationDrawingAreaProxy::enterAcceleratedCompositingMode(uint64_t backingStoreStateID, const LayerTreeContext& layerTreeContext)
</span><span class="cx"> {
</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 TiledCoreAnimationDrawingAreaProxy::exitAcceleratedCompositingMode(uint64_t backingStoreStateID, const UpdateInfo&)
</span><span class="lines">@@ -110,7 +110,7 @@
</span><span class="cx">
</span><span class="cx"> void TiledCoreAnimationDrawingAreaProxy::updateAcceleratedCompositingMode(uint64_t backingStoreStateID, const LayerTreeContext& layerTreeContext)
</span><span class="cx"> {
</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 TiledCoreAnimationDrawingAreaProxy::didUpdateGeometry()
</span><span class="lines">@@ -119,7 +119,7 @@
</span><span class="cx">
</span><span class="cx"> m_isWaitingForDidUpdateGeometry = false;
</span><span class="cx">
</span><del>- IntSize minimumLayoutSize = m_webPageProxy->minimumLayoutSize();
</del><ins>+ IntSize minimumLayoutSize = m_webPageProxy.minimumLayoutSize();
</ins><span class="cx">
</span><span class="cx"> // If the WKView was resized while we were waiting for a DidUpdateGeometry reply from the web process,
</span><span class="cx"> // we need to resend the new size here.
</span><span class="lines">@@ -130,34 +130,34 @@
</span><span class="cx"> void TiledCoreAnimationDrawingAreaProxy::waitForDidUpdateViewState()
</span><span class="cx"> {
</span><span class="cx"> auto viewStateUpdateTimeout = std::chrono::milliseconds(250);
</span><del>- m_webPageProxy->process().connection()->waitForAndDispatchImmediately<Messages::WebPageProxy::DidUpdateViewState>(m_webPageProxy->pageID(), viewStateUpdateTimeout, InterruptWaitingIfSyncMessageArrives);
</del><ins>+ m_webPageProxy.process().connection()->waitForAndDispatchImmediately<Messages::WebPageProxy::DidUpdateViewState>(m_webPageProxy.pageID(), viewStateUpdateTimeout, InterruptWaitingIfSyncMessageArrives);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void TiledCoreAnimationDrawingAreaProxy::intrinsicContentSizeDidChange(const IntSize& newIntrinsicContentSize)
</span><span class="cx"> {
</span><del>- if (m_webPageProxy->minimumLayoutSize().width() > 0)
- m_webPageProxy->intrinsicContentSizeDidChange(newIntrinsicContentSize);
</del><ins>+ if (m_webPageProxy.minimumLayoutSize().width() > 0)
+ m_webPageProxy.intrinsicContentSizeDidChange(newIntrinsicContentSize);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void TiledCoreAnimationDrawingAreaProxy::sendUpdateGeometry()
</span><span class="cx"> {
</span><span class="cx"> ASSERT(!m_isWaitingForDidUpdateGeometry);
</span><span class="cx">
</span><del>- m_lastSentMinimumLayoutSize = m_webPageProxy->minimumLayoutSize();
</del><ins>+ m_lastSentMinimumLayoutSize = m_webPageProxy.minimumLayoutSize();
</ins><span class="cx"> m_lastSentSize = m_size;
</span><span class="cx"> m_lastSentLayerPosition = m_layerPosition;
</span><del>- m_webPageProxy->process().send(Messages::DrawingArea::UpdateGeometry(m_size, m_layerPosition), m_webPageProxy->pageID());
</del><ins>+ m_webPageProxy.process().send(Messages::DrawingArea::UpdateGeometry(m_size, m_layerPosition), m_webPageProxy.pageID());
</ins><span class="cx"> m_isWaitingForDidUpdateGeometry = true;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void TiledCoreAnimationDrawingAreaProxy::adjustTransientZoom(double scale, FloatPoint origin)
</span><span class="cx"> {
</span><del>- m_webPageProxy->process().send(Messages::DrawingArea::AdjustTransientZoom(scale, origin), m_webPageProxy->pageID());
</del><ins>+ m_webPageProxy.process().send(Messages::DrawingArea::AdjustTransientZoom(scale, origin), m_webPageProxy.pageID());
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void TiledCoreAnimationDrawingAreaProxy::commitTransientZoom(double scale, FloatPoint origin)
</span><span class="cx"> {
</span><del>- m_webPageProxy->process().send(Messages::DrawingArea::CommitTransientZoom(scale, origin), m_webPageProxy->pageID());
</del><ins>+ m_webPageProxy.process().send(Messages::DrawingArea::CommitTransientZoom(scale, origin), m_webPageProxy.pageID());
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> } // namespace WebKit
</span></span></pre>
</div>
</div>
</body>
</html>