<!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>[159903] 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/159903">159903</a></dd>
<dt>Author</dt> <dd>weinig@apple.com</dd>
<dt>Date</dt> <dd>2013-12-01 16:50:16 -0800 (Sun, 01 Dec 2013)</dd>
</dl>
<h3>Log Message</h3>
<pre>[CTTE] The WebPageProxy's WebProcessProxy is never null so it should be stored in a Ref
https://bugs.webkit.org/show_bug.cgi?id=125047
Reviewed by Dan Bernstein.
* UIProcess/API/C/WKPage.cpp:
* UIProcess/API/C/mac/WKPagePrivateMac.cpp:
* UIProcess/API/Cocoa/WKBrowsingContextController.mm:
* UIProcess/API/mac/WKView.mm:
* UIProcess/Downloads/DownloadProxy.cpp:
* UIProcess/Downloads/DownloadProxy.h:
* UIProcess/Downloads/DownloadProxyMap.cpp:
* UIProcess/Downloads/DownloadProxyMap.h:
* UIProcess/DrawingAreaProxy.cpp:
* UIProcess/GeolocationPermissionRequestManagerProxy.cpp:
* UIProcess/Network/NetworkProcessProxy.cpp:
* UIProcess/Network/NetworkProcessProxy.h:
* UIProcess/Notifications/NotificationPermissionRequestManagerProxy.cpp:
* UIProcess/Notifications/WebNotificationManagerProxy.cpp:
* UIProcess/WebContext.cpp:
* UIProcess/WebContext.h:
* UIProcess/WebEditCommandProxy.cpp:
* UIProcess/WebFrameProxy.cpp:
* UIProcess/WebFullScreenManagerProxy.cpp:
* UIProcess/WebInspectorProxy.cpp:
* UIProcess/WebPageGroup.h:
* UIProcess/WebPageProxy.cpp:
* UIProcess/WebPageProxy.h:
* UIProcess/WebProcessProxy.cpp:
* UIProcess/WebProcessProxy.h:
* UIProcess/cf/WebPageProxyCF.cpp:
* UIProcess/mac/RemoteLayerTreeDrawingAreaProxy.mm:
* UIProcess/mac/RemoteLayerTreeHost.mm:
* UIProcess/mac/TiledCoreAnimationDrawingAreaProxy.mm:
* UIProcess/mac/WebFullScreenManagerProxyMac.mm:
* UIProcess/mac/WebInspectorProxyMac.mm:
* UIProcess/mac/WebPageProxyMac.mm:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeLog</a></li>
<li><a href="#trunkSourceWebKit2UIProcessAPICWKPagecpp">trunk/Source/WebKit2/UIProcess/API/C/WKPage.cpp</a></li>
<li><a href="#trunkSourceWebKit2UIProcessAPICmacWKPagePrivateMaccpp">trunk/Source/WebKit2/UIProcess/API/C/mac/WKPagePrivateMac.cpp</a></li>
<li><a href="#trunkSourceWebKit2UIProcessAPICocoaWKBrowsingContextControllermm">trunk/Source/WebKit2/UIProcess/API/Cocoa/WKBrowsingContextController.mm</a></li>
<li><a href="#trunkSourceWebKit2UIProcessAPImacWKViewmm">trunk/Source/WebKit2/UIProcess/API/mac/WKView.mm</a></li>
<li><a href="#trunkSourceWebKit2UIProcessDownloadsDownloadProxycpp">trunk/Source/WebKit2/UIProcess/Downloads/DownloadProxy.cpp</a></li>
<li><a href="#trunkSourceWebKit2UIProcessDownloadsDownloadProxyh">trunk/Source/WebKit2/UIProcess/Downloads/DownloadProxy.h</a></li>
<li><a href="#trunkSourceWebKit2UIProcessDownloadsDownloadProxyMapcpp">trunk/Source/WebKit2/UIProcess/Downloads/DownloadProxyMap.cpp</a></li>
<li><a href="#trunkSourceWebKit2UIProcessDownloadsDownloadProxyMaph">trunk/Source/WebKit2/UIProcess/Downloads/DownloadProxyMap.h</a></li>
<li><a href="#trunkSourceWebKit2UIProcessDrawingAreaProxycpp">trunk/Source/WebKit2/UIProcess/DrawingAreaProxy.cpp</a></li>
<li><a href="#trunkSourceWebKit2UIProcessGeolocationPermissionRequestManagerProxycpp">trunk/Source/WebKit2/UIProcess/GeolocationPermissionRequestManagerProxy.cpp</a></li>
<li><a href="#trunkSourceWebKit2UIProcessNetworkNetworkProcessProxycpp">trunk/Source/WebKit2/UIProcess/Network/NetworkProcessProxy.cpp</a></li>
<li><a href="#trunkSourceWebKit2UIProcessNetworkNetworkProcessProxyh">trunk/Source/WebKit2/UIProcess/Network/NetworkProcessProxy.h</a></li>
<li><a href="#trunkSourceWebKit2UIProcessNotificationsNotificationPermissionRequestManagerProxycpp">trunk/Source/WebKit2/UIProcess/Notifications/NotificationPermissionRequestManagerProxy.cpp</a></li>
<li><a href="#trunkSourceWebKit2UIProcessNotificationsWebNotificationManagerProxycpp">trunk/Source/WebKit2/UIProcess/Notifications/WebNotificationManagerProxy.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="#trunkSourceWebKit2UIProcessWebEditCommandProxycpp">trunk/Source/WebKit2/UIProcess/WebEditCommandProxy.cpp</a></li>
<li><a href="#trunkSourceWebKit2UIProcessWebFrameProxycpp">trunk/Source/WebKit2/UIProcess/WebFrameProxy.cpp</a></li>
<li><a href="#trunkSourceWebKit2UIProcessWebFullScreenManagerProxycpp">trunk/Source/WebKit2/UIProcess/WebFullScreenManagerProxy.cpp</a></li>
<li><a href="#trunkSourceWebKit2UIProcessWebInspectorProxycpp">trunk/Source/WebKit2/UIProcess/WebInspectorProxy.cpp</a></li>
<li><a href="#trunkSourceWebKit2UIProcessWebPageGrouph">trunk/Source/WebKit2/UIProcess/WebPageGroup.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="#trunkSourceWebKit2UIProcesscfWebPageProxyCFcpp">trunk/Source/WebKit2/UIProcess/cf/WebPageProxyCF.cpp</a></li>
<li><a href="#trunkSourceWebKit2UIProcessmacRemoteLayerTreeDrawingAreaProxymm">trunk/Source/WebKit2/UIProcess/mac/RemoteLayerTreeDrawingAreaProxy.mm</a></li>
<li><a href="#trunkSourceWebKit2UIProcessmacRemoteLayerTreeHostmm">trunk/Source/WebKit2/UIProcess/mac/RemoteLayerTreeHost.mm</a></li>
<li><a href="#trunkSourceWebKit2UIProcessmacTiledCoreAnimationDrawingAreaProxymm">trunk/Source/WebKit2/UIProcess/mac/TiledCoreAnimationDrawingAreaProxy.mm</a></li>
<li><a href="#trunkSourceWebKit2UIProcessmacWebFullScreenManagerProxyMacmm">trunk/Source/WebKit2/UIProcess/mac/WebFullScreenManagerProxyMac.mm</a></li>
<li><a href="#trunkSourceWebKit2UIProcessmacWebInspectorProxyMacmm">trunk/Source/WebKit2/UIProcess/mac/WebInspectorProxyMac.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 (159902 => 159903)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2013-12-02 00:50:07 UTC (rev 159902)
+++ trunk/Source/WebKit2/ChangeLog 2013-12-02 00:50:16 UTC (rev 159903)
</span><span class="lines">@@ -1,3 +1,43 @@
</span><ins>+2013-12-01 Sam Weinig <sam@webkit.org>
+
+ [CTTE] The WebPageProxy's WebProcessProxy is never null so it should be stored in a Ref
+ https://bugs.webkit.org/show_bug.cgi?id=125047
+
+ Reviewed by Dan Bernstein.
+
+ * UIProcess/API/C/WKPage.cpp:
+ * UIProcess/API/C/mac/WKPagePrivateMac.cpp:
+ * UIProcess/API/Cocoa/WKBrowsingContextController.mm:
+ * UIProcess/API/mac/WKView.mm:
+ * UIProcess/Downloads/DownloadProxy.cpp:
+ * UIProcess/Downloads/DownloadProxy.h:
+ * UIProcess/Downloads/DownloadProxyMap.cpp:
+ * UIProcess/Downloads/DownloadProxyMap.h:
+ * UIProcess/DrawingAreaProxy.cpp:
+ * UIProcess/GeolocationPermissionRequestManagerProxy.cpp:
+ * UIProcess/Network/NetworkProcessProxy.cpp:
+ * UIProcess/Network/NetworkProcessProxy.h:
+ * UIProcess/Notifications/NotificationPermissionRequestManagerProxy.cpp:
+ * UIProcess/Notifications/WebNotificationManagerProxy.cpp:
+ * UIProcess/WebContext.cpp:
+ * UIProcess/WebContext.h:
+ * UIProcess/WebEditCommandProxy.cpp:
+ * UIProcess/WebFrameProxy.cpp:
+ * UIProcess/WebFullScreenManagerProxy.cpp:
+ * UIProcess/WebInspectorProxy.cpp:
+ * UIProcess/WebPageGroup.h:
+ * UIProcess/WebPageProxy.cpp:
+ * UIProcess/WebPageProxy.h:
+ * UIProcess/WebProcessProxy.cpp:
+ * UIProcess/WebProcessProxy.h:
+ * UIProcess/cf/WebPageProxyCF.cpp:
+ * UIProcess/mac/RemoteLayerTreeDrawingAreaProxy.mm:
+ * UIProcess/mac/RemoteLayerTreeHost.mm:
+ * UIProcess/mac/TiledCoreAnimationDrawingAreaProxy.mm:
+ * UIProcess/mac/WebFullScreenManagerProxyMac.mm:
+ * UIProcess/mac/WebInspectorProxyMac.mm:
+ * UIProcess/mac/WebPageProxyMac.mm:
+
</ins><span class="cx"> 2013-12-01 Ryuan Choi <ryuan.choi@samsung.com>
</span><span class="cx">
</span><span class="cx"> [EFL][CoordinatedGraphics] Clear m_contentsSize when new contents are loaded
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPICWKPagecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/API/C/WKPage.cpp (159902 => 159903)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/C/WKPage.cpp 2013-12-02 00:50:07 UTC (rev 159902)
+++ trunk/Source/WebKit2/UIProcess/API/C/WKPage.cpp 2013-12-02 00:50:16 UTC (rev 159903)
</span><span class="lines">@@ -55,7 +55,7 @@
</span><span class="cx">
</span><span class="cx"> WKContextRef WKPageGetContext(WKPageRef pageRef)
</span><span class="cx"> {
</span><del>- return toAPI(toImpl(pageRef)->process()->context());
</del><ins>+ return toAPI(&toImpl(pageRef)->process().context());
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> WKPageGroupRef WKPageGetPageGroup(WKPageRef pageRef)
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPICmacWKPagePrivateMaccpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/API/C/mac/WKPagePrivateMac.cpp (159902 => 159903)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/C/mac/WKPagePrivateMac.cpp 2013-12-02 00:50:07 UTC (rev 159902)
+++ trunk/Source/WebKit2/UIProcess/API/C/mac/WKPagePrivateMac.cpp 2013-12-02 00:50:16 UTC (rev 159903)
</span><span class="lines">@@ -44,5 +44,5 @@
</span><span class="cx"> WebPageProxy* webPageProxy = toImpl(page);
</span><span class="cx"> bool privateBrowsingEnabled = webPageProxy->pageGroup().preferences()->privateBrowsingEnabled();
</span><span class="cx">
</span><del>- return webPageProxy->process()->context()->isURLKnownHSTSHost(toImpl(url)->string(), privateBrowsingEnabled);
</del><ins>+ return webPageProxy->process().context().isURLKnownHSTSHost(toImpl(url)->string(), privateBrowsingEnabled);
</ins><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPICocoaWKBrowsingContextControllermm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/API/Cocoa/WKBrowsingContextController.mm (159902 => 159903)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/Cocoa/WKBrowsingContextController.mm 2013-12-02 00:50:07 UTC (rev 159902)
+++ trunk/Source/WebKit2/UIProcess/API/Cocoa/WKBrowsingContextController.mm 2013-12-02 00:50:16 UTC (rev 159903)
</span><span class="lines">@@ -113,10 +113,7 @@
</span><span class="cx">
</span><span class="cx"> - (WKProcessGroup *)processGroup
</span><span class="cx"> {
</span><del>- WebContext* context = _page->process()->context();
- if (!context)
- return nil;
- return wrapper(*context);
</del><ins>+ return wrapper(_page->process().context());
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> - (WKBrowsingContextGroup *)browsingContextGroup
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPImacWKViewmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/API/mac/WKView.mm (159902 => 159903)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/mac/WKView.mm 2013-12-02 00:50:07 UTC (rev 159902)
+++ trunk/Source/WebKit2/UIProcess/API/mac/WKView.mm 2013-12-02 00:50:16 UTC (rev 159903)
</span><span class="lines">@@ -916,7 +916,7 @@
</span><span class="cx"> bool spellCheckingEnabled = !TextChecker::state().isContinuousSpellCheckingEnabled;
</span><span class="cx"> TextChecker::setContinuousSpellCheckingEnabled(spellCheckingEnabled);
</span><span class="cx">
</span><del>- _data->_page->process()->updateTextCheckerState();
</del><ins>+ _data->_page->process().updateTextCheckerState();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> - (BOOL)isGrammarCheckingEnabled
</span><span class="lines">@@ -930,7 +930,7 @@
</span><span class="cx"> return;
</span><span class="cx">
</span><span class="cx"> TextChecker::setGrammarCheckingEnabled(flag);
</span><del>- _data->_page->process()->updateTextCheckerState();
</del><ins>+ _data->_page->process().updateTextCheckerState();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> - (IBAction)toggleGrammarChecking:(id)sender
</span><span class="lines">@@ -938,14 +938,14 @@
</span><span class="cx"> bool grammarCheckingEnabled = !TextChecker::state().isGrammarCheckingEnabled;
</span><span class="cx"> TextChecker::setGrammarCheckingEnabled(grammarCheckingEnabled);
</span><span class="cx">
</span><del>- _data->_page->process()->updateTextCheckerState();
</del><ins>+ _data->_page->process().updateTextCheckerState();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> - (IBAction)toggleAutomaticSpellingCorrection:(id)sender
</span><span class="cx"> {
</span><span class="cx"> TextChecker::setAutomaticSpellingCorrectionEnabled(!TextChecker::state().isAutomaticSpellingCorrectionEnabled);
</span><span class="cx">
</span><del>- _data->_page->process()->updateTextCheckerState();
</del><ins>+ _data->_page->process().updateTextCheckerState();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> - (void)orderFrontSubstitutionsPanel:(id)sender
</span><span class="lines">@@ -980,13 +980,13 @@
</span><span class="cx"> return;
</span><span class="cx">
</span><span class="cx"> TextChecker::setAutomaticQuoteSubstitutionEnabled(flag);
</span><del>- _data->_page->process()->updateTextCheckerState();
</del><ins>+ _data->_page->process().updateTextCheckerState();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> - (void)toggleAutomaticQuoteSubstitution:(id)sender
</span><span class="cx"> {
</span><span class="cx"> TextChecker::setAutomaticQuoteSubstitutionEnabled(!TextChecker::state().isAutomaticQuoteSubstitutionEnabled);
</span><del>- _data->_page->process()->updateTextCheckerState();
</del><ins>+ _data->_page->process().updateTextCheckerState();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> - (BOOL)isAutomaticDashSubstitutionEnabled
</span><span class="lines">@@ -1000,13 +1000,13 @@
</span><span class="cx"> return;
</span><span class="cx">
</span><span class="cx"> TextChecker::setAutomaticDashSubstitutionEnabled(flag);
</span><del>- _data->_page->process()->updateTextCheckerState();
</del><ins>+ _data->_page->process().updateTextCheckerState();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> - (void)toggleAutomaticDashSubstitution:(id)sender
</span><span class="cx"> {
</span><span class="cx"> TextChecker::setAutomaticDashSubstitutionEnabled(!TextChecker::state().isAutomaticDashSubstitutionEnabled);
</span><del>- _data->_page->process()->updateTextCheckerState();
</del><ins>+ _data->_page->process().updateTextCheckerState();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> - (BOOL)isAutomaticLinkDetectionEnabled
</span><span class="lines">@@ -1020,13 +1020,13 @@
</span><span class="cx"> return;
</span><span class="cx">
</span><span class="cx"> TextChecker::setAutomaticLinkDetectionEnabled(flag);
</span><del>- _data->_page->process()->updateTextCheckerState();
</del><ins>+ _data->_page->process().updateTextCheckerState();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> - (void)toggleAutomaticLinkDetection:(id)sender
</span><span class="cx"> {
</span><span class="cx"> TextChecker::setAutomaticLinkDetectionEnabled(!TextChecker::state().isAutomaticLinkDetectionEnabled);
</span><del>- _data->_page->process()->updateTextCheckerState();
</del><ins>+ _data->_page->process().updateTextCheckerState();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> - (BOOL)isAutomaticTextReplacementEnabled
</span><span class="lines">@@ -1040,13 +1040,13 @@
</span><span class="cx"> return;
</span><span class="cx">
</span><span class="cx"> TextChecker::setAutomaticTextReplacementEnabled(flag);
</span><del>- _data->_page->process()->updateTextCheckerState();
</del><ins>+ _data->_page->process().updateTextCheckerState();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> - (void)toggleAutomaticTextReplacement:(id)sender
</span><span class="cx"> {
</span><span class="cx"> TextChecker::setAutomaticTextReplacementEnabled(!TextChecker::state().isAutomaticTextReplacementEnabled);
</span><del>- _data->_page->process()->updateTextCheckerState();
</del><ins>+ _data->_page->process().updateTextCheckerState();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> - (void)uppercaseWord:(id)sender
</span><span class="lines">@@ -1820,7 +1820,7 @@
</span><span class="cx"> SandboxExtension::Handle sandboxExtensionHandle;
</span><span class="cx"> bool createdExtension = maybeCreateSandboxExtensionFromPasteboard([draggingInfo draggingPasteboard], sandboxExtensionHandle);
</span><span class="cx"> if (createdExtension)
</span><del>- _data->_page->process()->willAcquireUniversalFileReadSandboxExtension();
</del><ins>+ _data->_page->process().willAcquireUniversalFileReadSandboxExtension();
</ins><span class="cx">
</span><span class="cx"> SandboxExtension::HandleArray sandboxExtensionForUpload;
</span><span class="cx"> createSandboxExtensionsForFileUpload([draggingInfo draggingPasteboard], sandboxExtensionForUpload);
</span><span class="lines">@@ -2095,8 +2095,8 @@
</span><span class="cx"> // needs to be updated with the pid of the remote process. If the process is going
</span><span class="cx"> // away, that information is not present in WebProcess
</span><span class="cx"> pid_t pid = 0;
</span><del>- if (registerProcess && _data->_page->process())
- pid = _data->_page->process()->processIdentifier();
</del><ins>+ if (registerProcess)
+ pid = _data->_page->process().processIdentifier();
</ins><span class="cx"> else if (!registerProcess) {
</span><span class="cx"> pid = WKAXRemoteProcessIdentifier(_data->_remoteAccessibilityChild.get());
</span><span class="cx"> _data->_remoteAccessibilityChild = nil;
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessDownloadsDownloadProxycpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/Downloads/DownloadProxy.cpp (159902 => 159903)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/Downloads/DownloadProxy.cpp 2013-12-02 00:50:07 UTC (rev 159902)
+++ trunk/Source/WebKit2/UIProcess/Downloads/DownloadProxy.cpp 2013-12-02 00:50:16 UTC (rev 159903)
</span><span class="lines">@@ -50,14 +50,14 @@
</span><span class="cx"> return ++uniqueDownloadID;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-PassRefPtr<DownloadProxy> DownloadProxy::create(DownloadProxyMap& downloadProxyMap, WebContext* webContext)
</del><ins>+PassRefPtr<DownloadProxy> DownloadProxy::create(DownloadProxyMap& downloadProxyMap, WebContext& webContext)
</ins><span class="cx"> {
</span><span class="cx"> return adoptRef(new DownloadProxy(downloadProxyMap, webContext));
</span><span class="cx"> }
</span><span class="cx">
</span><del>-DownloadProxy::DownloadProxy(DownloadProxyMap& downloadProxyMap, WebContext* webContext)
</del><ins>+DownloadProxy::DownloadProxy(DownloadProxyMap& downloadProxyMap, WebContext& webContext)
</ins><span class="cx"> : m_downloadProxyMap(downloadProxyMap)
</span><del>- , m_webContext(webContext)
</del><ins>+ , m_webContext(&webContext)
</ins><span class="cx"> , m_downloadID(generateDownloadID())
</span><span class="cx"> {
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessDownloadsDownloadProxyh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/Downloads/DownloadProxy.h (159902 => 159903)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/Downloads/DownloadProxy.h 2013-12-02 00:50:07 UTC (rev 159902)
+++ trunk/Source/WebKit2/UIProcess/Downloads/DownloadProxy.h 2013-12-02 00:50:16 UTC (rev 159903)
</span><span class="lines">@@ -48,7 +48,7 @@
</span><span class="cx">
</span><span class="cx"> class DownloadProxy : public API::TypedObject<API::Object::Type::Download>, public CoreIPC::MessageReceiver {
</span><span class="cx"> public:
</span><del>- static PassRefPtr<DownloadProxy> create(DownloadProxyMap&, WebContext*);
</del><ins>+ static PassRefPtr<DownloadProxy> create(DownloadProxyMap&, WebContext&);
</ins><span class="cx"> ~DownloadProxy();
</span><span class="cx">
</span><span class="cx"> uint64_t downloadID() const { return m_downloadID; }
</span><span class="lines">@@ -64,7 +64,7 @@
</span><span class="cx"> void didReceiveSyncDownloadProxyMessage(CoreIPC::Connection*, CoreIPC::MessageDecoder&, std::unique_ptr<CoreIPC::MessageEncoder>&);
</span><span class="cx">
</span><span class="cx"> private:
</span><del>- explicit DownloadProxy(DownloadProxyMap&, WebContext*);
</del><ins>+ explicit DownloadProxy(DownloadProxyMap&, WebContext&);
</ins><span class="cx">
</span><span class="cx"> // CoreIPC::MessageReceiver
</span><span class="cx"> virtual void didReceiveMessage(CoreIPC::Connection*, CoreIPC::MessageDecoder&) OVERRIDE;
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessDownloadsDownloadProxyMapcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/Downloads/DownloadProxyMap.cpp (159902 => 159903)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/Downloads/DownloadProxyMap.cpp 2013-12-02 00:50:07 UTC (rev 159902)
+++ trunk/Source/WebKit2/UIProcess/Downloads/DownloadProxyMap.cpp 2013-12-02 00:50:16 UTC (rev 159903)
</span><span class="lines">@@ -44,7 +44,7 @@
</span><span class="cx"> ASSERT(m_downloads.isEmpty());
</span><span class="cx"> }
</span><span class="cx">
</span><del>-DownloadProxy* DownloadProxyMap::createDownloadProxy(WebContext* webContext)
</del><ins>+DownloadProxy* DownloadProxyMap::createDownloadProxy(WebContext& webContext)
</ins><span class="cx"> {
</span><span class="cx"> RefPtr<DownloadProxy> downloadProxy = DownloadProxy::create(*this, webContext);
</span><span class="cx"> m_downloads.set(downloadProxy->downloadID(), downloadProxy);
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessDownloadsDownloadProxyMaph"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/Downloads/DownloadProxyMap.h (159902 => 159903)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/Downloads/DownloadProxyMap.h 2013-12-02 00:50:07 UTC (rev 159902)
+++ trunk/Source/WebKit2/UIProcess/Downloads/DownloadProxyMap.h 2013-12-02 00:50:16 UTC (rev 159903)
</span><span class="lines">@@ -43,7 +43,7 @@
</span><span class="cx"> explicit DownloadProxyMap(ChildProcessProxy*);
</span><span class="cx"> ~DownloadProxyMap();
</span><span class="cx">
</span><del>- DownloadProxy* createDownloadProxy(WebContext*);
</del><ins>+ DownloadProxy* createDownloadProxy(WebContext&);
</ins><span class="cx"> void downloadFinished(DownloadProxy*);
</span><span class="cx">
</span><span class="cx"> bool isEmpty() const { return m_downloads.isEmpty(); }
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessDrawingAreaProxycpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/DrawingAreaProxy.cpp (159902 => 159903)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/DrawingAreaProxy.cpp 2013-12-02 00:50:07 UTC (rev 159902)
+++ trunk/Source/WebKit2/UIProcess/DrawingAreaProxy.cpp 2013-12-02 00:50:16 UTC (rev 159903)
</span><span class="lines">@@ -41,12 +41,12 @@
</span><span class="cx"> , m_webPageProxy(webPageProxy)
</span><span class="cx"> , m_size(webPageProxy->viewSize())
</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(), 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></pre></div>
<a id="trunkSourceWebKit2UIProcessGeolocationPermissionRequestManagerProxycpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/GeolocationPermissionRequestManagerProxy.cpp (159902 => 159903)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/GeolocationPermissionRequestManagerProxy.cpp 2013-12-02 00:50:07 UTC (rev 159902)
+++ trunk/Source/WebKit2/UIProcess/GeolocationPermissionRequestManagerProxy.cpp 2013-12-02 00:50:16 UTC (rev 159903)
</span><span class="lines">@@ -62,7 +62,7 @@
</span><span class="cx"> return;
</span><span class="cx">
</span><span class="cx"> #if ENABLE(GEOLOCATION)
</span><del>- m_page.process()->send(Messages::WebPage::DidReceiveGeolocationPermissionDecision(geolocationID, allowed), m_page.pageID());
</del><ins>+ m_page.process().send(Messages::WebPage::DidReceiveGeolocationPermissionDecision(geolocationID, allowed), m_page.pageID());
</ins><span class="cx"> #else
</span><span class="cx"> UNUSED_PARAM(allowed);
</span><span class="cx"> #endif
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessNetworkNetworkProcessProxycpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/Network/NetworkProcessProxy.cpp (159902 => 159903)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/Network/NetworkProcessProxy.cpp 2013-12-02 00:50:07 UTC (rev 159902)
+++ trunk/Source/WebKit2/UIProcess/Network/NetworkProcessProxy.cpp 2013-12-02 00:50:16 UTC (rev 159903)
</span><span class="lines">@@ -47,12 +47,12 @@
</span><span class="cx">
</span><span class="cx"> namespace WebKit {
</span><span class="cx">
</span><del>-PassRefPtr<NetworkProcessProxy> NetworkProcessProxy::create(WebContext* webContext)
</del><ins>+PassRefPtr<NetworkProcessProxy> NetworkProcessProxy::create(WebContext& webContext)
</ins><span class="cx"> {
</span><span class="cx"> return adoptRef(new NetworkProcessProxy(webContext));
</span><span class="cx"> }
</span><span class="cx">
</span><del>-NetworkProcessProxy::NetworkProcessProxy(WebContext* webContext)
</del><ins>+NetworkProcessProxy::NetworkProcessProxy(WebContext& webContext)
</ins><span class="cx"> : m_webContext(webContext)
</span><span class="cx"> , m_numPendingConnectionRequests(0)
</span><span class="cx"> #if ENABLE(CUSTOM_PROTOCOLS)
</span><span class="lines">@@ -117,7 +117,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> // Tell the network process manager to forget about this network process proxy. This may cause us to be deleted.
</span><del>- m_webContext->networkProcessCrashed(this);
</del><ins>+ m_webContext.networkProcessCrashed(this);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void NetworkProcessProxy::didReceiveMessage(CoreIPC::Connection* connection, CoreIPC::MessageDecoder& decoder)
</span><span class="lines">@@ -125,7 +125,7 @@
</span><span class="cx"> if (dispatchMessage(connection, decoder))
</span><span class="cx"> return;
</span><span class="cx">
</span><del>- if (m_webContext->dispatchMessage(connection, decoder))
</del><ins>+ if (m_webContext.dispatchMessage(connection, decoder))
</ins><span class="cx"> return;
</span><span class="cx">
</span><span class="cx"> didReceiveNetworkProcessProxyMessage(connection, decoder);
</span><span class="lines">@@ -190,7 +190,7 @@
</span><span class="cx"> m_numPendingConnectionRequests = 0;
</span><span class="cx">
</span><span class="cx"> #if PLATFORM(MAC)
</span><del>- if (m_webContext->canEnableProcessSuppressionForNetworkProcess())
</del><ins>+ if (m_webContext.canEnableProcessSuppressionForNetworkProcess())
</ins><span class="cx"> setProcessSuppressionEnabled(true);
</span><span class="cx"> #endif
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessNetworkNetworkProcessProxyh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/Network/NetworkProcessProxy.h (159902 => 159903)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/Network/NetworkProcessProxy.h 2013-12-02 00:50:07 UTC (rev 159902)
+++ trunk/Source/WebKit2/UIProcess/Network/NetworkProcessProxy.h 2013-12-02 00:50:16 UTC (rev 159903)
</span><span class="lines">@@ -50,7 +50,7 @@
</span><span class="cx">
</span><span class="cx"> class NetworkProcessProxy : public ChildProcessProxy {
</span><span class="cx"> public:
</span><del>- static PassRefPtr<NetworkProcessProxy> create(WebContext*);
</del><ins>+ static PassRefPtr<NetworkProcessProxy> create(WebContext&);
</ins><span class="cx"> ~NetworkProcessProxy();
</span><span class="cx">
</span><span class="cx"> void getNetworkProcessConnection(PassRefPtr<Messages::WebProcessProxy::GetNetworkProcessConnection::DelayedReply>);
</span><span class="lines">@@ -62,7 +62,7 @@
</span><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> private:
</span><del>- NetworkProcessProxy(WebContext*);
</del><ins>+ NetworkProcessProxy(WebContext&);
</ins><span class="cx">
</span><span class="cx"> // ChildProcessProxy
</span><span class="cx"> virtual void getLaunchOptions(ProcessLauncher::LaunchOptions&) OVERRIDE;
</span><span class="lines">@@ -86,7 +86,7 @@
</span><span class="cx"> // ProcessLauncher::Client
</span><span class="cx"> virtual void didFinishLaunching(ProcessLauncher*, CoreIPC::Connection::Identifier);
</span><span class="cx">
</span><del>- WebContext* m_webContext;
</del><ins>+ WebContext& m_webContext;
</ins><span class="cx">
</span><span class="cx"> unsigned m_numPendingConnectionRequests;
</span><span class="cx"> Deque<RefPtr<Messages::WebProcessProxy::GetNetworkProcessConnection::DelayedReply>> m_pendingConnectionReplies;
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessNotificationsNotificationPermissionRequestManagerProxycpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/Notifications/NotificationPermissionRequestManagerProxy.cpp (159902 => 159903)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/Notifications/NotificationPermissionRequestManagerProxy.cpp 2013-12-02 00:50:07 UTC (rev 159902)
+++ trunk/Source/WebKit2/UIProcess/Notifications/NotificationPermissionRequestManagerProxy.cpp 2013-12-02 00:50:16 UTC (rev 159903)
</span><span class="lines">@@ -62,7 +62,7 @@
</span><span class="cx"> if (!request)
</span><span class="cx"> return;
</span><span class="cx">
</span><del>- m_page.process()->send(Messages::WebPage::DidReceiveNotificationPermissionDecision(notificationID, allow), m_page.pageID());
</del><ins>+ m_page.process().send(Messages::WebPage::DidReceiveNotificationPermissionDecision(notificationID, allow), m_page.pageID());
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> } // namespace WebKit
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessNotificationsWebNotificationManagerProxycpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/Notifications/WebNotificationManagerProxy.cpp (159902 => 159903)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/Notifications/WebNotificationManagerProxy.cpp 2013-12-02 00:50:07 UTC (rev 159902)
+++ trunk/Source/WebKit2/UIProcess/Notifications/WebNotificationManagerProxy.cpp 2013-12-02 00:50:16 UTC (rev 159903)
</span><span class="lines">@@ -183,7 +183,7 @@
</span><span class="cx"> return;
</span><span class="cx">
</span><span class="cx"> uint64_t pageNotificationID = it->value.second;
</span><del>- webPage->process()->send(Messages::WebNotificationManager::DidShowNotification(pageNotificationID), 0);
</del><ins>+ webPage->process().send(Messages::WebNotificationManager::DidShowNotification(pageNotificationID), 0);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void WebNotificationManagerProxy::providerDidClickNotification(uint64_t globalNotificationID)
</span><span class="lines">@@ -198,7 +198,7 @@
</span><span class="cx"> return;
</span><span class="cx">
</span><span class="cx"> uint64_t pageNotificationID = it->value.second;
</span><del>- webPage->process()->send(Messages::WebNotificationManager::DidClickNotification(pageNotificationID), 0);
</del><ins>+ webPage->process().send(Messages::WebNotificationManager::DidClickNotification(pageNotificationID), 0);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx">
</span><span class="lines">@@ -229,7 +229,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> for (auto it = pageNotificationIDs.begin(), end = pageNotificationIDs.end(); it != end; ++it)
</span><del>- it->key->process()->send(Messages::WebNotificationManager::DidCloseNotifications(it->value), 0);
</del><ins>+ it->key->process().send(Messages::WebNotificationManager::DidCloseNotifications(it->value), 0);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void WebNotificationManagerProxy::providerDidUpdateNotificationPolicy(const WebSecurityOrigin* origin, bool allowed)
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessWebContextcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/WebContext.cpp (159902 => 159903)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/WebContext.cpp 2013-12-02 00:50:07 UTC (rev 159902)
+++ trunk/Source/WebKit2/UIProcess/WebContext.cpp 2013-12-02 00:50:16 UTC (rev 159903)
</span><span class="lines">@@ -370,7 +370,7 @@
</span><span class="cx"> if (m_networkProcess)
</span><span class="cx"> return;
</span><span class="cx">
</span><del>- m_networkProcess = NetworkProcessProxy::create(this);
</del><ins>+ m_networkProcess = NetworkProcessProxy::create(*this);
</ins><span class="cx">
</span><span class="cx"> NetworkProcessCreationParameters parameters;
</span><span class="cx">
</span><span class="lines">@@ -506,22 +506,22 @@
</span><span class="cx"> m_processWithPageCache = process;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-WebProcessProxy* WebContext::ensureSharedWebProcess()
</del><ins>+WebProcessProxy& WebContext::ensureSharedWebProcess()
</ins><span class="cx"> {
</span><span class="cx"> ASSERT(m_processModel == ProcessModelSharedSecondaryProcess);
</span><span class="cx"> if (m_processes.isEmpty())
</span><span class="cx"> createNewWebProcess();
</span><del>- return m_processes[0].get();
</del><ins>+ return *m_processes[0];
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-WebProcessProxy* WebContext::createNewWebProcess()
</del><ins>+WebProcessProxy& WebContext::createNewWebProcess()
</ins><span class="cx"> {
</span><span class="cx"> #if ENABLE(NETWORK_PROCESS)
</span><span class="cx"> if (m_usesNetworkProcess)
</span><span class="cx"> ensureNetworkProcess();
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>- RefPtr<WebProcessProxy> process = WebProcessProxy::create(this);
</del><ins>+ RefPtr<WebProcessProxy> process = WebProcessProxy::create(*this);
</ins><span class="cx">
</span><span class="cx"> WebProcessCreationParameters parameters;
</span><span class="cx">
</span><span class="lines">@@ -615,7 +615,7 @@
</span><span class="cx"> } else
</span><span class="cx"> ASSERT(m_messagesToInjectedBundlePostedToEmptyContext.isEmpty());
</span><span class="cx">
</span><del>- return process.get();
</del><ins>+ return *process;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void WebContext::warmInitialProcess()
</span><span class="lines">@@ -723,13 +723,13 @@
</span><span class="cx"> m_processes.remove(m_processes.find(process));
</span><span class="cx"> }
</span><span class="cx">
</span><del>-WebProcessProxy* WebContext::createNewWebProcessRespectingProcessCountLimit()
</del><ins>+WebProcessProxy& WebContext::createNewWebProcessRespectingProcessCountLimit()
</ins><span class="cx"> {
</span><span class="cx"> if (m_processes.size() < m_webProcessCountLimit)
</span><span class="cx"> return createNewWebProcess();
</span><span class="cx">
</span><span class="cx"> // Choose a process with fewest pages, to achieve flat distribution.
</span><del>- WebProcessProxy* result = 0;
</del><ins>+ WebProcessProxy* result = nullptr;
</ins><span class="cx"> unsigned fewestPagesSeen = UINT_MAX;
</span><span class="cx"> for (unsigned i = 0; i < m_processes.size(); ++i) {
</span><span class="cx"> if (fewestPagesSeen > m_processes[i]->pages().size()) {
</span><span class="lines">@@ -737,23 +737,23 @@
</span><span class="cx"> fewestPagesSeen = m_processes[i]->pages().size();
</span><span class="cx"> }
</span><span class="cx"> }
</span><del>- return result;
</del><ins>+ return *result;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> PassRefPtr<WebPageProxy> WebContext::createWebPage(PageClient& pageClient, WebPageGroup* pageGroup, WebPageProxy* relatedPage)
</span><span class="cx"> {
</span><span class="cx"> RefPtr<WebProcessProxy> process;
</span><span class="cx"> if (m_processModel == ProcessModelSharedSecondaryProcess) {
</span><del>- process = ensureSharedWebProcess();
</del><ins>+ process = &ensureSharedWebProcess();
</ins><span class="cx"> } else {
</span><span class="cx"> if (m_haveInitialEmptyProcess) {
</span><span class="cx"> process = m_processes.last();
</span><span class="cx"> m_haveInitialEmptyProcess = false;
</span><span class="cx"> } else if (relatedPage) {
</span><span class="cx"> // Sharing processes, e.g. when creating the page via window.open().
</span><del>- process = relatedPage->process();
</del><ins>+ process = &relatedPage->process();
</ins><span class="cx"> } else
</span><del>- process = createNewWebProcessRespectingProcessCountLimit();
</del><ins>+ process = &createNewWebProcessRespectingProcessCountLimit();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> return process->createWebPage(pageClient, pageGroup ? *pageGroup : m_defaultPageGroup.get());
</span><span class="lines">@@ -916,7 +916,7 @@
</span><span class="cx"> return m_networkProcess->createDownloadProxy();
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>- return ensureSharedWebProcess()->createDownloadProxy();
</del><ins>+ return ensureSharedWebProcess().createDownloadProxy();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void WebContext::addMessageReceiver(CoreIPC::StringReference messageReceiverName, CoreIPC::MessageReceiver* messageReceiver)
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessWebContexth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/WebContext.h (159902 => 159903)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/WebContext.h 2013-12-02 00:50:07 UTC (rev 159902)
+++ trunk/Source/WebKit2/UIProcess/WebContext.h 2013-12-02 00:50:16 UTC (rev 159903)
</span><span class="lines">@@ -242,8 +242,8 @@
</span><span class="cx">
</span><span class="cx"> void allowSpecificHTTPSCertificateForHost(const WebCertificateInfo*, const String& host);
</span><span class="cx">
</span><del>- WebProcessProxy* ensureSharedWebProcess();
- WebProcessProxy* createNewWebProcessRespectingProcessCountLimit(); // Will return an existing one if limit is met.
</del><ins>+ WebProcessProxy& ensureSharedWebProcess();
+ WebProcessProxy& createNewWebProcessRespectingProcessCountLimit(); // Will return an existing one if limit is met.
</ins><span class="cx"> void warmInitialProcess();
</span><span class="cx">
</span><span class="cx"> bool shouldTerminate(WebProcessProxy*);
</span><span class="lines">@@ -321,7 +321,7 @@
</span><span class="cx"> void platformInitializeWebProcess(WebProcessCreationParameters&);
</span><span class="cx"> void platformInvalidateContext();
</span><span class="cx">
</span><del>- WebProcessProxy* createNewWebProcess();
</del><ins>+ WebProcessProxy& createNewWebProcess();
</ins><span class="cx">
</span><span class="cx"> void requestWebContentStatistics(StatisticsRequest*);
</span><span class="cx"> void requestNetworkingStatistics(StatisticsRequest*);
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessWebEditCommandProxycpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/WebEditCommandProxy.cpp (159902 => 159903)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/WebEditCommandProxy.cpp 2013-12-02 00:50:07 UTC (rev 159902)
+++ trunk/Source/WebKit2/UIProcess/WebEditCommandProxy.cpp 2013-12-02 00:50:16 UTC (rev 159903)
</span><span class="lines">@@ -55,7 +55,7 @@
</span><span class="cx"> if (!m_page || !m_page->isValid())
</span><span class="cx"> return;
</span><span class="cx">
</span><del>- m_page->process()->send(Messages::WebPage::UnapplyEditCommand(m_commandID), m_page->pageID(), CoreIPC::DispatchMessageEvenWhenWaitingForSyncReply);
</del><ins>+ m_page->process().send(Messages::WebPage::UnapplyEditCommand(m_commandID), m_page->pageID(), CoreIPC::DispatchMessageEvenWhenWaitingForSyncReply);
</ins><span class="cx"> m_page->registerEditCommand(this, WebPageProxy::Redo);
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -64,7 +64,7 @@
</span><span class="cx"> if (!m_page || !m_page->isValid())
</span><span class="cx"> return;
</span><span class="cx">
</span><del>- m_page->process()->send(Messages::WebPage::ReapplyEditCommand(m_commandID), m_page->pageID(), CoreIPC::DispatchMessageEvenWhenWaitingForSyncReply);
</del><ins>+ m_page->process().send(Messages::WebPage::ReapplyEditCommand(m_commandID), m_page->pageID(), CoreIPC::DispatchMessageEvenWhenWaitingForSyncReply);
</ins><span class="cx"> m_page->registerEditCommand(this, WebPageProxy::Undo);
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessWebFrameProxycpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/WebFrameProxy.cpp (159902 => 159903)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/WebFrameProxy.cpp 2013-12-02 00:50:07 UTC (rev 159902)
+++ trunk/Source/WebKit2/UIProcess/WebFrameProxy.cpp 2013-12-02 00:50:16 UTC (rev 159903)
</span><span class="lines">@@ -78,7 +78,7 @@
</span><span class="cx"> if (!m_page)
</span><span class="cx"> return;
</span><span class="cx">
</span><del>- m_page->process()->send(Messages::WebPage::LoadURLInFrame(url, m_frameID), m_page->pageID());
</del><ins>+ m_page->process().send(Messages::WebPage::LoadURLInFrame(url, m_frameID), m_page->pageID());
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void WebFrameProxy::stopLoading() const
</span><span class="lines">@@ -89,7 +89,7 @@
</span><span class="cx"> if (!m_page->isValid())
</span><span class="cx"> return;
</span><span class="cx">
</span><del>- m_page->process()->send(Messages::WebPage::StopLoadingFrame(m_frameID), m_page->pageID());
</del><ins>+ m_page->process().send(Messages::WebPage::StopLoadingFrame(m_frameID), m_page->pageID());
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> bool WebFrameProxy::canProvideSource() const
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessWebFullScreenManagerProxycpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/WebFullScreenManagerProxy.cpp (159902 => 159903)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/WebFullScreenManagerProxy.cpp 2013-12-02 00:50:07 UTC (rev 159902)
+++ trunk/Source/WebKit2/UIProcess/WebFullScreenManagerProxy.cpp 2013-12-02 00:50:16 UTC (rev 159903)
</span><span class="lines">@@ -46,7 +46,7 @@
</span><span class="cx"> , m_hasRequestedFullScreen(false)
</span><span class="cx"> #endif
</span><span class="cx"> {
</span><del>- m_page->process()->addMessageReceiver(Messages::WebFullScreenManagerProxy::messageReceiverName(), m_page->pageID(), this);
</del><ins>+ m_page->process().addMessageReceiver(Messages::WebFullScreenManagerProxy::messageReceiverName(), m_page->pageID(), this);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> WebFullScreenManagerProxy::~WebFullScreenManagerProxy()
</span><span class="lines">@@ -60,32 +60,32 @@
</span><span class="cx">
</span><span class="cx"> void WebFullScreenManagerProxy::willEnterFullScreen()
</span><span class="cx"> {
</span><del>- m_page->process()->send(Messages::WebFullScreenManager::WillEnterFullScreen(), m_page->pageID());
</del><ins>+ m_page->process().send(Messages::WebFullScreenManager::WillEnterFullScreen(), m_page->pageID());
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void WebFullScreenManagerProxy::didEnterFullScreen()
</span><span class="cx"> {
</span><del>- m_page->process()->send(Messages::WebFullScreenManager::DidEnterFullScreen(), m_page->pageID());
</del><ins>+ m_page->process().send(Messages::WebFullScreenManager::DidEnterFullScreen(), m_page->pageID());
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void WebFullScreenManagerProxy::willExitFullScreen()
</span><span class="cx"> {
</span><del>- m_page->process()->send(Messages::WebFullScreenManager::WillExitFullScreen(), m_page->pageID());
</del><ins>+ m_page->process().send(Messages::WebFullScreenManager::WillExitFullScreen(), m_page->pageID());
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void WebFullScreenManagerProxy::didExitFullScreen()
</span><span class="cx"> {
</span><del>- m_page->process()->send(Messages::WebFullScreenManager::DidExitFullScreen(), m_page->pageID());
</del><ins>+ m_page->process().send(Messages::WebFullScreenManager::DidExitFullScreen(), m_page->pageID());
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void WebFullScreenManagerProxy::setAnimatingFullScreen(bool animating)
</span><span class="cx"> {
</span><del>- m_page->process()->send(Messages::WebFullScreenManager::SetAnimatingFullScreen(animating), m_page->pageID());
</del><ins>+ m_page->process().send(Messages::WebFullScreenManager::SetAnimatingFullScreen(animating), m_page->pageID());
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void WebFullScreenManagerProxy::requestExitFullScreen()
</span><span class="cx"> {
</span><del>- m_page->process()->send(Messages::WebFullScreenManager::RequestExitFullScreen(), m_page->pageID());
</del><ins>+ m_page->process().send(Messages::WebFullScreenManager::RequestExitFullScreen(), m_page->pageID());
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void WebFullScreenManagerProxy::supportsFullScreen(bool withKeyboard, bool& supports)
</span><span class="lines">@@ -95,12 +95,12 @@
</span><span class="cx">
</span><span class="cx"> void WebFullScreenManagerProxy::saveScrollPosition()
</span><span class="cx"> {
</span><del>- m_page->process()->send(Messages::WebFullScreenManager::SaveScrollPosition(), m_page->pageID());
</del><ins>+ m_page->process().send(Messages::WebFullScreenManager::SaveScrollPosition(), m_page->pageID());
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void WebFullScreenManagerProxy::restoreScrollPosition()
</span><span class="cx"> {
</span><del>- m_page->process()->send(Messages::WebFullScreenManager::RestoreScrollPosition(), m_page->pageID());
</del><ins>+ m_page->process().send(Messages::WebFullScreenManager::RestoreScrollPosition(), m_page->pageID());
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> } // namespace WebKit
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessWebInspectorProxycpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/WebInspectorProxy.cpp (159902 => 159903)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/WebInspectorProxy.cpp 2013-12-02 00:50:07 UTC (rev 159902)
+++ trunk/Source/WebKit2/UIProcess/WebInspectorProxy.cpp 2013-12-02 00:50:16 UTC (rev 159903)
</span><span class="lines">@@ -140,7 +140,7 @@
</span><span class="cx"> #endif
</span><span class="cx"> {
</span><span class="cx"> m_level = WebInspectorPageGroups::shared().inspectorLevel(m_page->pageGroup());
</span><del>- m_page->process()->addMessageReceiver(Messages::WebInspectorProxy::messageReceiverName(), m_page->pageID(), this);
</del><ins>+ m_page->process().addMessageReceiver(Messages::WebInspectorProxy::messageReceiverName(), m_page->pageID(), this);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> WebInspectorProxy::~WebInspectorProxy()
</span><span class="lines">@@ -159,7 +159,7 @@
</span><span class="cx"> WebInspectorServer::shared().unregisterPage(m_remoteInspectionPageId);
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>- m_page->process()->removeMessageReceiver(Messages::WebInspectorProxy::messageReceiverName(), m_page->pageID());
</del><ins>+ m_page->process().removeMessageReceiver(Messages::WebInspectorProxy::messageReceiverName(), m_page->pageID());
</ins><span class="cx">
</span><span class="cx"> m_page->close();
</span><span class="cx">
</span><span class="lines">@@ -188,7 +188,7 @@
</span><span class="cx"> m_showMessageSent = true;
</span><span class="cx"> m_ignoreFirstBringToFront = true;
</span><span class="cx">
</span><del>- m_page->process()->send(Messages::WebInspector::Show(), m_page->pageID());
</del><ins>+ m_page->process().send(Messages::WebInspector::Show(), m_page->pageID());
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void WebInspectorProxy::show()
</span><span class="lines">@@ -222,7 +222,7 @@
</span><span class="cx"> if (!m_page)
</span><span class="cx"> return;
</span><span class="cx">
</span><del>- m_page->process()->send(Messages::WebInspector::Close(), m_page->pageID());
</del><ins>+ m_page->process().send(Messages::WebInspector::Close(), m_page->pageID());
</ins><span class="cx">
</span><span class="cx"> didClose();
</span><span class="cx"> }
</span><span class="lines">@@ -232,7 +232,7 @@
</span><span class="cx"> if (!m_page)
</span><span class="cx"> return;
</span><span class="cx">
</span><del>- m_page->process()->send(Messages::WebInspector::ShowConsole(), m_page->pageID());
</del><ins>+ m_page->process().send(Messages::WebInspector::ShowConsole(), m_page->pageID());
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void WebInspectorProxy::showResources()
</span><span class="lines">@@ -240,7 +240,7 @@
</span><span class="cx"> if (!m_page)
</span><span class="cx"> return;
</span><span class="cx">
</span><del>- m_page->process()->send(Messages::WebInspector::ShowResources(), m_page->pageID());
</del><ins>+ m_page->process().send(Messages::WebInspector::ShowResources(), m_page->pageID());
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void WebInspectorProxy::showMainResourceForFrame(WebFrameProxy* frame)
</span><span class="lines">@@ -248,7 +248,7 @@
</span><span class="cx"> if (!m_page)
</span><span class="cx"> return;
</span><span class="cx">
</span><del>- m_page->process()->send(Messages::WebInspector::ShowMainResourceForFrame(frame->frameID()), m_page->pageID());
</del><ins>+ m_page->process().send(Messages::WebInspector::ShowMainResourceForFrame(frame->frameID()), m_page->pageID());
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void WebInspectorProxy::attachBottom()
</span><span class="lines">@@ -276,11 +276,11 @@
</span><span class="cx">
</span><span class="cx"> switch (m_attachmentSide) {
</span><span class="cx"> case AttachmentSideBottom:
</span><del>- m_page->process()->send(Messages::WebInspector::AttachedBottom(), m_page->pageID());
</del><ins>+ m_page->process().send(Messages::WebInspector::AttachedBottom(), m_page->pageID());
</ins><span class="cx"> break;
</span><span class="cx">
</span><span class="cx"> case AttachmentSideRight:
</span><del>- m_page->process()->send(Messages::WebInspector::AttachedRight(), m_page->pageID());
</del><ins>+ m_page->process().send(Messages::WebInspector::AttachedRight(), m_page->pageID());
</ins><span class="cx"> break;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -297,7 +297,7 @@
</span><span class="cx"> if (m_isVisible)
</span><span class="cx"> inspectorPageGroup()->preferences()->setInspectorStartsAttached(false);
</span><span class="cx">
</span><del>- m_page->process()->send(Messages::WebInspector::Detached(), m_page->pageID());
</del><ins>+ m_page->process().send(Messages::WebInspector::Detached(), m_page->pageID());
</ins><span class="cx">
</span><span class="cx"> platformDetach();
</span><span class="cx"> }
</span><span class="lines">@@ -320,9 +320,9 @@
</span><span class="cx"> return;
</span><span class="cx">
</span><span class="cx"> if (m_isDebuggingJavaScript)
</span><del>- m_page->process()->send(Messages::WebInspector::StopJavaScriptDebugging(), m_page->pageID());
</del><ins>+ m_page->process().send(Messages::WebInspector::StopJavaScriptDebugging(), m_page->pageID());
</ins><span class="cx"> else
</span><del>- m_page->process()->send(Messages::WebInspector::StartJavaScriptDebugging(), m_page->pageID());
</del><ins>+ m_page->process().send(Messages::WebInspector::StartJavaScriptDebugging(), m_page->pageID());
</ins><span class="cx">
</span><span class="cx"> // FIXME: have the WebProcess notify us on state changes.
</span><span class="cx"> m_isDebuggingJavaScript = !m_isDebuggingJavaScript;
</span><span class="lines">@@ -334,9 +334,9 @@
</span><span class="cx"> return;
</span><span class="cx">
</span><span class="cx"> if (m_isProfilingJavaScript)
</span><del>- m_page->process()->send(Messages::WebInspector::StopJavaScriptProfiling(), m_page->pageID());
</del><ins>+ m_page->process().send(Messages::WebInspector::StopJavaScriptProfiling(), m_page->pageID());
</ins><span class="cx"> else
</span><del>- m_page->process()->send(Messages::WebInspector::StartJavaScriptProfiling(), m_page->pageID());
</del><ins>+ m_page->process().send(Messages::WebInspector::StartJavaScriptProfiling(), m_page->pageID());
</ins><span class="cx">
</span><span class="cx"> // FIXME: have the WebProcess notify us on state changes.
</span><span class="cx"> m_isProfilingJavaScript = !m_isProfilingJavaScript;
</span><span class="lines">@@ -348,9 +348,9 @@
</span><span class="cx"> return;
</span><span class="cx">
</span><span class="cx"> if (m_isProfilingPage)
</span><del>- m_page->process()->send(Messages::WebInspector::StopPageProfiling(), m_page->pageID());
</del><ins>+ m_page->process().send(Messages::WebInspector::StopPageProfiling(), m_page->pageID());
</ins><span class="cx"> else
</span><del>- m_page->process()->send(Messages::WebInspector::StartPageProfiling(), m_page->pageID());
</del><ins>+ m_page->process().send(Messages::WebInspector::StartPageProfiling(), m_page->pageID());
</ins><span class="cx">
</span><span class="cx"> // FIXME: have the WebProcess notify us on state changes.
</span><span class="cx"> m_isProfilingPage = !m_isProfilingPage;
</span><span class="lines">@@ -405,17 +405,17 @@
</span><span class="cx">
</span><span class="cx"> void WebInspectorProxy::remoteFrontendConnected()
</span><span class="cx"> {
</span><del>- m_page->process()->send(Messages::WebInspector::RemoteFrontendConnected(), m_page->pageID());
</del><ins>+ m_page->process().send(Messages::WebInspector::RemoteFrontendConnected(), m_page->pageID());
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void WebInspectorProxy::remoteFrontendDisconnected()
</span><span class="cx"> {
</span><del>- m_page->process()->send(Messages::WebInspector::RemoteFrontendDisconnected(), m_page->pageID());
</del><ins>+ m_page->process().send(Messages::WebInspector::RemoteFrontendDisconnected(), m_page->pageID());
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void WebInspectorProxy::dispatchMessageFromRemoteFrontend(const String& message)
</span><span class="cx"> {
</span><del>- m_page->process()->send(Messages::WebInspector::DispatchMessageFromRemoteFrontend(message), m_page->pageID());
</del><ins>+ m_page->process().send(Messages::WebInspector::DispatchMessageFromRemoteFrontend(message), m_page->pageID());
</ins><span class="cx"> }
</span><span class="cx"> #endif
</span><span class="cx">
</span><span class="lines">@@ -459,17 +459,17 @@
</span><span class="cx"> switch (m_attachmentSide) {
</span><span class="cx"> case AttachmentSideBottom:
</span><span class="cx"> url.append("bottom");
</span><del>- m_page->process()->send(Messages::WebInspector::AttachedBottom(), m_page->pageID());
</del><ins>+ m_page->process().send(Messages::WebInspector::AttachedBottom(), m_page->pageID());
</ins><span class="cx"> break;
</span><span class="cx"> case AttachmentSideRight:
</span><span class="cx"> url.append("right");
</span><del>- m_page->process()->send(Messages::WebInspector::AttachedRight(), m_page->pageID());
</del><ins>+ m_page->process().send(Messages::WebInspector::AttachedRight(), m_page->pageID());
</ins><span class="cx"> break;
</span><span class="cx"> }
</span><span class="cx"> } else
</span><span class="cx"> url.append("undocked");
</span><span class="cx">
</span><del>- m_page->process()->assumeReadAccessToBaseURL(inspectorBaseURL());
</del><ins>+ m_page->process().assumeReadAccessToBaseURL(inspectorBaseURL());
</ins><span class="cx">
</span><span class="cx"> inspectorPage->loadURL(url);
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessWebPageGrouph"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/WebPageGroup.h (159902 => 159903)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/WebPageGroup.h 2013-12-02 00:50:07 UTC (rev 159902)
+++ trunk/Source/WebKit2/UIProcess/WebPageGroup.h 2013-12-02 00:50:16 UTC (rev 159903)
</span><span class="lines">@@ -72,21 +72,19 @@
</span><span class="cx"> mutable RefPtr<WebPreferences> m_preferences;
</span><span class="cx"> HashSet<WebPageProxy*> m_pages;
</span><span class="cx"> };
</span><del>-
</del><ins>+
</ins><span class="cx"> template<typename T>
</span><span class="cx"> void WebPageGroup::sendToAllProcessesInGroup(const T& message, uint64_t destinationID)
</span><span class="cx"> {
</span><span class="cx"> HashSet<WebProcessProxy*> processesSeen;
</span><span class="cx">
</span><span class="cx"> for (WebPageProxy* webPageProxy : m_pages) {
</span><del>- WebProcessProxy* webProcessProxy = webPageProxy->process();
- ASSERT(webProcessProxy);
-
- if (!processesSeen.add(webProcessProxy).isNewEntry)
</del><ins>+ WebProcessProxy& webProcessProxy = webPageProxy->process();
+ if (!processesSeen.add(&webProcessProxy).isNewEntry)
</ins><span class="cx"> continue;
</span><span class="cx">
</span><del>- if (webProcessProxy->canSendMessage())
- webProcessProxy->send(T(message), destinationID);
</del><ins>+ if (webProcessProxy.canSendMessage())
+ webProcessProxy.send(T(message), destinationID);
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessWebPageProxycpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/WebPageProxy.cpp (159902 => 159903)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/WebPageProxy.cpp 2013-12-02 00:50:07 UTC (rev 159902)
+++ trunk/Source/WebKit2/UIProcess/WebPageProxy.cpp 2013-12-02 00:50:16 UTC (rev 159903)
</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, 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, 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">@@ -345,7 +345,7 @@
</span><span class="cx"> m_process->addMessageReceiver(Messages::WebPageProxy::messageReceiverName(), m_pageID, this);
</span><span class="cx">
</span><span class="cx"> // FIXME: If we ever expose the session storage size as a preference, we need to pass it here.
</span><del>- m_process->context()->storageManager().createSessionStorageNamespace(m_pageID, m_process->isValid() ? m_process->connection() : 0, std::numeric_limits<unsigned>::max());
</del><ins>+ m_process->context().storageManager().createSessionStorageNamespace(m_pageID, m_process->isValid() ? m_process->connection() : 0, std::numeric_limits<unsigned>::max());
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> WebPageProxy::~WebPageProxy()
</span><span class="lines">@@ -365,11 +365,6 @@
</span><span class="cx"> #endif
</span><span class="cx"> }
</span><span class="cx">
</span><del>-WebProcessProxy* WebPageProxy::process() const
-{
- return m_process.get();
-}
-
</del><span class="cx"> PlatformProcessIdentifier WebPageProxy::processIdentifier() const
</span><span class="cx"> {
</span><span class="cx"> if (m_isClosed)
</span><span class="lines">@@ -466,7 +461,6 @@
</span><span class="cx"> void WebPageProxy::reattachToWebProcess()
</span><span class="cx"> {
</span><span class="cx"> ASSERT(!isValid());
</span><del>- ASSERT(m_process);
</del><span class="cx"> ASSERT(!m_process->isValid());
</span><span class="cx"> ASSERT(!m_process->isLaunching());
</span><span class="cx">
</span><span class="lines">@@ -474,10 +468,10 @@
</span><span class="cx">
</span><span class="cx"> m_isValid = true;
</span><span class="cx">
</span><del>- if (m_process->context()->processModel() == ProcessModelSharedSecondaryProcess)
- m_process = m_process->context()->ensureSharedWebProcess();
</del><ins>+ if (m_process->context().processModel() == ProcessModelSharedSecondaryProcess)
+ m_process = m_process->context().ensureSharedWebProcess();
</ins><span class="cx"> else
</span><del>- m_process = m_process->context()->createNewWebProcessRespectingProcessCountLimit();
</del><ins>+ m_process = m_process->context().createNewWebProcessRespectingProcessCountLimit();
</ins><span class="cx"> m_process->addExistingWebPage(this, m_pageID);
</span><span class="cx"> m_process->addMessageReceiver(Messages::WebPageProxy::messageReceiverName(), m_pageID, this);
</span><span class="cx">
</span><span class="lines">@@ -572,8 +566,8 @@
</span><span class="cx"> m_process->send(Messages::WebPage::Close(), m_pageID);
</span><span class="cx"> m_process->removeWebPage(m_pageID);
</span><span class="cx"> m_process->removeMessageReceiver(Messages::WebPageProxy::messageReceiverName(), m_pageID);
</span><del>- m_process->context()->storageManager().destroySessionStorageNamespace(m_pageID);
- m_process->context()->supplement<WebNotificationManagerProxy>()->clearNotifications(this);
</del><ins>+ m_process->context().storageManager().destroySessionStorageNamespace(m_pageID);
+ m_process->context().supplement<WebNotificationManagerProxy>()->clearNotifications(this);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> bool WebPageProxy::tryClose()
</span><span class="lines">@@ -828,7 +822,7 @@
</span><span class="cx"> void WebPageProxy::willGoToBackForwardListItem(uint64_t itemID, CoreIPC::MessageDecoder& decoder)
</span><span class="cx"> {
</span><span class="cx"> RefPtr<API::Object> userData;
</span><del>- WebContextUserMessageDecoder messageDecoder(userData, m_process.get());
</del><ins>+ WebContextUserMessageDecoder messageDecoder(userData, &m_process.get());
</ins><span class="cx"> if (!decoder.decode(messageDecoder))
</span><span class="cx"> return;
</span><span class="cx">
</span><span class="lines">@@ -836,14 +830,14 @@
</span><span class="cx"> m_loaderClient.willGoToBackForwardListItem(this, item, userData.get());
</span><span class="cx"> }
</span><span class="cx">
</span><del>-bool WebPageProxy::canShowMIMEType(const String& mimeType) const
</del><ins>+bool WebPageProxy::canShowMIMEType(const String& mimeType)
</ins><span class="cx"> {
</span><span class="cx"> if (MIMETypeRegistry::canShowMIMEType(mimeType))
</span><span class="cx"> return true;
</span><span class="cx">
</span><span class="cx"> #if ENABLE(NETSCAPE_PLUGIN_API)
</span><span class="cx"> String newMimeType = mimeType;
</span><del>- PluginModuleInfo plugin = m_process->context()->pluginInfoStore().findPlugin(newMimeType, URL());
</del><ins>+ PluginModuleInfo plugin = m_process->context().pluginInfoStore().findPlugin(newMimeType, URL());
</ins><span class="cx"> if (!plugin.path.isNull() && m_pageGroup->preferences()->pluginsEnabled())
</span><span class="cx"> return true;
</span><span class="cx"> #endif // ENABLE(NETSCAPE_PLUGIN_API)
</span><span class="lines">@@ -1074,7 +1068,7 @@
</span><span class="cx"> if (!isValid())
</span><span class="cx"> return;
</span><span class="cx">
</span><del>- process()->send(Messages::WebPage::CommitPageTransitionViewport(), m_pageID);
</del><ins>+ process().send(Messages::WebPage::CommitPageTransitionViewport(), m_pageID);
</ins><span class="cx"> }
</span><span class="cx"> #endif
</span><span class="cx">
</span><span class="lines">@@ -1319,7 +1313,7 @@
</span><span class="cx"> pluginLoadPolicy = PluginModuleLoadNormally;
</span><span class="cx">
</span><span class="cx"> PluginData::AllowedPluginTypes allowedPluginTypes = allowOnlyApplicationPlugins ? PluginData::OnlyApplicationPlugins : PluginData::AllPlugins;
</span><del>- PluginModuleInfo plugin = m_process->context()->pluginInfoStore().findPlugin(newMimeType, URL(URL(), urlString), allowedPluginTypes);
</del><ins>+ PluginModuleInfo plugin = m_process->context().pluginInfoStore().findPlugin(newMimeType, URL(URL(), urlString), allowedPluginTypes);
</ins><span class="cx"> if (!plugin.path) {
</span><span class="cx"> pluginProcessToken = 0;
</span><span class="cx"> return;
</span><span class="lines">@@ -1414,7 +1408,7 @@
</span><span class="cx"> uint64_t downloadID = 0;
</span><span class="cx"> if (action == PolicyDownload) {
</span><span class="cx"> // Create a download proxy.
</span><del>- DownloadProxy* download = m_process->context()->createDownloadProxy();
</del><ins>+ DownloadProxy* download = m_process->context().createDownloadProxy();
</ins><span class="cx"> downloadID = download->downloadID();
</span><span class="cx"> #if PLATFORM(EFL) || PLATFORM(GTK)
</span><span class="cx"> // Our design does not suppport downloads without a WebPage.
</span><span class="lines">@@ -2081,7 +2075,7 @@
</span><span class="cx"> m_pageLoadState.clearPendingAPIRequestURL();
</span><span class="cx">
</span><span class="cx"> RefPtr<API::Object> userData;
</span><del>- WebContextUserMessageDecoder messageDecoder(userData, m_process.get());
</del><ins>+ WebContextUserMessageDecoder messageDecoder(userData, &m_process.get());
</ins><span class="cx"> if (!decoder.decode(messageDecoder))
</span><span class="cx"> return;
</span><span class="cx">
</span><span class="lines">@@ -2101,7 +2095,7 @@
</span><span class="cx"> void WebPageProxy::didReceiveServerRedirectForProvisionalLoadForFrame(uint64_t frameID, const String& url, CoreIPC::MessageDecoder& decoder)
</span><span class="cx"> {
</span><span class="cx"> RefPtr<API::Object> userData;
</span><del>- WebContextUserMessageDecoder messageDecoder(userData, m_process.get());
</del><ins>+ WebContextUserMessageDecoder messageDecoder(userData, &m_process.get());
</ins><span class="cx"> if (!decoder.decode(messageDecoder))
</span><span class="cx"> return;
</span><span class="cx">
</span><span class="lines">@@ -2120,7 +2114,7 @@
</span><span class="cx"> void WebPageProxy::didFailProvisionalLoadForFrame(uint64_t frameID, const ResourceError& error, CoreIPC::MessageDecoder& decoder)
</span><span class="cx"> {
</span><span class="cx"> RefPtr<API::Object> userData;
</span><del>- WebContextUserMessageDecoder messageDecoder(userData, m_process.get());
</del><ins>+ WebContextUserMessageDecoder messageDecoder(userData, &m_process.get());
</ins><span class="cx"> if (!decoder.decode(messageDecoder))
</span><span class="cx"> return;
</span><span class="cx">
</span><span class="lines">@@ -2151,7 +2145,7 @@
</span><span class="cx"> void WebPageProxy::didCommitLoadForFrame(uint64_t frameID, const String& mimeType, uint32_t opaqueFrameLoadType, const CertificateInfo& certificateInfo, CoreIPC::MessageDecoder& decoder)
</span><span class="cx"> {
</span><span class="cx"> RefPtr<API::Object> userData;
</span><del>- WebContextUserMessageDecoder messageDecoder(userData, m_process.get());
</del><ins>+ WebContextUserMessageDecoder messageDecoder(userData, &m_process.get());
</ins><span class="cx"> if (!decoder.decode(messageDecoder))
</span><span class="cx"> return;
</span><span class="cx">
</span><span class="lines">@@ -2188,7 +2182,7 @@
</span><span class="cx"> void WebPageProxy::didFinishDocumentLoadForFrame(uint64_t frameID, CoreIPC::MessageDecoder& decoder)
</span><span class="cx"> {
</span><span class="cx"> RefPtr<API::Object> userData;
</span><del>- WebContextUserMessageDecoder messageDecoder(userData, m_process.get());
</del><ins>+ WebContextUserMessageDecoder messageDecoder(userData, &m_process.get());
</ins><span class="cx"> if (!decoder.decode(messageDecoder))
</span><span class="cx"> return;
</span><span class="cx">
</span><span class="lines">@@ -2201,7 +2195,7 @@
</span><span class="cx"> void WebPageProxy::didFinishLoadForFrame(uint64_t frameID, CoreIPC::MessageDecoder& decoder)
</span><span class="cx"> {
</span><span class="cx"> RefPtr<API::Object> userData;
</span><del>- WebContextUserMessageDecoder messageDecoder(userData, m_process.get());
</del><ins>+ WebContextUserMessageDecoder messageDecoder(userData, &m_process.get());
</ins><span class="cx"> if (!decoder.decode(messageDecoder))
</span><span class="cx"> return;
</span><span class="cx">
</span><span class="lines">@@ -2219,7 +2213,7 @@
</span><span class="cx"> void WebPageProxy::didFailLoadForFrame(uint64_t frameID, const ResourceError& error, CoreIPC::MessageDecoder& decoder)
</span><span class="cx"> {
</span><span class="cx"> RefPtr<API::Object> userData;
</span><del>- WebContextUserMessageDecoder messageDecoder(userData, m_process.get());
</del><ins>+ WebContextUserMessageDecoder messageDecoder(userData, &m_process.get());
</ins><span class="cx"> if (!decoder.decode(messageDecoder))
</span><span class="cx"> return;
</span><span class="cx">
</span><span class="lines">@@ -2239,7 +2233,7 @@
</span><span class="cx"> void WebPageProxy::didSameDocumentNavigationForFrame(uint64_t frameID, uint32_t opaqueSameDocumentNavigationType, const String& url, CoreIPC::MessageDecoder& decoder)
</span><span class="cx"> {
</span><span class="cx"> RefPtr<API::Object> userData;
</span><del>- WebContextUserMessageDecoder messageDecoder(userData, m_process.get());
</del><ins>+ WebContextUserMessageDecoder messageDecoder(userData, &m_process.get());
</ins><span class="cx"> if (!decoder.decode(messageDecoder))
</span><span class="cx"> return;
</span><span class="cx">
</span><span class="lines">@@ -2259,7 +2253,7 @@
</span><span class="cx"> void WebPageProxy::didReceiveTitleForFrame(uint64_t frameID, const String& title, CoreIPC::MessageDecoder& decoder)
</span><span class="cx"> {
</span><span class="cx"> RefPtr<API::Object> userData;
</span><del>- WebContextUserMessageDecoder messageDecoder(userData, m_process.get());
</del><ins>+ WebContextUserMessageDecoder messageDecoder(userData, &m_process.get());
</ins><span class="cx"> if (!decoder.decode(messageDecoder))
</span><span class="cx"> return;
</span><span class="cx">
</span><span class="lines">@@ -2277,7 +2271,7 @@
</span><span class="cx"> void WebPageProxy::didFirstLayoutForFrame(uint64_t frameID, CoreIPC::MessageDecoder& decoder)
</span><span class="cx"> {
</span><span class="cx"> RefPtr<API::Object> userData;
</span><del>- WebContextUserMessageDecoder messageDecoder(userData, m_process.get());
</del><ins>+ WebContextUserMessageDecoder messageDecoder(userData, &m_process.get());
</ins><span class="cx"> if (!decoder.decode(messageDecoder))
</span><span class="cx"> return;
</span><span class="cx">
</span><span class="lines">@@ -2290,7 +2284,7 @@
</span><span class="cx"> void WebPageProxy::didFirstVisuallyNonEmptyLayoutForFrame(uint64_t frameID, CoreIPC::MessageDecoder& decoder)
</span><span class="cx"> {
</span><span class="cx"> RefPtr<API::Object> userData;
</span><del>- WebContextUserMessageDecoder messageDecoder(userData, m_process.get());
</del><ins>+ WebContextUserMessageDecoder messageDecoder(userData, &m_process.get());
</ins><span class="cx"> if (!decoder.decode(messageDecoder))
</span><span class="cx"> return;
</span><span class="cx">
</span><span class="lines">@@ -2303,7 +2297,7 @@
</span><span class="cx"> void WebPageProxy::didLayout(uint32_t layoutMilestones, CoreIPC::MessageDecoder& decoder)
</span><span class="cx"> {
</span><span class="cx"> RefPtr<API::Object> userData;
</span><del>- WebContextUserMessageDecoder messageDecoder(userData, m_process.get());
</del><ins>+ WebContextUserMessageDecoder messageDecoder(userData, &m_process.get());
</ins><span class="cx"> if (!decoder.decode(messageDecoder))
</span><span class="cx"> return;
</span><span class="cx">
</span><span class="lines">@@ -2313,7 +2307,7 @@
</span><span class="cx"> void WebPageProxy::didRemoveFrameFromHierarchy(uint64_t frameID, CoreIPC::MessageDecoder& decoder)
</span><span class="cx"> {
</span><span class="cx"> RefPtr<API::Object> userData;
</span><del>- WebContextUserMessageDecoder messageDecoder(userData, m_process.get());
</del><ins>+ WebContextUserMessageDecoder messageDecoder(userData, &m_process.get());
</ins><span class="cx"> if (!decoder.decode(messageDecoder))
</span><span class="cx"> return;
</span><span class="cx">
</span><span class="lines">@@ -2326,7 +2320,7 @@
</span><span class="cx"> void WebPageProxy::didDisplayInsecureContentForFrame(uint64_t frameID, CoreIPC::MessageDecoder& decoder)
</span><span class="cx"> {
</span><span class="cx"> RefPtr<API::Object> userData;
</span><del>- WebContextUserMessageDecoder messageDecoder(userData, m_process.get());
</del><ins>+ WebContextUserMessageDecoder messageDecoder(userData, &m_process.get());
</ins><span class="cx"> if (!decoder.decode(messageDecoder))
</span><span class="cx"> return;
</span><span class="cx">
</span><span class="lines">@@ -2339,7 +2333,7 @@
</span><span class="cx"> void WebPageProxy::didRunInsecureContentForFrame(uint64_t frameID, CoreIPC::MessageDecoder& decoder)
</span><span class="cx"> {
</span><span class="cx"> RefPtr<API::Object> userData;
</span><del>- WebContextUserMessageDecoder messageDecoder(userData, m_process.get());
</del><ins>+ WebContextUserMessageDecoder messageDecoder(userData, &m_process.get());
</ins><span class="cx"> if (!decoder.decode(messageDecoder))
</span><span class="cx"> return;
</span><span class="cx">
</span><span class="lines">@@ -2352,7 +2346,7 @@
</span><span class="cx"> void WebPageProxy::didDetectXSSForFrame(uint64_t frameID, CoreIPC::MessageDecoder& decoder)
</span><span class="cx"> {
</span><span class="cx"> RefPtr<API::Object> userData;
</span><del>- WebContextUserMessageDecoder messageDecoder(userData, m_process.get());
</del><ins>+ WebContextUserMessageDecoder messageDecoder(userData, &m_process.get());
</ins><span class="cx"> if (!decoder.decode(messageDecoder))
</span><span class="cx"> return;
</span><span class="cx">
</span><span class="lines">@@ -2376,7 +2370,7 @@
</span><span class="cx"> void WebPageProxy::decidePolicyForNavigationAction(uint64_t frameID, uint32_t opaqueNavigationType, uint32_t opaqueModifiers, int32_t opaqueMouseButton, uint64_t originatingFrameID, const ResourceRequest& request, uint64_t listenerID, CoreIPC::MessageDecoder& decoder, bool& receivedPolicyAction, uint64_t& policyAction, uint64_t& downloadID)
</span><span class="cx"> {
</span><span class="cx"> RefPtr<API::Object> userData;
</span><del>- WebContextUserMessageDecoder messageDecoder(userData, m_process.get());
</del><ins>+ WebContextUserMessageDecoder messageDecoder(userData, &m_process.get());
</ins><span class="cx"> if (!decoder.decode(messageDecoder))
</span><span class="cx"> return;
</span><span class="cx">
</span><span class="lines">@@ -2415,7 +2409,7 @@
</span><span class="cx"> void WebPageProxy::decidePolicyForNewWindowAction(uint64_t frameID, uint32_t opaqueNavigationType, uint32_t opaqueModifiers, int32_t opaqueMouseButton, const ResourceRequest& request, const String& frameName, uint64_t listenerID, CoreIPC::MessageDecoder& decoder)
</span><span class="cx"> {
</span><span class="cx"> RefPtr<API::Object> userData;
</span><del>- WebContextUserMessageDecoder messageDecoder(userData, m_process.get());
</del><ins>+ WebContextUserMessageDecoder messageDecoder(userData, &m_process.get());
</ins><span class="cx"> if (!decoder.decode(messageDecoder))
</span><span class="cx"> return;
</span><span class="cx">
</span><span class="lines">@@ -2435,7 +2429,7 @@
</span><span class="cx"> void WebPageProxy::decidePolicyForResponse(uint64_t frameID, const ResourceResponse& response, const ResourceRequest& request, bool canShowMIMEType, uint64_t listenerID, CoreIPC::MessageDecoder& decoder)
</span><span class="cx"> {
</span><span class="cx"> RefPtr<API::Object> userData;
</span><del>- WebContextUserMessageDecoder messageDecoder(userData, m_process.get());
</del><ins>+ WebContextUserMessageDecoder messageDecoder(userData, &m_process.get());
</ins><span class="cx"> if (!decoder.decode(messageDecoder))
</span><span class="cx"> return;
</span><span class="cx">
</span><span class="lines">@@ -2474,7 +2468,7 @@
</span><span class="cx"> void WebPageProxy::unableToImplementPolicy(uint64_t frameID, const ResourceError& error, CoreIPC::MessageDecoder& decoder)
</span><span class="cx"> {
</span><span class="cx"> RefPtr<API::Object> userData;
</span><del>- WebContextUserMessageDecoder messageDecoder(userData, m_process.get());
</del><ins>+ WebContextUserMessageDecoder messageDecoder(userData, &m_process.get());
</ins><span class="cx"> if (!decoder.decode(messageDecoder))
</span><span class="cx"> return;
</span><span class="cx">
</span><span class="lines">@@ -2489,7 +2483,7 @@
</span><span class="cx"> void WebPageProxy::willSubmitForm(uint64_t frameID, uint64_t sourceFrameID, const Vector<std::pair<String, String>>& textFieldValues, uint64_t listenerID, CoreIPC::MessageDecoder& decoder)
</span><span class="cx"> {
</span><span class="cx"> RefPtr<API::Object> userData;
</span><del>- WebContextUserMessageDecoder messageDecoder(userData, m_process.get());
</del><ins>+ WebContextUserMessageDecoder messageDecoder(userData, &m_process.get());
</ins><span class="cx"> if (!decoder.decode(messageDecoder))
</span><span class="cx"> return;
</span><span class="cx">
</span><span class="lines">@@ -2516,7 +2510,7 @@
</span><span class="cx">
</span><span class="cx"> newPageID = newPage->pageID();
</span><span class="cx"> newPageParameters = newPage->creationParameters();
</span><del>- process()->context()->storageManager().cloneSessionStorageNamespace(m_pageID, newPage->pageID());
</del><ins>+ process().context().storageManager().cloneSessionStorageNamespace(m_pageID, newPage->pageID());
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void WebPageProxy::showPage()
</span><span class="lines">@@ -2582,7 +2576,7 @@
</span><span class="cx"> void WebPageProxy::mouseDidMoveOverElement(const WebHitTestResult::Data& hitTestResultData, uint32_t opaqueModifiers, CoreIPC::MessageDecoder& decoder)
</span><span class="cx"> {
</span><span class="cx"> RefPtr<API::Object> userData;
</span><del>- WebContextUserMessageDecoder messageDecoder(userData, m_process.get());
</del><ins>+ WebContextUserMessageDecoder messageDecoder(userData, &m_process.get());
</ins><span class="cx"> if (!decoder.decode(messageDecoder))
</span><span class="cx"> return;
</span><span class="cx">
</span><span class="lines">@@ -2595,14 +2589,14 @@
</span><span class="cx"> {
</span><span class="cx"> ASSERT(connection == m_process->connection());
</span><span class="cx">
</span><del>- m_process->context()->storageManager().setAllowedSessionStorageNamespaceConnection(m_pageID, connection);
</del><ins>+ m_process->context().storageManager().setAllowedSessionStorageNamespaceConnection(m_pageID, connection);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void WebPageProxy::connectionWillClose(CoreIPC::Connection* connection)
</span><span class="cx"> {
</span><span class="cx"> ASSERT_UNUSED(connection, connection == m_process->connection());
</span><span class="cx">
</span><del>- m_process->context()->storageManager().setAllowedSessionStorageNamespaceConnection(m_pageID, 0);
</del><ins>+ m_process->context().storageManager().setAllowedSessionStorageNamespaceConnection(m_pageID, 0);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> #if ENABLE(NETSCAPE_PLUGIN_API)
</span><span class="lines">@@ -2615,7 +2609,7 @@
</span><span class="cx">
</span><span class="cx"> RefPtr<ImmutableDictionary> pluginInformation;
</span><span class="cx"> String newMimeType = mimeType;
</span><del>- PluginModuleInfo plugin = m_process->context()->pluginInfoStore().findPlugin(newMimeType, URL(URL(), pluginURLString));
</del><ins>+ PluginModuleInfo plugin = m_process->context().pluginInfoStore().findPlugin(newMimeType, URL(URL(), pluginURLString));
</ins><span class="cx"> pluginInformation = createPluginInformationDictionary(plugin, frameURLString, mimeType, pageURLString, pluginspageAttributeURLString, pluginURLString);
</span><span class="cx">
</span><span class="cx"> WKPluginUnavailabilityReason pluginUnavailabilityReason = kWKPluginUnavailabilityReasonPluginMissing;
</span><span class="lines">@@ -2801,7 +2795,7 @@
</span><span class="cx"> if (!isValid())
</span><span class="cx"> return;
</span><span class="cx">
</span><del>- process()->send(Messages::WebPage::SetMayStartMediaWhenInWindow(mayStartMedia), m_pageID);
</del><ins>+ process().send(Messages::WebPage::SetMayStartMediaWhenInWindow(mayStartMedia), m_pageID);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> #if PLATFORM(EFL) || PLATFORM(GTK)
</span><span class="lines">@@ -3055,7 +3049,7 @@
</span><span class="cx">
</span><span class="cx"> void WebPageProxy::postMessageToInjectedBundle(const String& messageName, API::Object* messageBody)
</span><span class="cx"> {
</span><del>- process()->send(Messages::WebPage::PostInjectedBundleMessage(messageName, WebContextUserMessageEncoder(messageBody)), m_pageID);
</del><ins>+ process().send(Messages::WebPage::PostInjectedBundleMessage(messageName, WebContextUserMessageEncoder(messageBody)), m_pageID);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> #if PLATFORM(GTK)
</span><span class="lines">@@ -3126,7 +3120,7 @@
</span><span class="cx"> void WebPageProxy::internalShowContextMenu(const IntPoint& menuLocation, const WebHitTestResult::Data& hitTestResultData, const Vector<WebContextMenuItemData>& proposedItems, CoreIPC::MessageDecoder& decoder)
</span><span class="cx"> {
</span><span class="cx"> RefPtr<API::Object> userData;
</span><del>- WebContextUserMessageDecoder messageDecoder(userData, m_process.get());
</del><ins>+ WebContextUserMessageDecoder messageDecoder(userData, &m_process.get());
</ins><span class="cx"> if (!decoder.decode(messageDecoder))
</span><span class="cx"> return;
</span><span class="cx">
</span><span class="lines">@@ -3199,15 +3193,15 @@
</span><span class="cx"> }
</span><span class="cx"> #endif
</span><span class="cx"> if (item.action() == ContextMenuItemTagDownloadImageToDisk) {
</span><del>- m_process->context()->download(this, URL(URL(), m_activeContextMenuHitTestResultData.absoluteImageURL));
</del><ins>+ m_process->context().download(this, URL(URL(), m_activeContextMenuHitTestResultData.absoluteImageURL));
</ins><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx"> if (item.action() == ContextMenuItemTagDownloadLinkToDisk) {
</span><del>- m_process->context()->download(this, URL(URL(), m_activeContextMenuHitTestResultData.absoluteLinkURL));
</del><ins>+ m_process->context().download(this, URL(URL(), m_activeContextMenuHitTestResultData.absoluteLinkURL));
</ins><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx"> if (item.action() == ContextMenuItemTagDownloadMediaToDisk) {
</span><del>- m_process->context()->download(this, URL(URL(), m_activeContextMenuHitTestResultData.absoluteMediaURL));
</del><ins>+ m_process->context().download(this, URL(URL(), m_activeContextMenuHitTestResultData.absoluteMediaURL));
</ins><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx"> if (item.action() == ContextMenuItemTagCheckSpellingWhileTyping) {
</span><span class="lines">@@ -3265,12 +3259,12 @@
</span><span class="cx"> m_openPanelResultListener = 0;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void WebPageProxy::advanceToNextMisspelling(bool startBeforeSelection) const
</del><ins>+void WebPageProxy::advanceToNextMisspelling(bool startBeforeSelection)
</ins><span class="cx"> {
</span><span class="cx"> m_process->send(Messages::WebPage::AdvanceToNextMisspelling(startBeforeSelection), m_pageID);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void WebPageProxy::changeSpellingToWord(const String& word) const
</del><ins>+void WebPageProxy::changeSpellingToWord(const String& word)
</ins><span class="cx"> {
</span><span class="cx"> if (word.isEmpty())
</span><span class="cx"> return;
</span><span class="lines">@@ -3370,12 +3364,12 @@
</span><span class="cx"> TextChecker::requestCheckingOfString(TextCheckerCompletion::create(requestID, request, this));
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void WebPageProxy::didFinishCheckingText(uint64_t requestID, const Vector<WebCore::TextCheckingResult>& result) const
</del><ins>+void WebPageProxy::didFinishCheckingText(uint64_t requestID, const Vector<WebCore::TextCheckingResult>& result)
</ins><span class="cx"> {
</span><span class="cx"> m_process->send(Messages::WebPage::DidFinishCheckingText(requestID, result), m_pageID);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void WebPageProxy::didCancelCheckingText(uint64_t requestID) const
</del><ins>+void WebPageProxy::didCancelCheckingText(uint64_t requestID)
</ins><span class="cx"> {
</span><span class="cx"> m_process->send(Messages::WebPage::DidCancelCheckingText(requestID), m_pageID);
</span><span class="cx"> }
</span><span class="lines">@@ -3955,22 +3949,22 @@
</span><span class="cx">
</span><span class="cx"> void WebPageProxy::showNotification(const String& title, const String& body, const String& iconURL, const String& tag, const String& lang, const String& dir, const String& originString, uint64_t notificationID)
</span><span class="cx"> {
</span><del>- m_process->context()->supplement<WebNotificationManagerProxy>()->show(this, title, body, iconURL, tag, lang, dir, originString, notificationID);
</del><ins>+ m_process->context().supplement<WebNotificationManagerProxy>()->show(this, title, body, iconURL, tag, lang, dir, originString, notificationID);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void WebPageProxy::cancelNotification(uint64_t notificationID)
</span><span class="cx"> {
</span><del>- m_process->context()->supplement<WebNotificationManagerProxy>()->cancel(this, notificationID);
</del><ins>+ m_process->context().supplement<WebNotificationManagerProxy>()->cancel(this, notificationID);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void WebPageProxy::clearNotifications(const Vector<uint64_t>& notificationIDs)
</span><span class="cx"> {
</span><del>- m_process->context()->supplement<WebNotificationManagerProxy>()->clearNotifications(this, notificationIDs);
</del><ins>+ m_process->context().supplement<WebNotificationManagerProxy>()->clearNotifications(this, notificationIDs);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void WebPageProxy::didDestroyNotification(uint64_t notificationID)
</span><span class="cx"> {
</span><del>- m_process->context()->supplement<WebNotificationManagerProxy>()->didDestroyNotification(this, notificationID);
</del><ins>+ m_process->context().supplement<WebNotificationManagerProxy>()->didDestroyNotification(this, notificationID);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> float WebPageProxy::headerHeight(WebFrameProxy* frame)
</span><span class="lines">@@ -4060,7 +4054,7 @@
</span><span class="cx">
</span><span class="cx"> #if PLATFORM(MAC) && ENABLE(NETSCAPE_PLUGIN_API)
</span><span class="cx"> String newMimeType = mimeType;
</span><del>- PluginModuleInfo plugin = m_process->context()->pluginInfoStore().findPlugin(newMimeType, URL(URL(), pluginURLString));
</del><ins>+ PluginModuleInfo plugin = m_process->context().pluginInfoStore().findPlugin(newMimeType, URL(URL(), pluginURLString));
</ins><span class="cx"> pluginInformation = createPluginInformationDictionary(plugin, frameURLString, mimeType, pageURLString, String(), String(), replacementObscured);
</span><span class="cx"> #else
</span><span class="cx"> UNUSED_PARAM(mimeType);
</span><span class="lines">@@ -4296,7 +4290,7 @@
</span><span class="cx"> #if USE(SOUP)
</span><span class="cx"> void WebPageProxy::didReceiveURIRequest(String uriString, uint64_t requestID)
</span><span class="cx"> {
</span><del>- m_process->context()->supplement<WebSoupRequestManagerProxy>()->didReceiveURIRequest(uriString, this, requestID);
</del><ins>+ m_process->context().supplement<WebSoupRequestManagerProxy>()->didReceiveURIRequest(uriString, this, requestID);
</ins><span class="cx"> }
</span><span class="cx"> #endif
</span><span class="cx">
</span><span class="lines">@@ -4307,7 +4301,7 @@
</span><span class="cx"> if (!isValid())
</span><span class="cx"> return;
</span><span class="cx">
</span><del>- process()->send(Messages::WebPage::SetComposition(text, underlines, selectionStart, selectionEnd, replacementRangeStart, replacementRangeEnd), m_pageID);
</del><ins>+ process().send(Messages::WebPage::SetComposition(text, underlines, selectionStart, selectionEnd, replacementRangeStart, replacementRangeEnd), m_pageID);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void WebPageProxy::confirmComposition(const String& compositionString, int64_t selectionStart, int64_t selectionLength)
</span><span class="lines">@@ -4315,7 +4309,7 @@
</span><span class="cx"> if (!isValid())
</span><span class="cx"> return;
</span><span class="cx">
</span><del>- process()->send(Messages::WebPage::ConfirmComposition(compositionString, selectionStart, selectionLength), m_pageID);
</del><ins>+ process().send(Messages::WebPage::ConfirmComposition(compositionString, selectionStart, selectionLength), m_pageID);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void WebPageProxy::cancelComposition()
</span><span class="lines">@@ -4323,7 +4317,7 @@
</span><span class="cx"> if (!isValid())
</span><span class="cx"> return;
</span><span class="cx">
</span><del>- process()->send(Messages::WebPage::CancelComposition(), m_pageID);
</del><ins>+ process().send(Messages::WebPage::CancelComposition(), m_pageID);
</ins><span class="cx"> }
</span><span class="cx"> #endif // PLATFORM(GTK)
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessWebPageProxyh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/WebPageProxy.h (159902 => 159903)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/WebPageProxy.h 2013-12-02 00:50:07 UTC (rev 159902)
+++ trunk/Source/WebKit2/UIProcess/WebPageProxy.h 2013-12-02 00:50:16 UTC (rev 159903)
</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&, 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">@@ -391,7 +391,7 @@
</span><span class="cx">
</span><span class="cx"> bool willHandleHorizontalScrollEvents() const;
</span><span class="cx">
</span><del>- bool canShowMIMEType(const String& mimeType) const;
</del><ins>+ bool canShowMIMEType(const String& mimeType);
</ins><span class="cx">
</span><span class="cx"> bool drawsBackground() const { return m_drawsBackground; }
</span><span class="cx"> void setDrawsBackground(bool);
</span><span class="lines">@@ -697,7 +697,7 @@
</span><span class="cx"> bool isValidKeypressCommandName(const String& name) const { return m_knownKeypressCommandNames.contains(name); }
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>- WebProcessProxy* process() const;
</del><ins>+ WebProcessProxy& process() { return m_process.get(); }
</ins><span class="cx"> PlatformProcessIdentifier processIdentifier() const;
</span><span class="cx">
</span><span class="cx"> WebPageGroup& pageGroup() { return m_pageGroup.get(); }
</span><span class="lines">@@ -738,8 +738,8 @@
</span><span class="cx"> void handleDownloadRequest(DownloadProxy*);
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>- void advanceToNextMisspelling(bool startBeforeSelection) const;
- void changeSpellingToWord(const String& word) const;
</del><ins>+ void advanceToNextMisspelling(bool startBeforeSelection);
+ void changeSpellingToWord(const String& word);
</ins><span class="cx"> #if USE(APPKIT)
</span><span class="cx"> void uppercaseWord();
</span><span class="cx"> void lowercaseWord();
</span><span class="lines">@@ -835,8 +835,8 @@
</span><span class="cx"> void didReceiveAuthenticationChallengeProxy(uint64_t frameID, PassRefPtr<AuthenticationChallengeProxy>);
</span><span class="cx">
</span><span class="cx"> int64_t spellDocumentTag();
</span><del>- void didFinishCheckingText(uint64_t requestID, const Vector<WebCore::TextCheckingResult>&) const;
- void didCancelCheckingText(uint64_t requestID) const;
</del><ins>+ void didFinishCheckingText(uint64_t requestID, const Vector<WebCore::TextCheckingResult>&);
+ void didCancelCheckingText(uint64_t requestID);
</ins><span class="cx">
</span><span class="cx"> void connectionWillOpen(CoreIPC::Connection*);
</span><span class="cx"> void connectionWillClose(CoreIPC::Connection*);
</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&, 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">@@ -1153,7 +1153,7 @@
</span><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> std::unique_ptr<DrawingAreaProxy> m_drawingArea;
</span><del>- RefPtr<WebProcessProxy> m_process;
</del><ins>+ Ref<WebProcessProxy> m_process;
</ins><span class="cx"> Ref<WebPageGroup> m_pageGroup;
</span><span class="cx"> RefPtr<WebFrameProxy> m_mainFrame;
</span><span class="cx"> RefPtr<WebFrameProxy> m_focusedFrame;
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessWebProcessProxycpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/WebProcessProxy.cpp (159902 => 159903)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/WebProcessProxy.cpp 2013-12-02 00:50:07 UTC (rev 159902)
+++ trunk/Source/WebKit2/UIProcess/WebProcessProxy.cpp 2013-12-02 00:50:16 UTC (rev 159903)
</span><span class="lines">@@ -76,12 +76,12 @@
</span><span class="cx"> return pageMap;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-PassRefPtr<WebProcessProxy> WebProcessProxy::create(PassRefPtr<WebContext> context)
</del><ins>+PassRefPtr<WebProcessProxy> WebProcessProxy::create(WebContext& context)
</ins><span class="cx"> {
</span><span class="cx"> return adoptRef(new WebProcessProxy(context));
</span><span class="cx"> }
</span><span class="cx">
</span><del>-WebProcessProxy::WebProcessProxy(PassRefPtr<WebContext> context)
</del><ins>+WebProcessProxy::WebProcessProxy(WebContext& context)
</ins><span class="cx"> : m_responsivenessTimer(this)
</span><span class="cx"> , m_context(context)
</span><span class="cx"> , m_mayHaveUniversalFileReadSandboxExtension(false)
</span><span class="lines">@@ -163,7 +163,7 @@
</span><span class="cx"> PassRefPtr<WebPageProxy> WebProcessProxy::createWebPage(PageClient& pageClient, WebPageGroup& pageGroup)
</span><span class="cx"> {
</span><span class="cx"> uint64_t pageID = generatePageID();
</span><del>- RefPtr<WebPageProxy> webPage = WebPageProxy::create(pageClient, this, pageGroup, pageID);
</del><ins>+ RefPtr<WebPageProxy> webPage = WebPageProxy::create(pageClient, *this, pageGroup, pageID);
</ins><span class="cx"> m_pageMap.set(pageID, webPage.get());
</span><span class="cx"> globalPageMap().set(pageID, webPage.get());
</span><span class="cx"> #if PLATFORM(MAC)
</span><span class="lines">@@ -545,7 +545,7 @@
</span><span class="cx"> MESSAGE_CHECK(frame);
</span><span class="cx"> MESSAGE_CHECK(frame->page() == page);
</span><span class="cx">
</span><del>- m_context->historyClient().didNavigateWithNavigationData(m_context.get(), page, store, frame);
</del><ins>+ m_context->historyClient().didNavigateWithNavigationData(&m_context.get(), page, store, frame);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void WebProcessProxy::didPerformClientRedirect(uint64_t pageID, const String& sourceURLString, const String& destinationURLString, uint64_t frameID)
</span><span class="lines">@@ -563,7 +563,7 @@
</span><span class="cx"> MESSAGE_CHECK_URL(sourceURLString);
</span><span class="cx"> MESSAGE_CHECK_URL(destinationURLString);
</span><span class="cx">
</span><del>- m_context->historyClient().didPerformClientRedirect(m_context.get(), page, sourceURLString, destinationURLString, frame);
</del><ins>+ m_context->historyClient().didPerformClientRedirect(&m_context.get(), page, sourceURLString, destinationURLString, frame);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void WebProcessProxy::didPerformServerRedirect(uint64_t pageID, const String& sourceURLString, const String& destinationURLString, uint64_t frameID)
</span><span class="lines">@@ -581,7 +581,7 @@
</span><span class="cx"> MESSAGE_CHECK_URL(sourceURLString);
</span><span class="cx"> MESSAGE_CHECK_URL(destinationURLString);
</span><span class="cx">
</span><del>- m_context->historyClient().didPerformServerRedirect(m_context.get(), page, sourceURLString, destinationURLString, frame);
</del><ins>+ m_context->historyClient().didPerformServerRedirect(&m_context.get(), page, sourceURLString, destinationURLString, frame);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void WebProcessProxy::didUpdateHistoryTitle(uint64_t pageID, const String& title, const String& url, uint64_t frameID)
</span><span class="lines">@@ -595,7 +595,7 @@
</span><span class="cx"> MESSAGE_CHECK(frame->page() == page);
</span><span class="cx"> MESSAGE_CHECK_URL(url);
</span><span class="cx">
</span><del>- m_context->historyClient().didUpdateHistoryTitle(m_context.get(), page, title, url, frame);
</del><ins>+ m_context->historyClient().didUpdateHistoryTitle(&m_context.get(), page, title, url, frame);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void WebProcessProxy::pageVisibilityChanged(WebKit::WebPageProxy *page)
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessWebProcessProxyh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/WebProcessProxy.h (159902 => 159903)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/WebProcessProxy.h 2013-12-02 00:50:07 UTC (rev 159902)
+++ trunk/Source/WebKit2/UIProcess/WebProcessProxy.h 2013-12-02 00:50:16 UTC (rev 159903)
</span><span class="lines">@@ -64,7 +64,7 @@
</span><span class="cx"> typedef HashMap<uint64_t, RefPtr<WebFrameProxy>> WebFrameProxyMap;
</span><span class="cx"> typedef HashMap<uint64_t, WebPageProxy*> WebPageProxyMap;
</span><span class="cx">
</span><del>- static PassRefPtr<WebProcessProxy> create(PassRefPtr<WebContext>);
</del><ins>+ static PassRefPtr<WebProcessProxy> create(WebContext&);
</ins><span class="cx"> ~WebProcessProxy();
</span><span class="cx">
</span><span class="cx"> static WebProcessProxy* fromConnection(CoreIPC::Connection* connection)
</span><span class="lines">@@ -74,7 +74,7 @@
</span><span class="cx">
</span><span class="cx"> WebConnection* webConnection() const { return m_webConnection.get(); }
</span><span class="cx">
</span><del>- WebContext* context() const { return m_context.get(); }
</del><ins>+ WebContext& context() { return m_context.get(); }
</ins><span class="cx">
</span><span class="cx"> static WebPageProxy* webPage(uint64_t pageID);
</span><span class="cx"> PassRefPtr<WebPageProxy> createWebPage(PageClient&, WebPageGroup&);
</span><span class="lines">@@ -124,7 +124,7 @@
</span><span class="cx"> void requestTermination();
</span><span class="cx">
</span><span class="cx"> private:
</span><del>- explicit WebProcessProxy(PassRefPtr<WebContext>);
</del><ins>+ explicit WebProcessProxy(WebContext&);
</ins><span class="cx">
</span><span class="cx"> // From ChildProcessProxy
</span><span class="cx"> virtual void getLaunchOptions(ProcessLauncher::LaunchOptions&) OVERRIDE;
</span><span class="lines">@@ -186,7 +186,7 @@
</span><span class="cx"> ResponsivenessTimer m_responsivenessTimer;
</span><span class="cx">
</span><span class="cx"> RefPtr<WebConnectionToWebProcess> m_webConnection;
</span><del>- RefPtr<WebContext> m_context;
</del><ins>+ Ref<WebContext> m_context;
</ins><span class="cx">
</span><span class="cx"> bool m_mayHaveUniversalFileReadSandboxExtension; // True if a read extension for "/" was ever granted - we don't track whether WebProcess still has it.
</span><span class="cx"> HashSet<String> m_localPathsWithAssumedReadAccess;
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcesscfWebPageProxyCFcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/cf/WebPageProxyCF.cpp (159902 => 159903)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/cf/WebPageProxyCF.cpp 2013-12-02 00:50:07 UTC (rev 159902)
+++ trunk/Source/WebKit2/UIProcess/cf/WebPageProxyCF.cpp 2013-12-02 00:50:16 UTC (rev 159903)
</span><span class="lines">@@ -158,16 +158,16 @@
</span><span class="cx"> const BackForwardListItemVector& entries = m_backForwardList->entries();
</span><span class="cx"> if (size_t size = entries.size()) {
</span><span class="cx"> for (size_t i = 0; i < size; ++i)
</span><del>- process()->registerNewWebBackForwardListItem(entries[i].get());
</del><ins>+ process().registerNewWebBackForwardListItem(entries[i].get());
</ins><span class="cx">
</span><span class="cx"> SessionState state(m_backForwardList->entries(), m_backForwardList->currentIndex());
</span><span class="cx"> if (provisionalURL)
</span><del>- process()->send(Messages::WebPage::RestoreSession(state), m_pageID);
</del><ins>+ process().send(Messages::WebPage::RestoreSession(state), m_pageID);
</ins><span class="cx"> else {
</span><span class="cx"> if (WebBackForwardListItem* item = m_backForwardList->currentItem())
</span><span class="cx"> m_pageLoadState.setPendingAPIRequestURL(item->url());
</span><span class="cx">
</span><del>- process()->send(Messages::WebPage::RestoreSessionAndNavigateToCurrentItem(state), m_pageID);
</del><ins>+ process().send(Messages::WebPage::RestoreSessionAndNavigateToCurrentItem(state), m_pageID);
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessmacRemoteLayerTreeDrawingAreaProxymm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/mac/RemoteLayerTreeDrawingAreaProxy.mm (159902 => 159903)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/mac/RemoteLayerTreeDrawingAreaProxy.mm 2013-12-02 00:50:07 UTC (rev 159902)
+++ trunk/Source/WebKit2/UIProcess/mac/RemoteLayerTreeDrawingAreaProxy.mm 2013-12-02 00:50:16 UTC (rev 159903)
</span><span class="lines">@@ -74,7 +74,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></pre></div>
<a id="trunkSourceWebKit2UIProcessmacRemoteLayerTreeHostmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/mac/RemoteLayerTreeHost.mm (159902 => 159903)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/mac/RemoteLayerTreeHost.mm 2013-12-02 00:50:07 UTC (rev 159902)
+++ trunk/Source/WebKit2/UIProcess/mac/RemoteLayerTreeHost.mm 2013-12-02 00:50:16 UTC (rev 159903)
</span><span class="lines">@@ -46,12 +46,12 @@
</span><span class="cx"> : m_webPageProxy(webPageProxy)
</span><span class="cx"> , m_rootLayer(nullptr)
</span><span class="cx"> {
</span><del>- m_webPageProxy->process()->addMessageReceiver(Messages::RemoteLayerTreeHost::messageReceiverName(), m_webPageProxy->pageID(), this);
</del><ins>+ m_webPageProxy->process().addMessageReceiver(Messages::RemoteLayerTreeHost::messageReceiverName(), m_webPageProxy->pageID(), this);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> RemoteLayerTreeHost::~RemoteLayerTreeHost()
</span><span class="cx"> {
</span><del>- m_webPageProxy->process()->removeMessageReceiver(Messages::RemoteLayerTreeHost::messageReceiverName(), m_webPageProxy->pageID());
</del><ins>+ m_webPageProxy->process().removeMessageReceiver(Messages::RemoteLayerTreeHost::messageReceiverName(), m_webPageProxy->pageID());
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void RemoteLayerTreeHost::commit(const RemoteLayerTreeTransaction& transaction)
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessmacTiledCoreAnimationDrawingAreaProxymm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/mac/TiledCoreAnimationDrawingAreaProxy.mm (159902 => 159903)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/mac/TiledCoreAnimationDrawingAreaProxy.mm 2013-12-02 00:50:07 UTC (rev 159902)
+++ trunk/Source/WebKit2/UIProcess/mac/TiledCoreAnimationDrawingAreaProxy.mm 2013-12-02 00:50:16 UTC (rev 159903)
</span><span class="lines">@@ -51,12 +51,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::layerHostingModeDidChange()
</span><span class="cx"> {
</span><del>- m_webPageProxy->process()->send(Messages::DrawingArea::SetLayerHostingMode(m_webPageProxy->layerHostingMode()), m_webPageProxy->pageID());
</del><ins>+ m_webPageProxy->process().send(Messages::DrawingArea::SetLayerHostingMode(m_webPageProxy->layerHostingMode()), m_webPageProxy->pageID());
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void TiledCoreAnimationDrawingAreaProxy::sizeDidChange()
</span><span class="lines">@@ -77,15 +77,15 @@
</span><span class="cx"> if (!m_isWaitingForDidUpdateGeometry)
</span><span class="cx"> return;
</span><span class="cx">
</span><del>- if (m_webPageProxy->process()->isLaunching())
</del><ins>+ if (m_webPageProxy->process().isLaunching())
</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="lines">@@ -144,7 +144,7 @@
</span><span class="cx"> m_lastSentMinimumLayoutSize = m_webPageProxy->minimumLayoutSize();
</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></pre></div>
<a id="trunkSourceWebKit2UIProcessmacWebFullScreenManagerProxyMacmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/mac/WebFullScreenManagerProxyMac.mm (159902 => 159903)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/mac/WebFullScreenManagerProxyMac.mm 2013-12-02 00:50:07 UTC (rev 159902)
+++ trunk/Source/WebKit2/UIProcess/mac/WebFullScreenManagerProxyMac.mm 2013-12-02 00:50:16 UTC (rev 159903)
</span><span class="lines">@@ -42,7 +42,7 @@
</span><span class="cx">
</span><span class="cx"> void WebFullScreenManagerProxy::invalidate()
</span><span class="cx"> {
</span><del>- m_page->process()->removeMessageReceiver(Messages::WebFullScreenManagerProxy::messageReceiverName(), m_page->pageID());
</del><ins>+ m_page->process().removeMessageReceiver(Messages::WebFullScreenManagerProxy::messageReceiverName(), m_page->pageID());
</ins><span class="cx">
</span><span class="cx"> if (!m_webView)
</span><span class="cx"> return;
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessmacWebInspectorProxyMacmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/mac/WebInspectorProxyMac.mm (159902 => 159903)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/mac/WebInspectorProxyMac.mm 2013-12-02 00:50:07 UTC (rev 159902)
+++ trunk/Source/WebKit2/UIProcess/mac/WebInspectorProxyMac.mm 2013-12-02 00:50:16 UTC (rev 159903)
</span><span class="lines">@@ -390,7 +390,7 @@
</span><span class="cx"> initialRect = [NSWindow contentRectForFrameRect:windowFrame styleMask:windowStyleMask];
</span><span class="cx"> }
</span><span class="cx">
</span><del>- m_inspectorView = adoptNS([[WKWebInspectorWKView alloc] initWithFrame:initialRect contextRef:toAPI(page()->process()->context()) pageGroupRef:toAPI(inspectorPageGroup()) relatedToPage:toAPI(m_page)]);
</del><ins>+ m_inspectorView = adoptNS([[WKWebInspectorWKView alloc] initWithFrame:initialRect contextRef:toAPI(&page()->process().context()) pageGroupRef:toAPI(inspectorPageGroup()) relatedToPage:toAPI(m_page)]);
</ins><span class="cx"> ASSERT(m_inspectorView);
</span><span class="cx">
</span><span class="cx"> [m_inspectorView.get() setDrawsBackground:NO];
</span><span class="lines">@@ -560,7 +560,7 @@
</span><span class="cx"> } else
</span><span class="cx"> [contentCopy writeToURL:actualURL atomically:YES encoding:NSUTF8StringEncoding error:NULL];
</span><span class="cx">
</span><del>- m_page->process()->send(Messages::WebInspector::DidSave([actualURL absoluteString]), m_page->pageID());
</del><ins>+ m_page->process().send(Messages::WebInspector::DidSave([actualURL absoluteString]), m_page->pageID());
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> if (!forceSaveDialog) {
</span><span class="lines">@@ -594,7 +594,7 @@
</span><span class="cx"> [handle writeData:[content dataUsingEncoding:NSUTF8StringEncoding]];
</span><span class="cx"> [handle closeFile];
</span><span class="cx">
</span><del>- m_page->process()->send(Messages::WebInspector::DidAppend([actualURL absoluteString]), m_page->pageID());
</del><ins>+ m_page->process().send(Messages::WebInspector::DidAppend([actualURL absoluteString]), m_page->pageID());
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void WebInspectorProxy::windowFrameDidChange()
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessmacWebPageProxyMacmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/mac/WebPageProxyMac.mm (159902 => 159903)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/mac/WebPageProxyMac.mm 2013-12-02 00:50:07 UTC (rev 159902)
+++ trunk/Source/WebKit2/UIProcess/mac/WebPageProxyMac.mm 2013-12-02 00:50:16 UTC (rev 159903)
</span><span class="lines">@@ -53,7 +53,7 @@
</span><span class="cx"> - (void)speakString:(NSString *)string;
</span><span class="cx"> @end
</span><span class="cx">
</span><del>-#define MESSAGE_CHECK(assertion) MESSAGE_CHECK_BASE(assertion, process()->connection())
</del><ins>+#define MESSAGE_CHECK(assertion) MESSAGE_CHECK_BASE(assertion, process().connection())
</ins><span class="cx">
</span><span class="cx"> using namespace WebCore;
</span><span class="cx">
</span><span class="lines">@@ -152,7 +152,7 @@
</span><span class="cx"> FloatRect windowFrameInScreenCoordinates = m_uiClient.windowFrame(this);
</span><span class="cx"> FloatRect windowFrameInUnflippedScreenCoordinates = m_pageClient.convertToUserSpace(windowFrameInScreenCoordinates);
</span><span class="cx">
</span><del>- process()->send(Messages::WebPage::WindowAndViewFramesChanged(windowFrameInScreenCoordinates, windowFrameInUnflippedScreenCoordinates, viewFrameInWindowCoordinates, accessibilityViewCoordinates), m_pageID);
</del><ins>+ process().send(Messages::WebPage::WindowAndViewFramesChanged(windowFrameInScreenCoordinates, windowFrameInUnflippedScreenCoordinates, viewFrameInWindowCoordinates, accessibilityViewCoordinates), m_pageID);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void WebPageProxy::viewExposedRectChanged(const FloatRect& exposedRect, bool clipsToExposedRect)
</span><span class="lines">@@ -175,7 +175,7 @@
</span><span class="cx"> if (m_exposedRect == m_lastSentExposedRect && m_clipsToExposedRect == m_lastSentClipsToExposedRect)
</span><span class="cx"> return;
</span><span class="cx">
</span><del>- process()->send(Messages::WebPage::ViewExposedRectChanged(m_exposedRect, m_clipsToExposedRect), m_pageID);
</del><ins>+ process().send(Messages::WebPage::ViewExposedRectChanged(m_exposedRect, m_clipsToExposedRect), m_pageID);
</ins><span class="cx"> m_lastSentExposedRect = m_exposedRect;
</span><span class="cx"> m_lastSentClipsToExposedRect = m_clipsToExposedRect;
</span><span class="cx"> }
</span><span class="lines">@@ -185,7 +185,7 @@
</span><span class="cx"> if (!isValid())
</span><span class="cx"> return;
</span><span class="cx">
</span><del>- process()->send(Messages::WebPage::SetMainFrameIsScrollable(isScrollable), m_pageID);
</del><ins>+ process().send(Messages::WebPage::SetMainFrameIsScrollable(isScrollable), m_pageID);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void WebPageProxy::setComposition(const String& text, Vector<CompositionUnderline> underlines, uint64_t selectionStart, uint64_t selectionEnd, uint64_t replacementRangeStart, uint64_t replacementRangeEnd)
</span><span class="lines">@@ -196,7 +196,7 @@
</span><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- process()->sendSync(Messages::WebPage::SetComposition(text, underlines, selectionStart, selectionEnd, replacementRangeStart, replacementRangeEnd), Messages::WebPage::SetComposition::Reply(m_editorState), m_pageID);
</del><ins>+ process().sendSync(Messages::WebPage::SetComposition(text, underlines, selectionStart, selectionEnd, replacementRangeStart, replacementRangeEnd), Messages::WebPage::SetComposition::Reply(m_editorState), m_pageID);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void WebPageProxy::confirmComposition()
</span><span class="lines">@@ -204,7 +204,7 @@
</span><span class="cx"> if (!isValid())
</span><span class="cx"> return;
</span><span class="cx">
</span><del>- process()->sendSync(Messages::WebPage::ConfirmComposition(), Messages::WebPage::ConfirmComposition::Reply(m_editorState), m_pageID);
</del><ins>+ process().sendSync(Messages::WebPage::ConfirmComposition(), Messages::WebPage::ConfirmComposition::Reply(m_editorState), m_pageID);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void WebPageProxy::cancelComposition()
</span><span class="lines">@@ -212,7 +212,7 @@
</span><span class="cx"> if (!isValid())
</span><span class="cx"> return;
</span><span class="cx">
</span><del>- process()->sendSync(Messages::WebPage::CancelComposition(), Messages::WebPage::ConfirmComposition::Reply(m_editorState), m_pageID);
</del><ins>+ process().sendSync(Messages::WebPage::CancelComposition(), Messages::WebPage::ConfirmComposition::Reply(m_editorState), m_pageID);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> bool WebPageProxy::insertText(const String& text, uint64_t replacementRangeStart, uint64_t replacementRangeEnd)
</span><span class="lines">@@ -221,7 +221,7 @@
</span><span class="cx"> return true;
</span><span class="cx">
</span><span class="cx"> bool handled = true;
</span><del>- process()->sendSync(Messages::WebPage::InsertText(text, replacementRangeStart, replacementRangeEnd), Messages::WebPage::InsertText::Reply(handled, m_editorState), m_pageID);
</del><ins>+ process().sendSync(Messages::WebPage::InsertText(text, replacementRangeStart, replacementRangeEnd), Messages::WebPage::InsertText::Reply(handled, m_editorState), m_pageID);
</ins><span class="cx"> m_temporarilyClosedComposition = false;
</span><span class="cx">
</span><span class="cx"> return handled;
</span><span class="lines">@@ -249,7 +249,7 @@
</span><span class="cx"> return insertText(text, replacementRangeStart, replacementRangeEnd);
</span><span class="cx">
</span><span class="cx"> bool handled = true;
</span><del>- process()->sendSync(Messages::WebPage::InsertDictatedText(text, replacementRangeStart, replacementRangeEnd, dictationAlternatives), Messages::WebPage::InsertDictatedText::Reply(handled, m_editorState), m_pageID);
</del><ins>+ process().sendSync(Messages::WebPage::InsertDictatedText(text, replacementRangeStart, replacementRangeEnd, dictationAlternatives), Messages::WebPage::InsertDictatedText::Reply(handled, m_editorState), m_pageID);
</ins><span class="cx"> return handled;
</span><span class="cx"> #else
</span><span class="cx"> return insertText(text, replacementRangeStart, replacementRangeEnd);
</span><span class="lines">@@ -264,7 +264,7 @@
</span><span class="cx"> if (!isValid())
</span><span class="cx"> return;
</span><span class="cx">
</span><del>- process()->sendSync(Messages::WebPage::GetMarkedRange(), Messages::WebPage::GetMarkedRange::Reply(location, length), m_pageID);
</del><ins>+ process().sendSync(Messages::WebPage::GetMarkedRange(), Messages::WebPage::GetMarkedRange::Reply(location, length), m_pageID);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void WebPageProxy::getSelectedRange(uint64_t& location, uint64_t& length)
</span><span class="lines">@@ -275,14 +275,14 @@
</span><span class="cx"> if (!isValid())
</span><span class="cx"> return;
</span><span class="cx">
</span><del>- process()->sendSync(Messages::WebPage::GetSelectedRange(), Messages::WebPage::GetSelectedRange::Reply(location, length), m_pageID);
</del><ins>+ process().sendSync(Messages::WebPage::GetSelectedRange(), Messages::WebPage::GetSelectedRange::Reply(location, length), m_pageID);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void WebPageProxy::getAttributedSubstringFromRange(uint64_t location, uint64_t length, AttributedString& result)
</span><span class="cx"> {
</span><span class="cx"> if (!isValid())
</span><span class="cx"> return;
</span><del>- process()->sendSync(Messages::WebPage::GetAttributedSubstringFromRange(location, length), Messages::WebPage::GetAttributedSubstringFromRange::Reply(result), m_pageID);
</del><ins>+ process().sendSync(Messages::WebPage::GetAttributedSubstringFromRange(location, length), Messages::WebPage::GetAttributedSubstringFromRange::Reply(result), m_pageID);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> uint64_t WebPageProxy::characterIndexForPoint(const IntPoint point)
</span><span class="lines">@@ -291,7 +291,7 @@
</span><span class="cx"> return 0;
</span><span class="cx">
</span><span class="cx"> uint64_t result = 0;
</span><del>- process()->sendSync(Messages::WebPage::CharacterIndexForPoint(point), Messages::WebPage::CharacterIndexForPoint::Reply(result), m_pageID);
</del><ins>+ process().sendSync(Messages::WebPage::CharacterIndexForPoint(point), Messages::WebPage::CharacterIndexForPoint::Reply(result), m_pageID);
</ins><span class="cx"> return result;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -301,7 +301,7 @@
</span><span class="cx"> return IntRect();
</span><span class="cx">
</span><span class="cx"> IntRect resultRect;
</span><del>- process()->sendSync(Messages::WebPage::FirstRectForCharacterRange(location, length), Messages::WebPage::FirstRectForCharacterRange::Reply(resultRect), m_pageID);
</del><ins>+ process().sendSync(Messages::WebPage::FirstRectForCharacterRange(location, length), Messages::WebPage::FirstRectForCharacterRange::Reply(resultRect), m_pageID);
</ins><span class="cx"> return resultRect;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -311,7 +311,7 @@
</span><span class="cx"> return false;
</span><span class="cx">
</span><span class="cx"> bool result = false;
</span><del>- process()->sendSync(Messages::WebPage::ExecuteKeypressCommands(commands), Messages::WebPage::ExecuteKeypressCommands::Reply(result, m_editorState), m_pageID);
</del><ins>+ process().sendSync(Messages::WebPage::ExecuteKeypressCommands(commands), Messages::WebPage::ExecuteKeypressCommands::Reply(result, m_editorState), m_pageID);
</ins><span class="cx"> return result;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -322,7 +322,7 @@
</span><span class="cx"> return value;
</span><span class="cx">
</span><span class="cx"> const double messageTimeout = 20;
</span><del>- process()->sendSync(Messages::WebPage::GetStringSelectionForPasteboard(), Messages::WebPage::GetStringSelectionForPasteboard::Reply(value), m_pageID, messageTimeout);
</del><ins>+ process().sendSync(Messages::WebPage::GetStringSelectionForPasteboard(), Messages::WebPage::GetStringSelectionForPasteboard::Reply(value), m_pageID, messageTimeout);
</ins><span class="cx"> return value;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -333,7 +333,7 @@
</span><span class="cx"> SharedMemory::Handle handle;
</span><span class="cx"> uint64_t size = 0;
</span><span class="cx"> const double messageTimeout = 20;
</span><del>- process()->sendSync(Messages::WebPage::GetDataSelectionForPasteboard(pasteboardType),
</del><ins>+ process().sendSync(Messages::WebPage::GetDataSelectionForPasteboard(pasteboardType),
</ins><span class="cx"> Messages::WebPage::GetDataSelectionForPasteboard::Reply(handle, size), m_pageID, messageTimeout);
</span><span class="cx"> if (handle.isNull())
</span><span class="cx"> return 0;
</span><span class="lines">@@ -348,7 +348,7 @@
</span><span class="cx">
</span><span class="cx"> bool result = false;
</span><span class="cx"> const double messageTimeout = 20;
</span><del>- process()->sendSync(Messages::WebPage::ReadSelectionFromPasteboard(pasteboardName), Messages::WebPage::ReadSelectionFromPasteboard::Reply(result), m_pageID, messageTimeout);
</del><ins>+ process().sendSync(Messages::WebPage::ReadSelectionFromPasteboard(pasteboardName), Messages::WebPage::ReadSelectionFromPasteboard::Reply(result), m_pageID, messageTimeout);
</ins><span class="cx"> return result;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -382,7 +382,7 @@
</span><span class="cx"> if (!isValid())
</span><span class="cx"> return;
</span><span class="cx">
</span><del>- process()->send(Messages::WebPage::PerformDictionaryLookupAtLocation(point), m_pageID);
</del><ins>+ process().send(Messages::WebPage::PerformDictionaryLookupAtLocation(point), m_pageID);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void WebPageProxy::interpretQueuedKeyEvent(const EditorState& state, bool& handled, Vector<WebCore::KeypressCommand>& commands)
</span><span class="lines">@@ -397,22 +397,22 @@
</span><span class="cx"> if (!isValid())
</span><span class="cx"> return;
</span><span class="cx">
</span><del>- process()->send(Messages::WebPage::SendComplexTextInputToPlugin(pluginComplexTextInputIdentifier, textInput), m_pageID);
</del><ins>+ process().send(Messages::WebPage::SendComplexTextInputToPlugin(pluginComplexTextInputIdentifier, textInput), m_pageID);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void WebPageProxy::uppercaseWord()
</span><span class="cx"> {
</span><del>- process()->send(Messages::WebPage::UppercaseWord(), m_pageID);
</del><ins>+ process().send(Messages::WebPage::UppercaseWord(), m_pageID);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void WebPageProxy::lowercaseWord()
</span><span class="cx"> {
</span><del>- process()->send(Messages::WebPage::LowercaseWord(), m_pageID);
</del><ins>+ process().send(Messages::WebPage::LowercaseWord(), m_pageID);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void WebPageProxy::capitalizeWord()
</span><span class="cx"> {
</span><del>- process()->send(Messages::WebPage::CapitalizeWord(), m_pageID);
</del><ins>+ process().send(Messages::WebPage::CapitalizeWord(), m_pageID);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void WebPageProxy::setSmartInsertDeleteEnabled(bool isSmartInsertDeleteEnabled)
</span><span class="lines">@@ -422,7 +422,7 @@
</span><span class="cx">
</span><span class="cx"> TextChecker::setSmartInsertDeleteEnabled(isSmartInsertDeleteEnabled);
</span><span class="cx"> m_isSmartInsertDeleteEnabled = isSmartInsertDeleteEnabled;
</span><del>- process()->send(Messages::WebPage::SetSmartInsertDeleteEnabled(isSmartInsertDeleteEnabled), m_pageID);
</del><ins>+ process().send(Messages::WebPage::SetSmartInsertDeleteEnabled(isSmartInsertDeleteEnabled), m_pageID);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void WebPageProxy::didPerformDictionaryLookup(const AttributedString& text, const DictionaryPopupInfo& dictionaryPopupInfo)
</span><span class="lines">@@ -450,7 +450,7 @@
</span><span class="cx"> if (!isValid())
</span><span class="cx"> return;
</span><span class="cx">
</span><del>- process()->send(Messages::WebPage::RegisterUIProcessAccessibilityTokens(elementToken, windowToken), m_pageID);
</del><ins>+ process().send(Messages::WebPage::RegisterUIProcessAccessibilityTokens(elementToken, windowToken), m_pageID);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void WebPageProxy::pluginFocusOrWindowFocusChanged(uint64_t pluginComplexTextInputIdentifier, bool pluginHasFocusAndWindowHasFocus)
</span><span class="lines">@@ -474,12 +474,12 @@
</span><span class="cx">
</span><span class="cx"> bool WebPageProxy::shouldDelayWindowOrderingForEvent(const WebKit::WebMouseEvent& event)
</span><span class="cx"> {
</span><del>- if (!process()->isValid())
</del><ins>+ if (!process().isValid())
</ins><span class="cx"> return false;
</span><span class="cx">
</span><span class="cx"> bool result = false;
</span><span class="cx"> const double messageTimeout = 3;
</span><del>- process()->sendSync(Messages::WebPage::ShouldDelayWindowOrderingEvent(event), Messages::WebPage::ShouldDelayWindowOrderingEvent::Reply(result), m_pageID, messageTimeout);
</del><ins>+ process().sendSync(Messages::WebPage::ShouldDelayWindowOrderingEvent(event), Messages::WebPage::ShouldDelayWindowOrderingEvent::Reply(result), m_pageID, messageTimeout);
</ins><span class="cx"> return result;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -490,7 +490,7 @@
</span><span class="cx">
</span><span class="cx"> bool result = false;
</span><span class="cx"> const double messageTimeout = 3;
</span><del>- process()->sendSync(Messages::WebPage::AcceptsFirstMouse(eventNumber, event), Messages::WebPage::AcceptsFirstMouse::Reply(result), m_pageID, messageTimeout);
</del><ins>+ process().sendSync(Messages::WebPage::AcceptsFirstMouse(eventNumber, event), Messages::WebPage::AcceptsFirstMouse::Reply(result), m_pageID, messageTimeout);
</ins><span class="cx"> return result;
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>