<!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>[159889] 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/159889">159889</a></dd>
<dt>Author</dt> <dd>weinig@apple.com</dd>
<dt>Date</dt> <dd>2013-11-30 11:14:13 -0800 (Sat, 30 Nov 2013)</dd>
</dl>
<h3>Log Message</h3>
<pre>[CTTE] WebPageProxy should store the PageClient as a reference
https://bugs.webkit.org/show_bug.cgi?id=125030
Reviewed by Dan Bernstein.
* UIProcess/API/gtk/WebKitWebViewBase.cpp:
(webkitWebViewBaseCreateWebPage):
* UIProcess/API/ios/WKContentView.mm:
(-[WKContentView _commonInitializationWithContextRef:pageGroupRef:relatedToPage:]):
* UIProcess/API/mac/WKView.mm:
(-[WKView initWithFrame:contextRef:pageGroupRef:relatedToPage:]):
* UIProcess/CoordinatedGraphics/WebPageProxyCoordinatedGraphics.cpp:
(WebKit::WebPageProxy::didFindZoomableArea):
* UIProcess/CoordinatedGraphics/WebView.cpp:
(WebKit::WebView::WebView):
* UIProcess/WebContext.cpp:
(WebKit::WebContext::createWebPage):
* UIProcess/WebContext.h:
* UIProcess/WebPageProxy.cpp:
(WebKit::WebPageProxy::create):
(WebKit::WebPageProxy::WebPageProxy):
(WebKit::WebPageProxy::reattachToWebProcess):
(WebKit::WebPageProxy::initializeWebPage):
(WebKit::WebPageProxy::close):
(WebKit::WebPageProxy::setViewNeedsDisplay):
(WebKit::WebPageProxy::displayView):
(WebKit::WebPageProxy::canScrollView):
(WebKit::WebPageProxy::scrollView):
(WebKit::WebPageProxy::updateViewState):
(WebKit::WebPageProxy::viewStateDidChange):
(WebKit::WebPageProxy::viewSize):
(WebKit::WebPageProxy::startDrag):
(WebKit::WebPageProxy::handleTouchEvent):
(WebKit::WebPageProxy::preferencesDidChange):
(WebKit::WebPageProxy::didCommitLoadForFrame):
(WebKit::WebPageProxy::closePage):
(WebKit::WebPageProxy::setWindowFrame):
(WebKit::WebPageProxy::getWindowFrame):
(WebKit::WebPageProxy::screenToWindow):
(WebKit::WebPageProxy::windowToScreen):
(WebKit::WebPageProxy::pageDidRequestScroll):
(WebKit::WebPageProxy::pageTransitionViewportReady):
(WebKit::WebPageProxy::didRenderFrame):
(WebKit::WebPageProxy::didChangeViewportProperties):
(WebKit::WebPageProxy::handleDownloadRequest):
(WebKit::WebPageProxy::didChangeContentSize):
(WebKit::WebPageProxy::showColorPicker):
(WebKit::WebPageProxy::editorStateChanged):
(WebKit::WebPageProxy::canUndoRedo):
(WebKit::WebPageProxy::executeUndoRedo):
(WebKit::WebPageProxy::clearAllEditCommands):
(WebKit::WebPageProxy::setFindIndicator):
(WebKit::WebPageProxy::showPopupMenu):
(WebKit::WebPageProxy::internalShowContextMenu):
(WebKit::WebPageProxy::registerEditCommand):
(WebKit::WebPageProxy::setToolTip):
(WebKit::WebPageProxy::setCursor):
(WebKit::WebPageProxy::setCursorHiddenUntilMouseMoves):
(WebKit::WebPageProxy::didReceiveEvent):
(WebKit::WebPageProxy::processDidCrash):
(WebKit::WebPageProxy::resetStateAfterProcessExited):
(WebKit::WebPageProxy::initializeCreationParameters):
(WebKit::WebPageProxy::enterAcceleratedCompositingMode):
(WebKit::WebPageProxy::exitAcceleratedCompositingMode):
(WebKit::WebPageProxy::updateAcceleratedCompositingMode):
(WebKit::WebPageProxy::requestGeolocationPermissionForFrame):
(WebKit::WebPageProxy::recommendedScrollbarStyleDidChange):
(WebKit::WebPageProxy::updateBackingStoreDiscardableState):
(WebKit::WebPageProxy::showCorrectionPanel):
(WebKit::WebPageProxy::dismissCorrectionPanel):
(WebKit::WebPageProxy::dismissCorrectionPanelSoon):
(WebKit::WebPageProxy::recordAutocorrectionResponse):
(WebKit::WebPageProxy::showDictationAlternativeUI):
(WebKit::WebPageProxy::removeDictationAlternatives):
(WebKit::WebPageProxy::dictationAlternatives):
* UIProcess/WebPageProxy.h:
* UIProcess/WebProcessProxy.cpp:
(WebKit::WebProcessProxy::createWebPage):
* UIProcess/WebProcessProxy.h:
* UIProcess/gtk/WebPageProxyGtk.cpp:
(WebKit::WebPageProxy::getEditorCommandsForKeyEvent):
* UIProcess/ios/WebPageProxyIOS.mm:
(WebKit::WebPageProxy::interpretKeyEvent):
(WebKit::WebPageProxy::mainDocumentDidReceiveMobileDocType):
(WebKit::WebPageProxy::didGetTapHighlightGeometries):
(WebKit::WebPageProxy::didChangeViewportArguments):
(WebKit::WebPageProxy::startAssistingNode):
(WebKit::WebPageProxy::stopAssistingNode):
(WebKit::WebPageProxy::setAcceleratedCompositingRootLayer):
* UIProcess/mac/WebPageProxyMac.mm:
(WebKit::WebPageProxy::windowAndViewFramesChanged):
(WebKit::WebPageProxy::insertDictatedText):
(WebKit::WebPageProxy::setDragImage):
(WebKit::WebPageProxy::setPromisedData):
(WebKit::WebPageProxy::interpretQueuedKeyEvent):
(WebKit::WebPageProxy::didPerformDictionaryLookup):
(WebKit::WebPageProxy::registerWebProcessAccessibilityToken):
(WebKit::WebPageProxy::makeFirstResponder):
(WebKit::WebPageProxy::colorSpace):
(WebKit::WebPageProxy::pluginFocusOrWindowFocusChanged):
(WebKit::WebPageProxy::setPluginComplexTextInputState):
(WebKit::WebPageProxy::executeSavedCommandBySelector):
(WebKit::WebPageProxy::wkView):
(WebKit::WebPageProxy::intrinsicContentSizeDidChange):
(WebKit::WebPageProxy::setAcceleratedCompositingRootLayer):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeLog</a></li>
<li><a href="#trunkSourceWebKit2UIProcessAPIgtkWebKitWebViewBasecpp">trunk/Source/WebKit2/UIProcess/API/gtk/WebKitWebViewBase.cpp</a></li>
<li><a href="#trunkSourceWebKit2UIProcessAPIiosWKContentViewmm">trunk/Source/WebKit2/UIProcess/API/ios/WKContentView.mm</a></li>
<li><a href="#trunkSourceWebKit2UIProcessAPImacWKViewmm">trunk/Source/WebKit2/UIProcess/API/mac/WKView.mm</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="#trunkSourceWebKit2UIProcessWebContextcpp">trunk/Source/WebKit2/UIProcess/WebContext.cpp</a></li>
<li><a href="#trunkSourceWebKit2UIProcessWebContexth">trunk/Source/WebKit2/UIProcess/WebContext.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="#trunkSourceWebKit2UIProcessWebProcessProxycpp">trunk/Source/WebKit2/UIProcess/WebProcessProxy.cpp</a></li>
<li><a href="#trunkSourceWebKit2UIProcessWebProcessProxyh">trunk/Source/WebKit2/UIProcess/WebProcessProxy.h</a></li>
<li><a href="#trunkSourceWebKit2UIProcessgtkWebPageProxyGtkcpp">trunk/Source/WebKit2/UIProcess/gtk/WebPageProxyGtk.cpp</a></li>
<li><a href="#trunkSourceWebKit2UIProcessiosWebPageProxyIOSmm">trunk/Source/WebKit2/UIProcess/ios/WebPageProxyIOS.mm</a></li>
<li><a href="#trunkSourceWebKit2UIProcessmacWebPageProxyMacmm">trunk/Source/WebKit2/UIProcess/mac/WebPageProxyMac.mm</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (159888 => 159889)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2013-11-30 18:55:27 UTC (rev 159888)
+++ trunk/Source/WebKit2/ChangeLog 2013-11-30 19:14:13 UTC (rev 159889)
</span><span class="lines">@@ -1,5 +1,113 @@
</span><span class="cx"> 2013-11-30 Sam Weinig <sam@webkit.org>
</span><span class="cx">
</span><ins>+ [CTTE] WebPageProxy should store the PageClient as a reference
+ https://bugs.webkit.org/show_bug.cgi?id=125030
+
+ Reviewed by Dan Bernstein.
+
+ * UIProcess/API/gtk/WebKitWebViewBase.cpp:
+ (webkitWebViewBaseCreateWebPage):
+ * UIProcess/API/ios/WKContentView.mm:
+ (-[WKContentView _commonInitializationWithContextRef:pageGroupRef:relatedToPage:]):
+ * UIProcess/API/mac/WKView.mm:
+ (-[WKView initWithFrame:contextRef:pageGroupRef:relatedToPage:]):
+ * UIProcess/CoordinatedGraphics/WebPageProxyCoordinatedGraphics.cpp:
+ (WebKit::WebPageProxy::didFindZoomableArea):
+ * UIProcess/CoordinatedGraphics/WebView.cpp:
+ (WebKit::WebView::WebView):
+ * UIProcess/WebContext.cpp:
+ (WebKit::WebContext::createWebPage):
+ * UIProcess/WebContext.h:
+ * UIProcess/WebPageProxy.cpp:
+ (WebKit::WebPageProxy::create):
+ (WebKit::WebPageProxy::WebPageProxy):
+ (WebKit::WebPageProxy::reattachToWebProcess):
+ (WebKit::WebPageProxy::initializeWebPage):
+ (WebKit::WebPageProxy::close):
+ (WebKit::WebPageProxy::setViewNeedsDisplay):
+ (WebKit::WebPageProxy::displayView):
+ (WebKit::WebPageProxy::canScrollView):
+ (WebKit::WebPageProxy::scrollView):
+ (WebKit::WebPageProxy::updateViewState):
+ (WebKit::WebPageProxy::viewStateDidChange):
+ (WebKit::WebPageProxy::viewSize):
+ (WebKit::WebPageProxy::startDrag):
+ (WebKit::WebPageProxy::handleTouchEvent):
+ (WebKit::WebPageProxy::preferencesDidChange):
+ (WebKit::WebPageProxy::didCommitLoadForFrame):
+ (WebKit::WebPageProxy::closePage):
+ (WebKit::WebPageProxy::setWindowFrame):
+ (WebKit::WebPageProxy::getWindowFrame):
+ (WebKit::WebPageProxy::screenToWindow):
+ (WebKit::WebPageProxy::windowToScreen):
+ (WebKit::WebPageProxy::pageDidRequestScroll):
+ (WebKit::WebPageProxy::pageTransitionViewportReady):
+ (WebKit::WebPageProxy::didRenderFrame):
+ (WebKit::WebPageProxy::didChangeViewportProperties):
+ (WebKit::WebPageProxy::handleDownloadRequest):
+ (WebKit::WebPageProxy::didChangeContentSize):
+ (WebKit::WebPageProxy::showColorPicker):
+ (WebKit::WebPageProxy::editorStateChanged):
+ (WebKit::WebPageProxy::canUndoRedo):
+ (WebKit::WebPageProxy::executeUndoRedo):
+ (WebKit::WebPageProxy::clearAllEditCommands):
+ (WebKit::WebPageProxy::setFindIndicator):
+ (WebKit::WebPageProxy::showPopupMenu):
+ (WebKit::WebPageProxy::internalShowContextMenu):
+ (WebKit::WebPageProxy::registerEditCommand):
+ (WebKit::WebPageProxy::setToolTip):
+ (WebKit::WebPageProxy::setCursor):
+ (WebKit::WebPageProxy::setCursorHiddenUntilMouseMoves):
+ (WebKit::WebPageProxy::didReceiveEvent):
+ (WebKit::WebPageProxy::processDidCrash):
+ (WebKit::WebPageProxy::resetStateAfterProcessExited):
+ (WebKit::WebPageProxy::initializeCreationParameters):
+ (WebKit::WebPageProxy::enterAcceleratedCompositingMode):
+ (WebKit::WebPageProxy::exitAcceleratedCompositingMode):
+ (WebKit::WebPageProxy::updateAcceleratedCompositingMode):
+ (WebKit::WebPageProxy::requestGeolocationPermissionForFrame):
+ (WebKit::WebPageProxy::recommendedScrollbarStyleDidChange):
+ (WebKit::WebPageProxy::updateBackingStoreDiscardableState):
+ (WebKit::WebPageProxy::showCorrectionPanel):
+ (WebKit::WebPageProxy::dismissCorrectionPanel):
+ (WebKit::WebPageProxy::dismissCorrectionPanelSoon):
+ (WebKit::WebPageProxy::recordAutocorrectionResponse):
+ (WebKit::WebPageProxy::showDictationAlternativeUI):
+ (WebKit::WebPageProxy::removeDictationAlternatives):
+ (WebKit::WebPageProxy::dictationAlternatives):
+ * UIProcess/WebPageProxy.h:
+ * UIProcess/WebProcessProxy.cpp:
+ (WebKit::WebProcessProxy::createWebPage):
+ * UIProcess/WebProcessProxy.h:
+ * UIProcess/gtk/WebPageProxyGtk.cpp:
+ (WebKit::WebPageProxy::getEditorCommandsForKeyEvent):
+ * UIProcess/ios/WebPageProxyIOS.mm:
+ (WebKit::WebPageProxy::interpretKeyEvent):
+ (WebKit::WebPageProxy::mainDocumentDidReceiveMobileDocType):
+ (WebKit::WebPageProxy::didGetTapHighlightGeometries):
+ (WebKit::WebPageProxy::didChangeViewportArguments):
+ (WebKit::WebPageProxy::startAssistingNode):
+ (WebKit::WebPageProxy::stopAssistingNode):
+ (WebKit::WebPageProxy::setAcceleratedCompositingRootLayer):
+ * UIProcess/mac/WebPageProxyMac.mm:
+ (WebKit::WebPageProxy::windowAndViewFramesChanged):
+ (WebKit::WebPageProxy::insertDictatedText):
+ (WebKit::WebPageProxy::setDragImage):
+ (WebKit::WebPageProxy::setPromisedData):
+ (WebKit::WebPageProxy::interpretQueuedKeyEvent):
+ (WebKit::WebPageProxy::didPerformDictionaryLookup):
+ (WebKit::WebPageProxy::registerWebProcessAccessibilityToken):
+ (WebKit::WebPageProxy::makeFirstResponder):
+ (WebKit::WebPageProxy::colorSpace):
+ (WebKit::WebPageProxy::pluginFocusOrWindowFocusChanged):
+ (WebKit::WebPageProxy::setPluginComplexTextInputState):
+ (WebKit::WebPageProxy::executeSavedCommandBySelector):
+ (WebKit::WebPageProxy::wkView):
+ (WebKit::WebPageProxy::intrinsicContentSizeDidChange):
+ (WebKit::WebPageProxy::setAcceleratedCompositingRootLayer):
+
+2013-11-30 Sam Weinig <sam@webkit.org>
+
</ins><span class="cx"> [RTTE] The PermissionRequestManagerProxies should use WebPageProxy references.
</span><span class="cx"> https://bugs.webkit.org/show_bug.cgi?id=125029
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPIgtkWebKitWebViewBasecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/API/gtk/WebKitWebViewBase.cpp (159888 => 159889)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/gtk/WebKitWebViewBase.cpp 2013-11-30 18:55:27 UTC (rev 159888)
+++ trunk/Source/WebKit2/UIProcess/API/gtk/WebKitWebViewBase.cpp 2013-11-30 19:14:13 UTC (rev 159889)
</span><span class="lines">@@ -931,7 +931,7 @@
</span><span class="cx"> {
</span><span class="cx"> WebKitWebViewBasePrivate* priv = webkitWebViewBase->priv;
</span><span class="cx">
</span><del>- priv->pageProxy = context->createWebPage(priv->pageClient.get(), pageGroup);
</del><ins>+ priv->pageProxy = context->createWebPage(*priv->pageClient, pageGroup);
</ins><span class="cx"> priv->pageProxy->initializeWebPage();
</span><span class="cx">
</span><span class="cx"> #if ENABLE(FULLSCREEN_API)
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPIiosWKContentViewmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/API/ios/WKContentView.mm (159888 => 159889)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/ios/WKContentView.mm 2013-11-30 18:55:27 UTC (rev 159888)
+++ trunk/Source/WebKit2/UIProcess/API/ios/WKContentView.mm 2013-11-30 19:14:13 UTC (rev 159889)
</span><span class="lines">@@ -147,7 +147,7 @@
</span><span class="cx"> RunLoop::initializeMainRunLoop();
</span><span class="cx">
</span><span class="cx"> _pageClient = std::make_unique<PageClientImpl>(self);
</span><del>- _page = toImpl(contextRef)->createWebPage(_pageClient.get(), toImpl(pageGroupRef), toImpl(relatedPage));
</del><ins>+ _page = toImpl(contextRef)->createWebPage(*_pageClient, toImpl(pageGroupRef), toImpl(relatedPage));
</ins><span class="cx"> _page->initializeWebPage();
</span><span class="cx"> _page->setIntrinsicDeviceScaleFactor([UIScreen mainScreen].scale);
</span><span class="cx"> _page->setUseFixedLayout(true);
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPImacWKViewmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/API/mac/WKView.mm (159888 => 159889)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/mac/WKView.mm 2013-11-30 18:55:27 UTC (rev 159888)
+++ trunk/Source/WebKit2/UIProcess/API/mac/WKView.mm 2013-11-30 19:14:13 UTC (rev 159889)
</span><span class="lines">@@ -2908,7 +2908,7 @@
</span><span class="cx"> _data = [[WKViewData alloc] init];
</span><span class="cx">
</span><span class="cx"> _data->_pageClient = std::make_unique<PageClientImpl>(self);
</span><del>- _data->_page = toImpl(contextRef)->createWebPage(_data->_pageClient.get(), toImpl(pageGroupRef), toImpl(relatedPage));
</del><ins>+ _data->_page = toImpl(contextRef)->createWebPage(*_data->_pageClient, toImpl(pageGroupRef), toImpl(relatedPage));
</ins><span class="cx"> _data->_page->setIntrinsicDeviceScaleFactor([self _intrinsicDeviceScaleFactor]);
</span><span class="cx"> _data->_page->initializeWebPage();
</span><span class="cx"> #if ENABLE(FULLSCREEN_API)
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessCoordinatedGraphicsWebPageProxyCoordinatedGraphicscpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/CoordinatedGraphics/WebPageProxyCoordinatedGraphics.cpp (159888 => 159889)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/CoordinatedGraphics/WebPageProxyCoordinatedGraphics.cpp 2013-11-30 18:55:27 UTC (rev 159888)
+++ trunk/Source/WebKit2/UIProcess/CoordinatedGraphics/WebPageProxyCoordinatedGraphics.cpp 2013-11-30 19:14:13 UTC (rev 159889)
</span><span class="lines">@@ -47,7 +47,7 @@
</span><span class="cx">
</span><span class="cx"> void WebPageProxy::didFindZoomableArea(const IntPoint& target, const IntRect& area)
</span><span class="cx"> {
</span><del>- m_pageClient->didFindZoomableArea(target, area);
</del><ins>+ m_pageClient.didFindZoomableArea(target, area);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> } // namespace WebKit
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessCoordinatedGraphicsWebViewcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/CoordinatedGraphics/WebView.cpp (159888 => 159889)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/CoordinatedGraphics/WebView.cpp 2013-11-30 18:55:27 UTC (rev 159888)
+++ trunk/Source/WebKit2/UIProcess/CoordinatedGraphics/WebView.cpp 2013-11-30 19:14:13 UTC (rev 159889)
</span><span class="lines">@@ -52,7 +52,7 @@
</span><span class="cx"> , m_opacity(1.0)
</span><span class="cx"> {
</span><span class="cx"> // Need to call createWebPage after other data members, specifically m_visible, are initialized.
</span><del>- m_page = context->createWebPage(this, pageGroup);
</del><ins>+ m_page = context->createWebPage(*this, pageGroup);
</ins><span class="cx">
</span><span class="cx"> m_page->pageGroup()->preferences()->setAcceleratedCompositingEnabled(true);
</span><span class="cx"> m_page->pageGroup()->preferences()->setForceCompositingMode(true);
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessWebContextcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/WebContext.cpp (159888 => 159889)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/WebContext.cpp 2013-11-30 18:55:27 UTC (rev 159888)
+++ trunk/Source/WebKit2/UIProcess/WebContext.cpp 2013-11-30 19:14:13 UTC (rev 159889)
</span><span class="lines">@@ -740,7 +740,7 @@
</span><span class="cx"> return result;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-PassRefPtr<WebPageProxy> WebContext::createWebPage(PageClient* pageClient, WebPageGroup* pageGroup, WebPageProxy* relatedPage)
</del><ins>+PassRefPtr<WebPageProxy> WebContext::createWebPage(PageClient& pageClient, WebPageGroup* pageGroup, WebPageProxy* relatedPage)
</ins><span class="cx"> {
</span><span class="cx"> RefPtr<WebProcessProxy> process;
</span><span class="cx"> if (m_processModel == ProcessModelSharedSecondaryProcess) {
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessWebContexth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/WebContext.h (159888 => 159889)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/WebContext.h 2013-11-30 18:55:27 UTC (rev 159888)
+++ trunk/Source/WebKit2/UIProcess/WebContext.h 2013-11-30 19:14:13 UTC (rev 159889)
</span><span class="lines">@@ -158,7 +158,7 @@
</span><span class="cx">
</span><span class="cx"> StorageManager& storageManager() const { return *m_storageManager; }
</span><span class="cx">
</span><del>- PassRefPtr<WebPageProxy> createWebPage(PageClient*, WebPageGroup*, WebPageProxy* relatedPage = 0);
</del><ins>+ PassRefPtr<WebPageProxy> createWebPage(PageClient&, WebPageGroup*, WebPageProxy* relatedPage = 0);
</ins><span class="cx">
</span><span class="cx"> const String& injectedBundlePath() const { return m_injectedBundlePath; }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessWebPageProxycpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/WebPageProxy.cpp (159888 => 159889)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/WebPageProxy.cpp 2013-11-30 18:55:27 UTC (rev 159888)
+++ trunk/Source/WebKit2/UIProcess/WebPageProxy.cpp 2013-11-30 19:14:13 UTC (rev 159889)
</span><span class="lines">@@ -222,12 +222,12 @@
</span><span class="cx"> }
</span><span class="cx"> #endif // !LOG_DISABLED
</span><span class="cx">
</span><del>-PassRefPtr<WebPageProxy> WebPageProxy::create(PageClient* pageClient, PassRefPtr<WebProcessProxy> process, WebPageGroup* pageGroup, uint64_t pageID)
</del><ins>+PassRefPtr<WebPageProxy> WebPageProxy::create(PageClient& pageClient, PassRefPtr<WebProcessProxy> process, WebPageGroup* pageGroup, uint64_t pageID)
</ins><span class="cx"> {
</span><span class="cx"> return adoptRef(new WebPageProxy(pageClient, process, pageGroup, pageID));
</span><span class="cx"> }
</span><span class="cx">
</span><del>-WebPageProxy::WebPageProxy(PageClient* pageClient, PassRefPtr<WebProcessProxy> process, WebPageGroup* pageGroup, uint64_t pageID)
</del><ins>+WebPageProxy::WebPageProxy(PageClient& pageClient, PassRefPtr<WebProcessProxy> process, WebPageGroup* pageGroup, uint64_t pageID)
</ins><span class="cx"> : m_pageClient(pageClient)
</span><span class="cx"> , m_process(process)
</span><span class="cx"> , m_pageGroup(pageGroup)
</span><span class="lines">@@ -490,7 +490,7 @@
</span><span class="cx">
</span><span class="cx"> initializeWebPage();
</span><span class="cx">
</span><del>- m_pageClient->didRelaunchProcess();
</del><ins>+ m_pageClient.didRelaunchProcess();
</ins><span class="cx"> m_drawingArea->waitForBackingStoreUpdateOnNextPaint();
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -516,7 +516,7 @@
</span><span class="cx"> for (size_t i = 0; i < items.size(); ++i)
</span><span class="cx"> m_process->registerNewWebBackForwardListItem(items[i].get());
</span><span class="cx">
</span><del>- m_drawingArea = m_pageClient->createDrawingAreaProxy();
</del><ins>+ m_drawingArea = m_pageClient.createDrawingAreaProxy();
</ins><span class="cx"> ASSERT(m_drawingArea);
</span><span class="cx">
</span><span class="cx"> #if ENABLE(INSPECTOR_SERVER)
</span><span class="lines">@@ -546,7 +546,7 @@
</span><span class="cx"> m_isClosed = true;
</span><span class="cx">
</span><span class="cx"> m_backForwardList->pageClosed();
</span><del>- m_pageClient->pageClosed();
</del><ins>+ m_pageClient.pageClosed();
</ins><span class="cx">
</span><span class="cx"> m_process->disconnectFramesFromPage(this);
</span><span class="cx">
</span><span class="lines">@@ -910,36 +910,36 @@
</span><span class="cx">
</span><span class="cx"> void WebPageProxy::setViewNeedsDisplay(const IntRect& rect)
</span><span class="cx"> {
</span><del>- m_pageClient->setViewNeedsDisplay(rect);
</del><ins>+ m_pageClient.setViewNeedsDisplay(rect);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void WebPageProxy::displayView()
</span><span class="cx"> {
</span><del>- m_pageClient->displayView();
</del><ins>+ m_pageClient.displayView();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> bool WebPageProxy::canScrollView()
</span><span class="cx"> {
</span><del>- return m_pageClient->canScrollView();
</del><ins>+ return m_pageClient.canScrollView();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void WebPageProxy::scrollView(const IntRect& scrollRect, const IntSize& scrollOffset)
</span><span class="cx"> {
</span><del>- m_pageClient->scrollView(scrollRect, scrollOffset);
</del><ins>+ m_pageClient.scrollView(scrollRect, scrollOffset);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void WebPageProxy::updateViewState(ViewState::Flags flagsToUpdate)
</span><span class="cx"> {
</span><span class="cx"> m_viewState &= ~flagsToUpdate;
</span><del>- if (flagsToUpdate & ViewState::WindowIsVisible && m_pageClient->isWindowVisible())
</del><ins>+ if (flagsToUpdate & ViewState::WindowIsVisible && m_pageClient.isWindowVisible())
</ins><span class="cx"> m_viewState |= ViewState::WindowIsVisible;
</span><del>- if (flagsToUpdate & ViewState::IsFocused && m_pageClient->isViewFocused())
</del><ins>+ if (flagsToUpdate & ViewState::IsFocused && m_pageClient.isViewFocused())
</ins><span class="cx"> m_viewState |= ViewState::IsFocused;
</span><del>- if (flagsToUpdate & ViewState::WindowIsActive && m_pageClient->isViewWindowActive())
</del><ins>+ if (flagsToUpdate & ViewState::WindowIsActive && m_pageClient.isViewWindowActive())
</ins><span class="cx"> m_viewState |= ViewState::WindowIsActive;
</span><del>- if (flagsToUpdate & ViewState::IsVisible && m_pageClient->isViewVisible())
</del><ins>+ if (flagsToUpdate & ViewState::IsVisible && m_pageClient.isViewVisible())
</ins><span class="cx"> m_viewState |= ViewState::IsVisible;
</span><del>- if (flagsToUpdate & ViewState::IsInWindow && m_pageClient->isViewInWindow())
</del><ins>+ if (flagsToUpdate & ViewState::IsInWindow && m_pageClient.isViewInWindow())
</ins><span class="cx"> m_viewState |= ViewState::IsInWindow;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -978,7 +978,7 @@
</span><span class="cx">
</span><span class="cx"> if (mayHaveChanged & ViewState::IsInWindow) {
</span><span class="cx"> if (m_viewState & ViewState::IsInWindow) {
</span><del>- LayerHostingMode layerHostingMode = m_pageClient->viewLayerHostingMode();
</del><ins>+ LayerHostingMode layerHostingMode = m_pageClient.viewLayerHostingMode();
</ins><span class="cx"> if (m_layerHostingMode != layerHostingMode) {
</span><span class="cx"> m_layerHostingMode = layerHostingMode;
</span><span class="cx"> m_drawingArea->layerHostingModeDidChange();
</span><span class="lines">@@ -1015,7 +1015,7 @@
</span><span class="cx">
</span><span class="cx"> IntSize WebPageProxy::viewSize() const
</span><span class="cx"> {
</span><del>- return m_pageClient->viewSize();
</del><ins>+ return m_pageClient.viewSize();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void WebPageProxy::setInitialFocus(bool forward, bool isKeyboardEventValid, const WebKeyboardEvent& keyboardEvent)
</span><span class="lines">@@ -1131,7 +1131,7 @@
</span><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- m_pageClient->startDrag(dragData, dragImage.release());
</del><ins>+ m_pageClient.startDrag(dragData, dragImage.release());
</ins><span class="cx"> }
</span><span class="cx"> #endif
</span><span class="cx">
</span><span class="lines">@@ -1376,7 +1376,7 @@
</span><span class="cx"> } else {
</span><span class="cx"> if (m_touchEventQueue.isEmpty()) {
</span><span class="cx"> bool isEventHandled = false;
</span><del>- m_pageClient->doneWithTouchEvent(event, isEventHandled);
</del><ins>+ m_pageClient.doneWithTouchEvent(event, isEventHandled);
</ins><span class="cx"> } else {
</span><span class="cx"> // We attach the incoming events to the newest queued event so that all
</span><span class="cx"> // the events are delivered in the correct order when the event is dequed.
</span><span class="lines">@@ -2010,7 +2010,7 @@
</span><span class="cx">
</span><span class="cx"> m_process->pagePreferencesChanged(this);
</span><span class="cx">
</span><del>- m_pageClient->preferencesDidChange();
</del><ins>+ m_pageClient.preferencesDidChange();
</ins><span class="cx">
</span><span class="cx"> // FIXME: It probably makes more sense to send individual preference changes.
</span><span class="cx"> // However, WebKitTestRunner depends on getting a preference change notification
</span><span class="lines">@@ -2160,15 +2160,15 @@
</span><span class="cx">
</span><span class="cx"> if (frame->isMainFrame()) {
</span><span class="cx"> m_pageLoadState.didCommitLoad();
</span><del>- m_pageClient->didCommitLoadForMainFrame();
</del><ins>+ m_pageClient.didCommitLoadForMainFrame();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> #if USE(APPKIT)
</span><span class="cx"> // FIXME (bug 59111): didCommitLoadForFrame comes too late when restoring a page from b/f cache, making us disable secure event mode in password fields.
</span><span class="cx"> // FIXME: A load going on in one frame shouldn't affect text editing in other frames on the page.
</span><del>- m_pageClient->resetSecureInputState();
</del><ins>+ m_pageClient.resetSecureInputState();
</ins><span class="cx"> dismissCorrectionPanel(ReasonForDismissingAlternativeTextIgnored);
</span><del>- m_pageClient->dismissDictionaryLookupPanel();
</del><ins>+ m_pageClient.dismissDictionaryLookupPanel();
</ins><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> clearLoadDependentCallbacks();
</span><span class="lines">@@ -2529,7 +2529,7 @@
</span><span class="cx"> if (stopResponsivenessTimer)
</span><span class="cx"> m_process->responsivenessTimer()->stop();
</span><span class="cx">
</span><del>- m_pageClient->clearAllEditCommands();
</del><ins>+ m_pageClient.clearAllEditCommands();
</ins><span class="cx"> m_uiClient.close(this);
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -2679,22 +2679,22 @@
</span><span class="cx">
</span><span class="cx"> void WebPageProxy::setWindowFrame(const FloatRect& newWindowFrame)
</span><span class="cx"> {
</span><del>- m_uiClient.setWindowFrame(this, m_pageClient->convertToDeviceSpace(newWindowFrame));
</del><ins>+ m_uiClient.setWindowFrame(this, m_pageClient.convertToDeviceSpace(newWindowFrame));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void WebPageProxy::getWindowFrame(FloatRect& newWindowFrame)
</span><span class="cx"> {
</span><del>- newWindowFrame = m_pageClient->convertToUserSpace(m_uiClient.windowFrame(this));
</del><ins>+ newWindowFrame = m_pageClient.convertToUserSpace(m_uiClient.windowFrame(this));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void WebPageProxy::screenToWindow(const IntPoint& screenPoint, IntPoint& windowPoint)
</span><span class="cx"> {
</span><del>- windowPoint = m_pageClient->screenToWindow(screenPoint);
</del><ins>+ windowPoint = m_pageClient.screenToWindow(screenPoint);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void WebPageProxy::windowToScreen(const IntRect& viewRect, IntRect& result)
</span><span class="cx"> {
</span><del>- result = m_pageClient->windowToScreen(viewRect);
</del><ins>+ result = m_pageClient.windowToScreen(viewRect);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void WebPageProxy::runBeforeUnloadConfirmPanel(const String& message, uint64_t frameID, bool& shouldClose)
</span><span class="lines">@@ -2711,24 +2711,24 @@
</span><span class="cx"> #if USE(TILED_BACKING_STORE)
</span><span class="cx"> void WebPageProxy::pageDidRequestScroll(const IntPoint& point)
</span><span class="cx"> {
</span><del>- m_pageClient->pageDidRequestScroll(point);
</del><ins>+ m_pageClient.pageDidRequestScroll(point);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void WebPageProxy::pageTransitionViewportReady()
</span><span class="cx"> {
</span><del>- m_pageClient->pageTransitionViewportReady();
</del><ins>+ m_pageClient.pageTransitionViewportReady();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void WebPageProxy::didRenderFrame(const WebCore::IntSize& contentsSize, const WebCore::IntRect& coveredRect)
</span><span class="cx"> {
</span><del>- m_pageClient->didRenderFrame(contentsSize, coveredRect);
</del><ins>+ m_pageClient.didRenderFrame(contentsSize, coveredRect);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> void WebPageProxy::didChangeViewportProperties(const ViewportAttributes& attr)
</span><span class="cx"> {
</span><del>- m_pageClient->didChangeViewportProperties(attr);
</del><ins>+ m_pageClient.didChangeViewportProperties(attr);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void WebPageProxy::pageDidScroll()
</span><span class="lines">@@ -2807,14 +2807,14 @@
</span><span class="cx"> #if PLATFORM(EFL) || PLATFORM(GTK)
</span><span class="cx"> void WebPageProxy::handleDownloadRequest(DownloadProxy* download)
</span><span class="cx"> {
</span><del>- m_pageClient->handleDownloadRequest(download);
</del><ins>+ m_pageClient.handleDownloadRequest(download);
</ins><span class="cx"> }
</span><span class="cx"> #endif // PLATFORM(EFL) || PLATFORM(GTK)
</span><span class="cx">
</span><span class="cx"> #if PLATFORM(EFL) || PLATFORM(IOS)
</span><span class="cx"> void WebPageProxy::didChangeContentSize(const IntSize& size)
</span><span class="cx"> {
</span><del>- m_pageClient->didChangeContentSize(size);
</del><ins>+ m_pageClient.didChangeContentSize(size);
</ins><span class="cx"> }
</span><span class="cx"> #endif
</span><span class="cx">
</span><span class="lines">@@ -2834,7 +2834,7 @@
</span><span class="cx"> m_colorPicker = 0;
</span><span class="cx"> #endif
</span><span class="cx"> if (!m_colorPicker)
</span><del>- m_colorPicker = m_pageClient->createColorPicker(this, initialColor, elementRect);
</del><ins>+ m_colorPicker = m_pageClient.createColorPicker(this, initialColor, elementRect);
</ins><span class="cx"> m_colorPicker->showColorPicker(initialColor);
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -2947,27 +2947,27 @@
</span><span class="cx"> #if PLATFORM(MAC)
</span><span class="cx"> // Selection being none is a temporary state when editing. Flipping secure input state too quickly was causing trouble (not fully understood).
</span><span class="cx"> if (couldChangeSecureInputState && !editorState.selectionIsNone)
</span><del>- m_pageClient->updateSecureInputState();
</del><ins>+ m_pageClient.updateSecureInputState();
</ins><span class="cx">
</span><span class="cx"> if (editorState.shouldIgnoreCompositionSelectionChange)
</span><span class="cx"> return;
</span><span class="cx">
</span><span class="cx"> if (closedComposition)
</span><del>- m_pageClient->notifyInputContextAboutDiscardedComposition();
</del><ins>+ m_pageClient.notifyInputContextAboutDiscardedComposition();
</ins><span class="cx"> if (editorState.hasComposition) {
</span><span class="cx"> // Abandon the current inline input session if selection changed for any other reason but an input method changing the composition.
</span><span class="cx"> // FIXME: This logic should be in WebCore, no need to round-trip to UI process to cancel the composition.
</span><span class="cx"> cancelComposition();
</span><del>- m_pageClient->notifyInputContextAboutDiscardedComposition();
</del><ins>+ m_pageClient.notifyInputContextAboutDiscardedComposition();
</ins><span class="cx"> }
</span><span class="cx"> #if PLATFORM(IOS)
</span><span class="cx"> else {
</span><span class="cx"> // We need to notify the client on iOS to make sure the selection is redrawn.
</span><del>- m_pageClient->selectionDidChange();
</del><ins>+ m_pageClient.selectionDidChange();
</ins><span class="cx"> }
</span><span class="cx"> #endif
</span><span class="cx"> #elif PLATFORM(EFL) || PLATFORM(GTK)
</span><del>- m_pageClient->updateTextInputState();
</del><ins>+ m_pageClient.updateTextInputState();
</ins><span class="cx"> #endif
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -2980,18 +2980,18 @@
</span><span class="cx">
</span><span class="cx"> void WebPageProxy::canUndoRedo(uint32_t action, bool& result)
</span><span class="cx"> {
</span><del>- result = m_pageClient->canUndoRedo(static_cast<UndoOrRedo>(action));
</del><ins>+ result = m_pageClient.canUndoRedo(static_cast<UndoOrRedo>(action));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void WebPageProxy::executeUndoRedo(uint32_t action, bool& result)
</span><span class="cx"> {
</span><del>- m_pageClient->executeUndoRedo(static_cast<UndoOrRedo>(action));
</del><ins>+ m_pageClient.executeUndoRedo(static_cast<UndoOrRedo>(action));
</ins><span class="cx"> result = true;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void WebPageProxy::clearAllEditCommands()
</span><span class="cx"> {
</span><del>- m_pageClient->clearAllEditCommands();
</del><ins>+ m_pageClient.clearAllEditCommands();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void WebPageProxy::didCountStringMatches(const String& string, uint32_t matchCount)
</span><span class="lines">@@ -3007,7 +3007,7 @@
</span><span class="cx"> void WebPageProxy::setFindIndicator(const FloatRect& selectionRectInWindowCoordinates, const Vector<FloatRect>& textRectsInSelectionRectCoordinates, float contentImageScaleFactor, const ShareableBitmap::Handle& contentImageHandle, bool fadeOut, bool animate)
</span><span class="cx"> {
</span><span class="cx"> RefPtr<FindIndicator> findIndicator = FindIndicator::create(selectionRectInWindowCoordinates, textRectsInSelectionRectCoordinates, contentImageScaleFactor, contentImageHandle);
</span><del>- m_pageClient->setFindIndicator(findIndicator.release(), fadeOut, animate);
</del><ins>+ m_pageClient.setFindIndicator(findIndicator.release(), fadeOut, animate);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void WebPageProxy::didFindString(const String& string, uint32_t matchCount)
</span><span class="lines">@@ -3077,7 +3077,7 @@
</span><span class="cx"> m_activePopupMenu = 0;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- m_activePopupMenu = m_pageClient->createPopupMenuProxy(this);
</del><ins>+ m_activePopupMenu = m_pageClient.createPopupMenuProxy(this);
</ins><span class="cx">
</span><span class="cx"> if (!m_activePopupMenu)
</span><span class="cx"> return;
</span><span class="lines">@@ -3137,7 +3137,7 @@
</span><span class="cx"> m_activeContextMenu = 0;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- m_activeContextMenu = m_pageClient->createContextMenuProxy(this);
</del><ins>+ m_activeContextMenu = m_pageClient.createContextMenuProxy(this);
</ins><span class="cx"> if (!m_activeContextMenu)
</span><span class="cx"> return;
</span><span class="cx">
</span><span class="lines">@@ -3280,7 +3280,7 @@
</span><span class="cx">
</span><span class="cx"> void WebPageProxy::registerEditCommand(PassRefPtr<WebEditCommandProxy> commandProxy, UndoOrRedo undoOrRedo)
</span><span class="cx"> {
</span><del>- m_pageClient->registerEditCommand(commandProxy, undoOrRedo);
</del><ins>+ m_pageClient.registerEditCommand(commandProxy, undoOrRedo);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void WebPageProxy::addEditCommand(WebEditCommandProxy* command)
</span><span class="lines">@@ -3398,20 +3398,20 @@
</span><span class="cx"> {
</span><span class="cx"> String oldToolTip = m_toolTip;
</span><span class="cx"> m_toolTip = toolTip;
</span><del>- m_pageClient->toolTipChanged(oldToolTip, m_toolTip);
</del><ins>+ m_pageClient.toolTipChanged(oldToolTip, m_toolTip);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void WebPageProxy::setCursor(const WebCore::Cursor& cursor)
</span><span class="cx"> {
</span><span class="cx"> // The Web process may have asked to change the cursor when the view was in an active window, but
</span><span class="cx"> // if it is no longer in a window or the window is not active, then the cursor should not change.
</span><del>- if (m_pageClient->isViewWindowActive())
- m_pageClient->setCursor(cursor);
</del><ins>+ if (m_pageClient.isViewWindowActive())
+ m_pageClient.setCursor(cursor);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void WebPageProxy::setCursorHiddenUntilMouseMoves(bool hiddenUntilMouseMoves)
</span><span class="cx"> {
</span><del>- m_pageClient->setCursorHiddenUntilMouseMoves(hiddenUntilMouseMoves);
</del><ins>+ m_pageClient.setCursorHiddenUntilMouseMoves(hiddenUntilMouseMoves);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void WebPageProxy::didReceiveEvent(uint32_t opaqueType, bool handled)
</span><span class="lines">@@ -3484,7 +3484,7 @@
</span><span class="cx"> if (!m_keyEventQueue.isEmpty())
</span><span class="cx"> m_process->send(Messages::WebPage::KeyEvent(m_keyEventQueue.first()), m_pageID);
</span><span class="cx">
</span><del>- m_pageClient->doneWithKeyEvent(event, handled);
</del><ins>+ m_pageClient.doneWithKeyEvent(event, handled);
</ins><span class="cx"> if (handled)
</span><span class="cx"> break;
</span><span class="cx">
</span><span class="lines">@@ -3501,10 +3501,10 @@
</span><span class="cx"> MESSAGE_CHECK(type == queuedEvents.forwardedEvent.type());
</span><span class="cx"> m_touchEventQueue.removeFirst();
</span><span class="cx">
</span><del>- m_pageClient->doneWithTouchEvent(queuedEvents.forwardedEvent, handled);
</del><ins>+ m_pageClient.doneWithTouchEvent(queuedEvents.forwardedEvent, handled);
</ins><span class="cx"> for (size_t i = 0; i < queuedEvents.deferredTouchEvents.size(); ++i) {
</span><span class="cx"> bool isEventHandled = false;
</span><del>- m_pageClient->doneWithTouchEvent(queuedEvents.deferredTouchEvents.at(i), isEventHandled);
</del><ins>+ m_pageClient.doneWithTouchEvent(queuedEvents.deferredTouchEvents.at(i), isEventHandled);
</ins><span class="cx"> }
</span><span class="cx"> break;
</span><span class="cx"> }
</span><span class="lines">@@ -3679,7 +3679,7 @@
</span><span class="cx"> // having the page load state available could be useful.
</span><span class="cx"> m_pageLoadState.reset();
</span><span class="cx">
</span><del>- m_pageClient->processDidCrash();
</del><ins>+ m_pageClient.processDidCrash();
</ins><span class="cx"> m_loaderClient.processDidCrash(this);
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -3769,7 +3769,6 @@
</span><span class="cx"> if (!isValid())
</span><span class="cx"> return;
</span><span class="cx">
</span><del>- ASSERT(m_pageClient);
</del><span class="cx"> m_process->removeMessageReceiver(Messages::WebPageProxy::messageReceiverName(), m_pageID);
</span><span class="cx">
</span><span class="cx"> m_isValid = false;
</span><span class="lines">@@ -3783,7 +3782,7 @@
</span><span class="cx">
</span><span class="cx"> resetState();
</span><span class="cx">
</span><del>- m_pageClient->clearAllEditCommands();
</del><ins>+ m_pageClient.clearAllEditCommands();
</ins><span class="cx"> m_pendingLearnOrIgnoreWordMessageCount = 0;
</span><span class="cx">
</span><span class="cx"> // Can't expect DidReceiveEvent notifications from a crashed web process.
</span><span class="lines">@@ -3807,13 +3806,13 @@
</span><span class="cx">
</span><span class="cx"> #if !PLATFORM(IOS) && PLATFORM(MAC)
</span><span class="cx"> dismissCorrectionPanel(ReasonForDismissingAlternativeTextIgnored);
</span><del>- m_pageClient->dismissDictionaryLookupPanel();
</del><ins>+ m_pageClient.dismissDictionaryLookupPanel();
</ins><span class="cx"> #endif
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void WebPageProxy::initializeCreationParameters()
</span><span class="cx"> {
</span><del>- m_creationParameters.viewSize = m_pageClient->viewSize();
</del><ins>+ m_creationParameters.viewSize = m_pageClient.viewSize();
</ins><span class="cx"> m_creationParameters.viewState = m_viewState;
</span><span class="cx"> m_creationParameters.drawingAreaType = m_drawingArea->type();
</span><span class="cx"> m_creationParameters.store = m_pageGroup->preferences()->store();
</span><span class="lines">@@ -3844,7 +3843,7 @@
</span><span class="cx"> #if PLATFORM(MAC)
</span><span class="cx"> m_creationParameters.layerHostingMode = m_layerHostingMode;
</span><span class="cx"> #if !PLATFORM(IOS)
</span><del>- m_creationParameters.colorSpace = m_pageClient->colorSpace();
</del><ins>+ m_creationParameters.colorSpace = m_pageClient.colorSpace();
</ins><span class="cx"> #endif // !PLATFORM(IOS)
</span><span class="cx"> #endif
</span><span class="cx"> }
</span><span class="lines">@@ -3852,17 +3851,17 @@
</span><span class="cx"> #if USE(ACCELERATED_COMPOSITING)
</span><span class="cx"> void WebPageProxy::enterAcceleratedCompositingMode(const LayerTreeContext& layerTreeContext)
</span><span class="cx"> {
</span><del>- m_pageClient->enterAcceleratedCompositingMode(layerTreeContext);
</del><ins>+ m_pageClient.enterAcceleratedCompositingMode(layerTreeContext);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void WebPageProxy::exitAcceleratedCompositingMode()
</span><span class="cx"> {
</span><del>- m_pageClient->exitAcceleratedCompositingMode();
</del><ins>+ m_pageClient.exitAcceleratedCompositingMode();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void WebPageProxy::updateAcceleratedCompositingMode(const LayerTreeContext& layerTreeContext)
</span><span class="cx"> {
</span><del>- m_pageClient->updateAcceleratedCompositingMode(layerTreeContext);
</del><ins>+ m_pageClient.updateAcceleratedCompositingMode(layerTreeContext);
</ins><span class="cx"> }
</span><span class="cx"> #endif // USE(ACCELERATED_COMPOSITING)
</span><span class="cx">
</span><span class="lines">@@ -3936,7 +3935,7 @@
</span><span class="cx"> if (m_uiClient.decidePolicyForGeolocationPermissionRequest(this, frame, origin.get(), request.get()))
</span><span class="cx"> return;
</span><span class="cx">
</span><del>- if (m_pageClient->decidePolicyForGeolocationPermissionRequest(*frame, *origin, *request))
</del><ins>+ if (m_pageClient.decidePolicyForGeolocationPermissionRequest(*frame, *origin, *request))
</ins><span class="cx"> return;
</span><span class="cx">
</span><span class="cx"> request->deny();
</span><span class="lines">@@ -4024,7 +4023,7 @@
</span><span class="cx"> void WebPageProxy::recommendedScrollbarStyleDidChange(int32_t newStyle)
</span><span class="cx"> {
</span><span class="cx"> #if USE(APPKIT)
</span><del>- m_pageClient->recommendedScrollbarStyleDidChange(newStyle);
</del><ins>+ m_pageClient.recommendedScrollbarStyleDidChange(newStyle);
</ins><span class="cx"> #else
</span><span class="cx"> UNUSED_PARAM(newStyle);
</span><span class="cx"> #endif
</span><span class="lines">@@ -4185,7 +4184,7 @@
</span><span class="cx"> if (!m_process->responsivenessTimer()->isResponsive())
</span><span class="cx"> isDiscardable = false;
</span><span class="cx"> else
</span><del>- isDiscardable = !m_pageClient->isViewWindowActive() || !isViewVisible();
</del><ins>+ isDiscardable = !m_pageClient.isViewWindowActive() || !isViewVisible();
</ins><span class="cx">
</span><span class="cx"> m_drawingArea->setBackingStoreIsDiscardable(isDiscardable);
</span><span class="cx"> }
</span><span class="lines">@@ -4251,22 +4250,22 @@
</span><span class="cx">
</span><span class="cx"> void WebPageProxy::showCorrectionPanel(int32_t panelType, const FloatRect& boundingBoxOfReplacedString, const String& replacedString, const String& replacementString, const Vector<String>& alternativeReplacementStrings)
</span><span class="cx"> {
</span><del>- m_pageClient->showCorrectionPanel((AlternativeTextType)panelType, boundingBoxOfReplacedString, replacedString, replacementString, alternativeReplacementStrings);
</del><ins>+ m_pageClient.showCorrectionPanel((AlternativeTextType)panelType, boundingBoxOfReplacedString, replacedString, replacementString, alternativeReplacementStrings);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void WebPageProxy::dismissCorrectionPanel(int32_t reason)
</span><span class="cx"> {
</span><del>- m_pageClient->dismissCorrectionPanel((ReasonForDismissingAlternativeText)reason);
</del><ins>+ m_pageClient.dismissCorrectionPanel((ReasonForDismissingAlternativeText)reason);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void WebPageProxy::dismissCorrectionPanelSoon(int32_t reason, String& result)
</span><span class="cx"> {
</span><del>- result = m_pageClient->dismissCorrectionPanelSoon((ReasonForDismissingAlternativeText)reason);
</del><ins>+ result = m_pageClient.dismissCorrectionPanelSoon((ReasonForDismissingAlternativeText)reason);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void WebPageProxy::recordAutocorrectionResponse(int32_t responseType, const String& replacedString, const String& replacementString)
</span><span class="cx"> {
</span><del>- m_pageClient->recordAutocorrectionResponse((AutocorrectionResponseType)responseType, replacedString, replacementString);
</del><ins>+ m_pageClient.recordAutocorrectionResponse((AutocorrectionResponseType)responseType, replacedString, replacementString);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void WebPageProxy::handleAlternativeTextUIResult(const String& result)
</span><span class="lines">@@ -4278,17 +4277,17 @@
</span><span class="cx"> #if USE(DICTATION_ALTERNATIVES)
</span><span class="cx"> void WebPageProxy::showDictationAlternativeUI(const WebCore::FloatRect& boundingBoxOfDictatedText, uint64_t dictationContext)
</span><span class="cx"> {
</span><del>- m_pageClient->showDictationAlternativeUI(boundingBoxOfDictatedText, dictationContext);
</del><ins>+ m_pageClient.showDictationAlternativeUI(boundingBoxOfDictatedText, dictationContext);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void WebPageProxy::removeDictationAlternatives(uint64_t dictationContext)
</span><span class="cx"> {
</span><del>- m_pageClient->removeDictationAlternatives(dictationContext);
</del><ins>+ m_pageClient.removeDictationAlternatives(dictationContext);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void WebPageProxy::dictationAlternatives(uint64_t dictationContext, Vector<String>& result)
</span><span class="cx"> {
</span><del>- result = m_pageClient->dictationAlternatives(dictationContext);
</del><ins>+ result = m_pageClient.dictationAlternatives(dictationContext);
</ins><span class="cx"> }
</span><span class="cx"> #endif
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessWebPageProxyh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/WebPageProxy.h (159888 => 159889)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/WebPageProxy.h 2013-11-30 18:55:27 UTC (rev 159888)
+++ trunk/Source/WebKit2/UIProcess/WebPageProxy.h 2013-11-30 19:14:13 UTC (rev 159889)
</span><span class="lines">@@ -322,7 +322,7 @@
</span><span class="cx"> , public CoreIPC::MessageReceiver {
</span><span class="cx"> public:
</span><span class="cx">
</span><del>- static PassRefPtr<WebPageProxy> create(PageClient*, PassRefPtr<WebProcessProxy>, WebPageGroup*, uint64_t pageID);
</del><ins>+ static PassRefPtr<WebPageProxy> create(PageClient&, PassRefPtr<WebProcessProxy>, WebPageGroup*, uint64_t pageID);
</ins><span class="cx"> virtual ~WebPageProxy();
</span><span class="cx">
</span><span class="cx"> uint64_t pageID() const { return m_pageID; }
</span><span class="lines">@@ -847,7 +847,7 @@
</span><span class="cx"> WebCore::ScrollPinningBehavior scrollPinningBehavior() { return m_scrollPinningBehavior; }
</span><span class="cx">
</span><span class="cx"> private:
</span><del>- WebPageProxy(PageClient*, PassRefPtr<WebProcessProxy>, WebPageGroup*, uint64_t pageID);
</del><ins>+ WebPageProxy(PageClient&, PassRefPtr<WebProcessProxy>, WebPageGroup*, uint64_t pageID);
</ins><span class="cx"> void platformInitialize();
</span><span class="cx"> void initializeCreationParameters();
</span><span class="cx">
</span><span class="lines">@@ -1138,7 +1138,7 @@
</span><span class="cx"> void findPlugin(const String& mimeType, uint32_t processType, const String& urlString, const String& frameURLString, const String& pageURLString, bool allowOnlyApplicationPlugins, uint64_t& pluginProcessToken, String& newMIMEType, uint32_t& pluginLoadPolicy, String& unavailabilityDescription);
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>- PageClient* m_pageClient;
</del><ins>+ PageClient& m_pageClient;
</ins><span class="cx"> WebLoaderClient m_loaderClient;
</span><span class="cx"> WebPolicyClient m_policyClient;
</span><span class="cx"> WebFormClient m_formClient;
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessWebProcessProxycpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/WebProcessProxy.cpp (159888 => 159889)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/WebProcessProxy.cpp 2013-11-30 18:55:27 UTC (rev 159888)
+++ trunk/Source/WebKit2/UIProcess/WebProcessProxy.cpp 2013-11-30 19:14:13 UTC (rev 159889)
</span><span class="lines">@@ -160,7 +160,7 @@
</span><span class="cx"> return globalPageMap().get(pageID);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-PassRefPtr<WebPageProxy> WebProcessProxy::createWebPage(PageClient* pageClient, WebContext*, WebPageGroup* pageGroup)
</del><ins>+PassRefPtr<WebPageProxy> WebProcessProxy::createWebPage(PageClient& pageClient, WebContext*, WebPageGroup* pageGroup)
</ins><span class="cx"> {
</span><span class="cx"> uint64_t pageID = generatePageID();
</span><span class="cx"> RefPtr<WebPageProxy> webPage = WebPageProxy::create(pageClient, this, pageGroup, pageID);
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessWebProcessProxyh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/WebProcessProxy.h (159888 => 159889)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/WebProcessProxy.h 2013-11-30 18:55:27 UTC (rev 159888)
+++ trunk/Source/WebKit2/UIProcess/WebProcessProxy.h 2013-11-30 19:14:13 UTC (rev 159889)
</span><span class="lines">@@ -77,7 +77,7 @@
</span><span class="cx"> WebContext* context() const { return m_context.get(); }
</span><span class="cx">
</span><span class="cx"> static WebPageProxy* webPage(uint64_t pageID);
</span><del>- PassRefPtr<WebPageProxy> createWebPage(PageClient*, WebContext*, WebPageGroup*);
</del><ins>+ PassRefPtr<WebPageProxy> createWebPage(PageClient&, WebContext*, WebPageGroup*);
</ins><span class="cx"> void addExistingWebPage(WebPageProxy*, uint64_t pageID);
</span><span class="cx"> void removeWebPage(uint64_t pageID);
</span><span class="cx"> Vector<WebPageProxy*> pages() const;
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessgtkWebPageProxyGtkcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/gtk/WebPageProxyGtk.cpp (159888 => 159889)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/gtk/WebPageProxyGtk.cpp 2013-11-30 18:55:27 UTC (rev 159888)
+++ trunk/Source/WebKit2/UIProcess/gtk/WebPageProxyGtk.cpp 2013-11-30 19:14:13 UTC (rev 159889)
</span><span class="lines">@@ -57,7 +57,7 @@
</span><span class="cx"> // When the keyboard event is started in the WebProcess side (e.g. from the Inspector)
</span><span class="cx"> // it will arrive without a GdkEvent associated, so the keyEventQueue will be empty.
</span><span class="cx"> if (!m_keyEventQueue.isEmpty())
</span><del>- m_pageClient->getEditorCommandsForKeyEvent(m_keyEventQueue.first(), eventType, commandsList);
</del><ins>+ m_pageClient.getEditorCommandsForKeyEvent(m_keyEventQueue.first(), eventType, commandsList);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void WebPageProxy::bindAccessibilityTree(const String& plugID)
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessiosWebPageProxyIOSmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/ios/WebPageProxyIOS.mm (159888 => 159889)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/ios/WebPageProxyIOS.mm 2013-11-30 18:55:27 UTC (rev 159888)
+++ trunk/Source/WebKit2/UIProcess/ios/WebPageProxyIOS.mm 2013-11-30 19:14:13 UTC (rev 159889)
</span><span class="lines">@@ -275,7 +275,7 @@
</span><span class="cx"> void WebPageProxy::interpretKeyEvent(const EditorState& state, bool isCharEvent, bool& handled)
</span><span class="cx"> {
</span><span class="cx"> m_editorState = state;
</span><del>- handled = m_pageClient->interpretKeyEvent(m_keyEventQueue.first(), isCharEvent);
</del><ins>+ handled = m_pageClient.interpretKeyEvent(m_keyEventQueue.first(), isCharEvent);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> // Complex text input support for plug-ins.
</span><span class="lines">@@ -356,27 +356,27 @@
</span><span class="cx">
</span><span class="cx"> void WebPageProxy::mainDocumentDidReceiveMobileDocType()
</span><span class="cx"> {
</span><del>- m_pageClient->mainDocumentDidReceiveMobileDocType();
</del><ins>+ m_pageClient.mainDocumentDidReceiveMobileDocType();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void WebPageProxy::didGetTapHighlightGeometries(uint64_t requestID, const WebCore::Color& color, const Vector<WebCore::FloatQuad>& highlightedQuads, const WebCore::IntSize& topLeftRadius, const WebCore::IntSize& topRightRadius, const WebCore::IntSize& bottomLeftRadius, const WebCore::IntSize& bottomRightRadius)
</span><span class="cx"> {
</span><del>- m_pageClient->didGetTapHighlightGeometries(requestID, color, highlightedQuads, topLeftRadius, topRightRadius, bottomLeftRadius, bottomRightRadius);
</del><ins>+ m_pageClient.didGetTapHighlightGeometries(requestID, color, highlightedQuads, topLeftRadius, topRightRadius, bottomLeftRadius, bottomRightRadius);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void WebPageProxy::didChangeViewportArguments(const WebCore::ViewportArguments& viewportArguments)
</span><span class="cx"> {
</span><del>- m_pageClient->didChangeViewportArguments(viewportArguments);
</del><ins>+ m_pageClient.didChangeViewportArguments(viewportArguments);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void WebPageProxy::startAssistingNode(const WebCore::IntRect& scrollRect, bool hasNextFocusable, bool hasPreviousFocusable)
</span><span class="cx"> {
</span><del>- m_pageClient->startAssistingNode(scrollRect, hasNextFocusable, hasPreviousFocusable);
</del><ins>+ m_pageClient.startAssistingNode(scrollRect, hasNextFocusable, hasPreviousFocusable);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void WebPageProxy::stopAssistingNode()
</span><span class="cx"> {
</span><del>- m_pageClient->stopAssistingNode();
</del><ins>+ m_pageClient.stopAssistingNode();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void WebPageProxy::didPerformDictionaryLookup(const AttributedString&, const DictionaryPopupInfo&)
</span><span class="lines">@@ -401,7 +401,7 @@
</span><span class="cx">
</span><span class="cx"> void WebPageProxy::setAcceleratedCompositingRootLayer(PlatformLayer* rootLayer)
</span><span class="cx"> {
</span><del>- m_pageClient->setAcceleratedCompositingRootLayer(rootLayer);
</del><ins>+ m_pageClient.setAcceleratedCompositingRootLayer(rootLayer);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> } // namespace WebKit
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessmacWebPageProxyMacmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/mac/WebPageProxyMac.mm (159888 => 159889)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/mac/WebPageProxyMac.mm 2013-11-30 18:55:27 UTC (rev 159888)
+++ trunk/Source/WebKit2/UIProcess/mac/WebPageProxyMac.mm 2013-11-30 19:14:13 UTC (rev 159889)
</span><span class="lines">@@ -150,7 +150,7 @@
</span><span class="cx">
</span><span class="cx"> // In case the UI client overrides getWindowFrame(), we call it here to make sure we send the appropriate window frame.
</span><span class="cx"> FloatRect windowFrameInScreenCoordinates = m_uiClient.windowFrame(this);
</span><del>- FloatRect windowFrameInUnflippedScreenCoordinates = m_pageClient->convertToUserSpace(windowFrameInScreenCoordinates);
</del><ins>+ FloatRect windowFrameInUnflippedScreenCoordinates = m_pageClient.convertToUserSpace(windowFrameInScreenCoordinates);
</ins><span class="cx">
</span><span class="cx"> process()->send(Messages::WebPage::WindowAndViewFramesChanged(windowFrameInScreenCoordinates, windowFrameInUnflippedScreenCoordinates, viewFrameInWindowCoordinates, accessibilityViewCoordinates), m_pageID);
</span><span class="cx"> }
</span><span class="lines">@@ -240,7 +240,7 @@
</span><span class="cx">
</span><span class="cx"> for (size_t i = 0; i < dictationAlternativesWithRange.size(); ++i) {
</span><span class="cx"> const TextAlternativeWithRange& alternativeWithRange = dictationAlternativesWithRange[i];
</span><del>- uint64_t dictationContext = m_pageClient->addDictationAlternatives(alternativeWithRange.alternatives);
</del><ins>+ uint64_t dictationContext = m_pageClient.addDictationAlternatives(alternativeWithRange.alternatives);
</ins><span class="cx"> if (dictationContext)
</span><span class="cx"> dictationAlternatives.append(DictationAlternative(alternativeWithRange.range.location, alternativeWithRange.range.length, dictationContext));
</span><span class="cx"> }
</span><span class="lines">@@ -359,7 +359,7 @@
</span><span class="cx"> if (!dragImage)
</span><span class="cx"> return;
</span><span class="cx">
</span><del>- m_pageClient->setDragImage(clientPosition, dragImage.release(), isLinkDrag);
</del><ins>+ m_pageClient.setDragImage(clientPosition, dragImage.release(), isLinkDrag);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void WebPageProxy::setPromisedData(const String& pasteboardName, const SharedMemory::Handle& imageHandle, uint64_t imageSize, const String& filename, const String& extension,
</span><span class="lines">@@ -373,7 +373,7 @@
</span><span class="cx"> RefPtr<SharedMemory> sharedMemoryArchive = SharedMemory::create(archiveHandle, SharedMemory::ReadOnly);;
</span><span class="cx"> archiveBuffer = SharedBuffer::create(static_cast<unsigned char*>(sharedMemoryArchive->data()), archiveSize);
</span><span class="cx"> }
</span><del>- m_pageClient->setPromisedData(pasteboardName, imageBuffer, filename, extension, title, url, visibleURL, archiveBuffer);
</del><ins>+ m_pageClient.setPromisedData(pasteboardName, imageBuffer, filename, extension, title, url, visibleURL, archiveBuffer);
</ins><span class="cx"> }
</span><span class="cx"> #endif
</span><span class="cx">
</span><span class="lines">@@ -388,7 +388,7 @@
</span><span class="cx"> void WebPageProxy::interpretQueuedKeyEvent(const EditorState& state, bool& handled, Vector<WebCore::KeypressCommand>& commands)
</span><span class="cx"> {
</span><span class="cx"> m_editorState = state;
</span><del>- handled = m_pageClient->interpretKeyEvent(m_keyEventQueue.first(), commands);
</del><ins>+ handled = m_pageClient.interpretKeyEvent(m_keyEventQueue.first(), commands);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> // Complex text input support for plug-ins.
</span><span class="lines">@@ -427,22 +427,22 @@
</span><span class="cx">
</span><span class="cx"> void WebPageProxy::didPerformDictionaryLookup(const AttributedString& text, const DictionaryPopupInfo& dictionaryPopupInfo)
</span><span class="cx"> {
</span><del>- m_pageClient->didPerformDictionaryLookup(text, dictionaryPopupInfo);
</del><ins>+ m_pageClient.didPerformDictionaryLookup(text, dictionaryPopupInfo);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void WebPageProxy::registerWebProcessAccessibilityToken(const CoreIPC::DataReference& data)
</span><span class="cx"> {
</span><del>- m_pageClient->accessibilityWebProcessTokenReceived(data);
</del><ins>+ m_pageClient.accessibilityWebProcessTokenReceived(data);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void WebPageProxy::makeFirstResponder()
</span><span class="cx"> {
</span><del>- m_pageClient->makeFirstResponder();
</del><ins>+ m_pageClient.makeFirstResponder();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> ColorSpaceData WebPageProxy::colorSpace()
</span><span class="cx"> {
</span><del>- return m_pageClient->colorSpace();
</del><ins>+ return m_pageClient.colorSpace();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void WebPageProxy::registerUIProcessAccessibilityTokens(const CoreIPC::DataReference& elementToken, const CoreIPC::DataReference& windowToken)
</span><span class="lines">@@ -455,21 +455,21 @@
</span><span class="cx">
</span><span class="cx"> void WebPageProxy::pluginFocusOrWindowFocusChanged(uint64_t pluginComplexTextInputIdentifier, bool pluginHasFocusAndWindowHasFocus)
</span><span class="cx"> {
</span><del>- m_pageClient->pluginFocusOrWindowFocusChanged(pluginComplexTextInputIdentifier, pluginHasFocusAndWindowHasFocus);
</del><ins>+ m_pageClient.pluginFocusOrWindowFocusChanged(pluginComplexTextInputIdentifier, pluginHasFocusAndWindowHasFocus);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void WebPageProxy::setPluginComplexTextInputState(uint64_t pluginComplexTextInputIdentifier, uint64_t pluginComplexTextInputState)
</span><span class="cx"> {
</span><span class="cx"> MESSAGE_CHECK(isValidPluginComplexTextInputState(pluginComplexTextInputState));
</span><span class="cx">
</span><del>- m_pageClient->setPluginComplexTextInputState(pluginComplexTextInputIdentifier, static_cast<PluginComplexTextInputState>(pluginComplexTextInputState));
</del><ins>+ m_pageClient.setPluginComplexTextInputState(pluginComplexTextInputIdentifier, static_cast<PluginComplexTextInputState>(pluginComplexTextInputState));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void WebPageProxy::executeSavedCommandBySelector(const String& selector, bool& handled)
</span><span class="cx"> {
</span><span class="cx"> MESSAGE_CHECK(isValidKeypressCommandName(selector));
</span><span class="cx">
</span><del>- handled = m_pageClient->executeSavedCommandBySelector(selector);
</del><ins>+ handled = m_pageClient.executeSavedCommandBySelector(selector);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> bool WebPageProxy::shouldDelayWindowOrderingForEvent(const WebKit::WebMouseEvent& event)
</span><span class="lines">@@ -496,17 +496,17 @@
</span><span class="cx">
</span><span class="cx"> WKView* WebPageProxy::wkView() const
</span><span class="cx"> {
</span><del>- return m_pageClient->wkView();
</del><ins>+ return m_pageClient.wkView();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void WebPageProxy::intrinsicContentSizeDidChange(const IntSize& intrinsicContentSize)
</span><span class="cx"> {
</span><del>- m_pageClient->intrinsicContentSizeDidChange(intrinsicContentSize);
</del><ins>+ m_pageClient.intrinsicContentSizeDidChange(intrinsicContentSize);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void WebPageProxy::setAcceleratedCompositingRootLayer(PlatformLayer* rootLayer)
</span><span class="cx"> {
</span><del>- m_pageClient->setAcceleratedCompositingRootLayer(rootLayer);
</del><ins>+ m_pageClient.setAcceleratedCompositingRootLayer(rootLayer);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> static NSString *temporaryPDFDirectoryPath()
</span></span></pre>
</div>
</div>
</body>
</html>