<!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>[159896] 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/159896">159896</a></dd>
<dt>Author</dt> <dd>weinig@apple.com</dd>
<dt>Date</dt> <dd>2013-11-30 22:40:24 -0800 (Sat, 30 Nov 2013)</dd>
</dl>
<h3>Log Message</h3>
<pre>[CTTE] The WebPageProxy's WebPageGroup is never null so it should be stored in a Ref
https://bugs.webkit.org/show_bug.cgi?id=125038
Reviewed by Dan Bernstein.
* UIProcess/API/C/WKPage.cpp:
(WKPageGetPageGroup):
* UIProcess/API/C/mac/WKPagePrivateMac.cpp:
(WKPageIsURLKnownHSTSHost):
* UIProcess/API/Cocoa/WKBrowsingContextController.mm:
(-[WKBrowsingContextController browsingContextGroup]):
* UIProcess/API/mac/WKView.mm:
(-[WKView _preferencesDidChange]):
(-[WKView initWithFrame:contextRef:pageGroupRef:relatedToPage:]):
* UIProcess/WebContext.cpp:
(WebKit::WebContext::WebContext):
(WebKit::WebContext::createWebPage):
* UIProcess/WebContext.h:
* UIProcess/WebInspectorProxy.cpp:
(WebKit::WebInspectorPageGroups::inspectorLevel):
(WebKit::WebInspectorPageGroups::isInspectorPageGroup):
(WebKit::WebInspectorPageGroups::inspectorPageGroupLevel):
(WebKit::WebInspectorProxy::isInspectorPage):
* UIProcess/WebInspectorProxy.h:
* UIProcess/WebPageGroup.cpp:
(WebKit::WebPageGroup::createNonNull):
* UIProcess/WebPageGroup.h:
* UIProcess/WebPageProxy.cpp:
(WebKit::WebPageProxy::create):
(WebKit::WebPageProxy::WebPageProxy):
(WebKit::WebPageProxy::maybeInitializeSandboxExtensionHandle):
(WebKit::WebPageProxy::preferencesDidChange):
* UIProcess/WebPageProxy.h:
(WebKit::WebPageProxy::pageGroup):
* UIProcess/WebProcessProxy.cpp:
(WebKit::WebProcessProxy::createWebPage):
* UIProcess/WebProcessProxy.h:
* UIProcess/mac/WebInspectorProxyMac.mm:
(WebKit::WebInspectorProxy::createInspectorWindow):
(WebKit::WebInspectorProxy::platformCreateInspectorPage):
(WebKit::WebInspectorProxy::windowFrameDidChange):
* UIProcess/mac/WebProcessProxyMac.mm:
(WebKit::WebProcessProxy::pageIsProcessSuppressible):</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="#trunkSourceWebKit2UIProcessWebContextcpp">trunk/Source/WebKit2/UIProcess/WebContext.cpp</a></li>
<li><a href="#trunkSourceWebKit2UIProcessWebContexth">trunk/Source/WebKit2/UIProcess/WebContext.h</a></li>
<li><a href="#trunkSourceWebKit2UIProcessWebInspectorProxycpp">trunk/Source/WebKit2/UIProcess/WebInspectorProxy.cpp</a></li>
<li><a href="#trunkSourceWebKit2UIProcessWebInspectorProxyh">trunk/Source/WebKit2/UIProcess/WebInspectorProxy.h</a></li>
<li><a href="#trunkSourceWebKit2UIProcessWebPageGroupcpp">trunk/Source/WebKit2/UIProcess/WebPageGroup.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="#trunkSourceWebKit2UIProcessmacWebInspectorProxyMacmm">trunk/Source/WebKit2/UIProcess/mac/WebInspectorProxyMac.mm</a></li>
<li><a href="#trunkSourceWebKit2UIProcessmacWebProcessProxyMacmm">trunk/Source/WebKit2/UIProcess/mac/WebProcessProxyMac.mm</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (159895 => 159896)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2013-12-01 06:24:05 UTC (rev 159895)
+++ trunk/Source/WebKit2/ChangeLog 2013-12-01 06:40:24 UTC (rev 159896)
</span><span class="lines">@@ -1,3 +1,49 @@
</span><ins>+2013-11-30 Sam Weinig <sam@webkit.org>
+
+ [CTTE] The WebPageProxy's WebPageGroup is never null so it should be stored in a Ref
+ https://bugs.webkit.org/show_bug.cgi?id=125038
+
+ Reviewed by Dan Bernstein.
+
+ * UIProcess/API/C/WKPage.cpp:
+ (WKPageGetPageGroup):
+ * UIProcess/API/C/mac/WKPagePrivateMac.cpp:
+ (WKPageIsURLKnownHSTSHost):
+ * UIProcess/API/Cocoa/WKBrowsingContextController.mm:
+ (-[WKBrowsingContextController browsingContextGroup]):
+ * UIProcess/API/mac/WKView.mm:
+ (-[WKView _preferencesDidChange]):
+ (-[WKView initWithFrame:contextRef:pageGroupRef:relatedToPage:]):
+ * UIProcess/WebContext.cpp:
+ (WebKit::WebContext::WebContext):
+ (WebKit::WebContext::createWebPage):
+ * UIProcess/WebContext.h:
+ * UIProcess/WebInspectorProxy.cpp:
+ (WebKit::WebInspectorPageGroups::inspectorLevel):
+ (WebKit::WebInspectorPageGroups::isInspectorPageGroup):
+ (WebKit::WebInspectorPageGroups::inspectorPageGroupLevel):
+ (WebKit::WebInspectorProxy::isInspectorPage):
+ * UIProcess/WebInspectorProxy.h:
+ * UIProcess/WebPageGroup.cpp:
+ (WebKit::WebPageGroup::createNonNull):
+ * UIProcess/WebPageGroup.h:
+ * UIProcess/WebPageProxy.cpp:
+ (WebKit::WebPageProxy::create):
+ (WebKit::WebPageProxy::WebPageProxy):
+ (WebKit::WebPageProxy::maybeInitializeSandboxExtensionHandle):
+ (WebKit::WebPageProxy::preferencesDidChange):
+ * UIProcess/WebPageProxy.h:
+ (WebKit::WebPageProxy::pageGroup):
+ * UIProcess/WebProcessProxy.cpp:
+ (WebKit::WebProcessProxy::createWebPage):
+ * UIProcess/WebProcessProxy.h:
+ * UIProcess/mac/WebInspectorProxyMac.mm:
+ (WebKit::WebInspectorProxy::createInspectorWindow):
+ (WebKit::WebInspectorProxy::platformCreateInspectorPage):
+ (WebKit::WebInspectorProxy::windowFrameDidChange):
+ * UIProcess/mac/WebProcessProxyMac.mm:
+ (WebKit::WebProcessProxy::pageIsProcessSuppressible):
+
</ins><span class="cx"> 2013-11-30 Dan Bernstein <mitz@apple.com>
</span><span class="cx">
</span><span class="cx"> Added a version of +[NSURL _web_URLWithWTFString:relativeToURL:] that doesn’t take a base URL and switched all callers to it.
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPICWKPagecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/API/C/WKPage.cpp (159895 => 159896)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/C/WKPage.cpp 2013-12-01 06:24:05 UTC (rev 159895)
+++ trunk/Source/WebKit2/UIProcess/API/C/WKPage.cpp 2013-12-01 06:40:24 UTC (rev 159896)
</span><span class="lines">@@ -60,7 +60,7 @@
</span><span class="cx">
</span><span class="cx"> WKPageGroupRef WKPageGetPageGroup(WKPageRef pageRef)
</span><span class="cx"> {
</span><del>- return toAPI(toImpl(pageRef)->pageGroup());
</del><ins>+ return toAPI(&toImpl(pageRef)->pageGroup());
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void WKPageLoadURL(WKPageRef pageRef, WKURLRef URLRef)
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPICmacWKPagePrivateMaccpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/API/C/mac/WKPagePrivateMac.cpp (159895 => 159896)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/C/mac/WKPagePrivateMac.cpp 2013-12-01 06:24:05 UTC (rev 159895)
+++ trunk/Source/WebKit2/UIProcess/API/C/mac/WKPagePrivateMac.cpp 2013-12-01 06:40:24 UTC (rev 159896)
</span><span class="lines">@@ -42,7 +42,7 @@
</span><span class="cx"> bool WKPageIsURLKnownHSTSHost(WKPageRef page, WKURLRef url)
</span><span class="cx"> {
</span><span class="cx"> WebPageProxy* webPageProxy = toImpl(page);
</span><del>- bool privateBrowsingEnabled = webPageProxy->pageGroup()->preferences()->privateBrowsingEnabled();
</del><ins>+ bool privateBrowsingEnabled = webPageProxy->pageGroup().preferences()->privateBrowsingEnabled();
</ins><span class="cx">
</span><span class="cx"> return webPageProxy->process()->context()->isURLKnownHSTSHost(toImpl(url)->string(), privateBrowsingEnabled);
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPICocoaWKBrowsingContextControllermm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/API/Cocoa/WKBrowsingContextController.mm (159895 => 159896)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/Cocoa/WKBrowsingContextController.mm 2013-12-01 06:24:05 UTC (rev 159895)
+++ trunk/Source/WebKit2/UIProcess/API/Cocoa/WKBrowsingContextController.mm 2013-12-01 06:40:24 UTC (rev 159896)
</span><span class="lines">@@ -121,10 +121,7 @@
</span><span class="cx">
</span><span class="cx"> - (WKBrowsingContextGroup *)browsingContextGroup
</span><span class="cx"> {
</span><del>- WebPageGroup* pageGroup = _page->pageGroup();
- if (!pageGroup)
- return nil;
- return wrapper(*pageGroup);
</del><ins>+ return wrapper(_page->pageGroup());
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> #pragma mark Loading
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPImacWKViewmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/API/mac/WKView.mm (159895 => 159896)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/mac/WKView.mm 2013-12-01 06:24:05 UTC (rev 159895)
+++ trunk/Source/WebKit2/UIProcess/API/mac/WKView.mm 2013-12-01 06:40:24 UTC (rev 159896)
</span><span class="lines">@@ -2272,7 +2272,7 @@
</span><span class="cx">
</span><span class="cx"> - (void)_preferencesDidChange
</span><span class="cx"> {
</span><del>- BOOL needsViewFrameInWindowCoordinates = _data->_page->pageGroup()->preferences()->pluginsEnabled();
</del><ins>+ BOOL needsViewFrameInWindowCoordinates = _data->_page->pageGroup().preferences()->pluginsEnabled();
</ins><span class="cx">
</span><span class="cx"> if (!!needsViewFrameInWindowCoordinates == !!_data->_needsViewFrameInWindowCoordinates)
</span><span class="cx"> return;
</span><span class="lines">@@ -2922,7 +2922,7 @@
</span><span class="cx">
</span><span class="cx"> _data->_intrinsicContentSize = NSMakeSize(NSViewNoInstrinsicMetric, NSViewNoInstrinsicMetric);
</span><span class="cx">
</span><del>- _data->_needsViewFrameInWindowCoordinates = _data->_page->pageGroup()->preferences()->pluginsEnabled();
</del><ins>+ _data->_needsViewFrameInWindowCoordinates = _data->_page->pageGroup().preferences()->pluginsEnabled();
</ins><span class="cx"> _data->_frameOrigin = NSZeroPoint;
</span><span class="cx"> _data->_contentAnchor = WKContentAnchorTopLeft;
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessWebContextcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/WebContext.cpp (159895 => 159896)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/WebContext.cpp 2013-12-01 06:24:05 UTC (rev 159895)
+++ trunk/Source/WebKit2/UIProcess/WebContext.cpp 2013-12-01 06:40:24 UTC (rev 159896)
</span><span class="lines">@@ -136,7 +136,7 @@
</span><span class="cx"> , m_webProcessCountLimit(UINT_MAX)
</span><span class="cx"> , m_haveInitialEmptyProcess(false)
</span><span class="cx"> , m_processWithPageCache(0)
</span><del>- , m_defaultPageGroup(WebPageGroup::create())
</del><ins>+ , m_defaultPageGroup(WebPageGroup::createNonNull())
</ins><span class="cx"> , m_injectedBundlePath(injectedBundlePath)
</span><span class="cx"> , m_visitedLinkProvider(this)
</span><span class="cx"> , m_plugInAutoStartProvider(this)
</span><span class="lines">@@ -756,10 +756,7 @@
</span><span class="cx"> process = createNewWebProcessRespectingProcessCountLimit();
</span><span class="cx"> }
</span><span class="cx">
</span><del>- if (!pageGroup)
- pageGroup = m_defaultPageGroup.get();
-
- return process->createWebPage(pageClient, this, pageGroup);
</del><ins>+ return process->createWebPage(pageClient, pageGroup ? *pageGroup : m_defaultPageGroup.get());
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> DownloadProxy* WebContext::download(WebPageProxy* initiatingPage, const ResourceRequest& request)
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessWebContexth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/WebContext.h (159895 => 159896)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/WebContext.h 2013-12-01 06:24:05 UTC (rev 159895)
+++ trunk/Source/WebKit2/UIProcess/WebContext.h 2013-12-01 06:40:24 UTC (rev 159896)
</span><span class="lines">@@ -419,7 +419,7 @@
</span><span class="cx">
</span><span class="cx"> WebProcessProxy* m_processWithPageCache;
</span><span class="cx">
</span><del>- RefPtr<WebPageGroup> m_defaultPageGroup;
</del><ins>+ Ref<WebPageGroup> m_defaultPageGroup;
</ins><span class="cx">
</span><span class="cx"> RefPtr<API::Object> m_injectedBundleInitializationUserData;
</span><span class="cx"> String m_injectedBundlePath;
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessWebInspectorProxycpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/WebInspectorProxy.cpp (159895 => 159896)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/WebInspectorProxy.cpp 2013-12-01 06:24:05 UTC (rev 159895)
+++ trunk/Source/WebKit2/UIProcess/WebInspectorProxy.cpp 2013-12-01 06:40:24 UTC (rev 159896)
</span><span class="lines">@@ -66,20 +66,20 @@
</span><span class="cx"> return instance;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- unsigned inspectorLevel(WebPageGroup* inspectedPageGroup)
</del><ins>+ unsigned inspectorLevel(WebPageGroup& inspectedPageGroup)
</ins><span class="cx"> {
</span><span class="cx"> return isInspectorPageGroup(inspectedPageGroup) ? inspectorPageGroupLevel(inspectedPageGroup) + 1 : 1;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- bool isInspectorPageGroup(WebPageGroup* group)
</del><ins>+ bool isInspectorPageGroup(WebPageGroup& group)
</ins><span class="cx"> {
</span><del>- return m_pageGroupLevel.contains(group);
</del><ins>+ return m_pageGroupLevel.contains(&group);
</ins><span class="cx"> }
</span><span class="cx">
</span><del>- unsigned inspectorPageGroupLevel(WebPageGroup* group)
</del><ins>+ unsigned inspectorPageGroupLevel(WebPageGroup& group)
</ins><span class="cx"> {
</span><span class="cx"> ASSERT(isInspectorPageGroup(group));
</span><del>- return m_pageGroupLevel.get(group);
</del><ins>+ return m_pageGroupLevel.get(&group);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> WebPageGroup* inspectorPageGroupForLevel(unsigned level)
</span><span class="lines">@@ -356,9 +356,9 @@
</span><span class="cx"> m_isProfilingPage = !m_isProfilingPage;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-bool WebInspectorProxy::isInspectorPage(WebPageProxy* page)
</del><ins>+bool WebInspectorProxy::isInspectorPage(WebPageProxy& page)
</ins><span class="cx"> {
</span><del>- return WebInspectorPageGroups::shared().isInspectorPageGroup(page->pageGroup());
</del><ins>+ return WebInspectorPageGroups::shared().isInspectorPageGroup(page.pageGroup());
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> static bool isMainInspectorPage(const WebInspectorProxy* webInspectorProxy, WKURLRequestRef requestRef)
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessWebInspectorProxyh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/WebInspectorProxy.h (159895 => 159896)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/WebInspectorProxy.h 2013-12-01 06:24:05 UTC (rev 159895)
+++ trunk/Source/WebKit2/UIProcess/WebInspectorProxy.h 2013-12-01 06:40:24 UTC (rev 159896)
</span><span class="lines">@@ -132,7 +132,7 @@
</span><span class="cx"> bool isProfilingPage() const { return m_isProfilingPage; }
</span><span class="cx"> void togglePageProfiling();
</span><span class="cx">
</span><del>- static bool isInspectorPage(WebPageProxy*);
</del><ins>+ static bool isInspectorPage(WebPageProxy&);
</ins><span class="cx">
</span><span class="cx"> // Implemented the platform WebInspectorProxy file
</span><span class="cx"> String inspectorPageURL() const;
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessWebPageGroupcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/WebPageGroup.cpp (159895 => 159896)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/WebPageGroup.cpp 2013-12-01 06:24:05 UTC (rev 159895)
+++ trunk/Source/WebKit2/UIProcess/WebPageGroup.cpp 2013-12-01 06:40:24 UTC (rev 159896)
</span><span class="lines">@@ -54,6 +54,11 @@
</span><span class="cx"> return adoptRef(new WebPageGroup(identifier, visibleToInjectedBundle, visibleToHistoryClient));
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+PassRef<WebPageGroup> WebPageGroup::createNonNull(const String& identifier, bool visibleToInjectedBundle, bool visibleToHistoryClient)
+{
+ return adoptRef(*new WebPageGroup(identifier, visibleToInjectedBundle, visibleToHistoryClient));
+}
+
</ins><span class="cx"> WebPageGroup* WebPageGroup::get(uint64_t pageGroupID)
</span><span class="cx"> {
</span><span class="cx"> return webPageGroupMap().get(pageGroupID);
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessWebPageGrouph"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/WebPageGroup.h (159895 => 159896)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/WebPageGroup.h 2013-12-01 06:24:05 UTC (rev 159895)
+++ trunk/Source/WebKit2/UIProcess/WebPageGroup.h 2013-12-01 06:40:24 UTC (rev 159896)
</span><span class="lines">@@ -42,6 +42,7 @@
</span><span class="cx"> public:
</span><span class="cx"> WebPageGroup(const String& identifier = String(), bool visibleToInjectedBundle = true, bool visibleToHistoryClient = true);
</span><span class="cx"> static PassRefPtr<WebPageGroup> create(const String& identifier = String(), bool visibleToInjectedBundle = true, bool visibleToHistoryClient = true);
</span><ins>+ static PassRef<WebPageGroup> createNonNull(const String& identifier = String(), bool visibleToInjectedBundle = true, bool visibleToHistoryClient = true);
</ins><span class="cx"> static WebPageGroup* get(uint64_t pageGroupID);
</span><span class="cx">
</span><span class="cx"> virtual ~WebPageGroup();
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessWebPageProxycpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/WebPageProxy.cpp (159895 => 159896)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/WebPageProxy.cpp 2013-12-01 06:24:05 UTC (rev 159895)
+++ trunk/Source/WebKit2/UIProcess/WebPageProxy.cpp 2013-12-01 06:40:24 UTC (rev 159896)
</span><span class="lines">@@ -222,16 +222,16 @@
</span><span class="cx"> }
</span><span class="cx"> #endif // !LOG_DISABLED
</span><span class="cx">
</span><del>-PassRefPtr<WebPageProxy> WebPageProxy::create(PageClient& pageClient, PassRefPtr<WebProcessProxy> process, WebPageGroup* pageGroup, uint64_t pageID)
</del><ins>+PassRefPtr<WebPageProxy> WebPageProxy::create(PageClient& pageClient, PassRefPtr<WebProcessProxy> process, WebPageGroup& pageGroup, uint64_t pageID)
</ins><span class="cx"> {
</span><span class="cx"> return adoptRef(new WebPageProxy(pageClient, process, pageGroup, pageID));
</span><span class="cx"> }
</span><span class="cx">
</span><del>-WebPageProxy::WebPageProxy(PageClient& pageClient, PassRefPtr<WebProcessProxy> process, WebPageGroup* pageGroup, uint64_t pageID)
</del><ins>+WebPageProxy::WebPageProxy(PageClient& pageClient, PassRefPtr<WebProcessProxy> process, WebPageGroup& pageGroup, uint64_t pageID)
</ins><span class="cx"> : m_pageClient(pageClient)
</span><span class="cx"> , m_process(process)
</span><span class="cx"> , m_pageGroup(pageGroup)
</span><del>- , m_mainFrame(0)
</del><ins>+ , m_mainFrame(nullptr)
</ins><span class="cx"> , m_userAgent(standardUserAgent())
</span><span class="cx"> , m_geolocationPermissionRequestManager(*this)
</span><span class="cx"> , m_notificationPermissionRequestManager(*this)
</span><span class="lines">@@ -593,7 +593,7 @@
</span><span class="cx">
</span><span class="cx"> #if ENABLE(INSPECTOR)
</span><span class="cx"> // Don't give the inspector full access to the file system.
</span><del>- if (WebInspectorProxy::isInspectorPage(this))
</del><ins>+ if (WebInspectorProxy::isInspectorPage(*this))
</ins><span class="cx"> return false;
</span><span class="cx"> #endif
</span><span class="cx">
</span><span class="lines">@@ -2017,7 +2017,7 @@
</span><span class="cx"> // even if nothing changed in UI process, so that overrides get removed.
</span><span class="cx">
</span><span class="cx"> // Preferences need to be updated during synchronous printing to make "print backgrounds" preference work when toggled from a print dialog checkbox.
</span><del>- m_process->send(Messages::WebPage::PreferencesDidChange(pageGroup()->preferences()->store()), m_pageID, m_isPerformingDOMPrintOperation ? CoreIPC::DispatchMessageEvenWhenWaitingForSyncReply : 0);
</del><ins>+ m_process->send(Messages::WebPage::PreferencesDidChange(pageGroup().preferences()->store()), m_pageID, m_isPerformingDOMPrintOperation ? CoreIPC::DispatchMessageEvenWhenWaitingForSyncReply : 0);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void WebPageProxy::didCreateMainFrame(uint64_t frameID)
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessWebPageProxyh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/WebPageProxy.h (159895 => 159896)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/WebPageProxy.h 2013-12-01 06:24:05 UTC (rev 159895)
+++ trunk/Source/WebKit2/UIProcess/WebPageProxy.h 2013-12-01 06:40:24 UTC (rev 159896)
</span><span class="lines">@@ -322,7 +322,7 @@
</span><span class="cx"> , public CoreIPC::MessageReceiver {
</span><span class="cx"> public:
</span><span class="cx">
</span><del>- static PassRefPtr<WebPageProxy> create(PageClient&, PassRefPtr<WebProcessProxy>, WebPageGroup*, uint64_t pageID);
</del><ins>+ static PassRefPtr<WebPageProxy> create(PageClient&, PassRefPtr<WebProcessProxy>, WebPageGroup&, uint64_t pageID);
</ins><span class="cx"> virtual ~WebPageProxy();
</span><span class="cx">
</span><span class="cx"> uint64_t pageID() const { return m_pageID; }
</span><span class="lines">@@ -700,7 +700,7 @@
</span><span class="cx"> WebProcessProxy* process() const;
</span><span class="cx"> PlatformProcessIdentifier processIdentifier() const;
</span><span class="cx">
</span><del>- WebPageGroup* pageGroup() const { return m_pageGroup.get(); }
</del><ins>+ WebPageGroup& pageGroup() { return m_pageGroup.get(); }
</ins><span class="cx">
</span><span class="cx"> bool isValid() const;
</span><span class="cx">
</span><span class="lines">@@ -847,7 +847,7 @@
</span><span class="cx"> WebCore::ScrollPinningBehavior scrollPinningBehavior() { return m_scrollPinningBehavior; }
</span><span class="cx">
</span><span class="cx"> private:
</span><del>- WebPageProxy(PageClient&, PassRefPtr<WebProcessProxy>, WebPageGroup*, uint64_t pageID);
</del><ins>+ WebPageProxy(PageClient&, PassRefPtr<WebProcessProxy>, WebPageGroup&, uint64_t pageID);
</ins><span class="cx"> void platformInitialize();
</span><span class="cx"> void initializeCreationParameters();
</span><span class="cx">
</span><span class="lines">@@ -1154,7 +1154,7 @@
</span><span class="cx">
</span><span class="cx"> std::unique_ptr<DrawingAreaProxy> m_drawingArea;
</span><span class="cx"> RefPtr<WebProcessProxy> m_process;
</span><del>- RefPtr<WebPageGroup> m_pageGroup;
</del><ins>+ Ref<WebPageGroup> m_pageGroup;
</ins><span class="cx"> RefPtr<WebFrameProxy> m_mainFrame;
</span><span class="cx"> RefPtr<WebFrameProxy> m_focusedFrame;
</span><span class="cx"> RefPtr<WebFrameProxy> m_frameSetLargestFrame;
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessWebProcessProxycpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/WebProcessProxy.cpp (159895 => 159896)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/WebProcessProxy.cpp 2013-12-01 06:24:05 UTC (rev 159895)
+++ trunk/Source/WebKit2/UIProcess/WebProcessProxy.cpp 2013-12-01 06:40:24 UTC (rev 159896)
</span><span class="lines">@@ -160,7 +160,7 @@
</span><span class="cx"> return globalPageMap().get(pageID);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-PassRefPtr<WebPageProxy> WebProcessProxy::createWebPage(PageClient& pageClient, WebContext*, WebPageGroup* pageGroup)
</del><ins>+PassRefPtr<WebPageProxy> WebProcessProxy::createWebPage(PageClient& pageClient, WebPageGroup& pageGroup)
</ins><span class="cx"> {
</span><span class="cx"> uint64_t pageID = generatePageID();
</span><span class="cx"> RefPtr<WebPageProxy> webPage = WebPageProxy::create(pageClient, this, pageGroup, pageID);
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessWebProcessProxyh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/WebProcessProxy.h (159895 => 159896)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/WebProcessProxy.h 2013-12-01 06:24:05 UTC (rev 159895)
+++ trunk/Source/WebKit2/UIProcess/WebProcessProxy.h 2013-12-01 06:40:24 UTC (rev 159896)
</span><span class="lines">@@ -77,7 +77,7 @@
</span><span class="cx"> WebContext* context() const { return m_context.get(); }
</span><span class="cx">
</span><span class="cx"> static WebPageProxy* webPage(uint64_t pageID);
</span><del>- PassRefPtr<WebPageProxy> createWebPage(PageClient&, WebContext*, WebPageGroup*);
</del><ins>+ PassRefPtr<WebPageProxy> createWebPage(PageClient&, WebPageGroup&);
</ins><span class="cx"> void addExistingWebPage(WebPageProxy*, uint64_t pageID);
</span><span class="cx"> void removeWebPage(uint64_t pageID);
</span><span class="cx"> Vector<WebPageProxy*> pages() const;
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessmacWebInspectorProxyMacmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/mac/WebInspectorProxyMac.mm (159895 => 159896)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/mac/WebInspectorProxyMac.mm 2013-12-01 06:24:05 UTC (rev 159895)
+++ trunk/Source/WebKit2/UIProcess/mac/WebInspectorProxyMac.mm 2013-12-01 06:40:24 UTC (rev 159896)
</span><span class="lines">@@ -285,7 +285,7 @@
</span><span class="cx"> NSRect windowFrame = NSMakeRect(0, 0, initialWindowWidth, initialWindowHeight);
</span><span class="cx">
</span><span class="cx"> // Restore the saved window frame, if there was one.
</span><del>- NSString *savedWindowFrameString = page()->pageGroup()->preferences()->inspectorWindowFrame();
</del><ins>+ NSString *savedWindowFrameString = page()->pageGroup().preferences()->inspectorWindowFrame();
</ins><span class="cx"> NSRect savedWindowFrame = NSRectFromString(savedWindowFrameString);
</span><span class="cx"> if (!NSIsEmptyRect(savedWindowFrame))
</span><span class="cx"> windowFrame = savedWindowFrame;
</span><span class="lines">@@ -384,7 +384,7 @@
</span><span class="cx"> } else {
</span><span class="cx"> initialRect = NSMakeRect(0, 0, initialWindowWidth, initialWindowHeight);
</span><span class="cx">
</span><del>- NSString *windowFrameString = page()->pageGroup()->preferences()->inspectorWindowFrame();
</del><ins>+ NSString *windowFrameString = page()->pageGroup().preferences()->inspectorWindowFrame();
</ins><span class="cx"> NSRect windowFrame = NSRectFromString(windowFrameString);
</span><span class="cx"> if (!NSIsEmptyRect(windowFrame))
</span><span class="cx"> initialRect = [NSWindow contentRectForFrameRect:windowFrame styleMask:windowStyleMask];
</span><span class="lines">@@ -607,7 +607,7 @@
</span><span class="cx"> return;
</span><span class="cx">
</span><span class="cx"> NSString *frameString = NSStringFromRect([m_inspectorWindow frame]);
</span><del>- page()->pageGroup()->preferences()->setInspectorWindowFrame(frameString);
</del><ins>+ page()->pageGroup().preferences()->setInspectorWindowFrame(frameString);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void WebInspectorProxy::inspectedViewFrameDidChange(CGFloat currentDimension)
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessmacWebProcessProxyMacmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/mac/WebProcessProxyMac.mm (159895 => 159896)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/mac/WebProcessProxyMac.mm 2013-12-01 06:24:05 UTC (rev 159895)
+++ trunk/Source/WebKit2/UIProcess/mac/WebProcessProxyMac.mm 2013-12-01 06:40:24 UTC (rev 159896)
</span><span class="lines">@@ -61,7 +61,7 @@
</span><span class="cx">
</span><span class="cx"> bool WebProcessProxy::pageIsProcessSuppressible(WebPageProxy* page)
</span><span class="cx"> {
</span><del>- return !page->isViewVisible() && page->pageGroup()->preferences()->pageVisibilityBasedProcessSuppressionEnabled();
</del><ins>+ return !page->isViewVisible() && page->pageGroup().preferences()->pageVisibilityBasedProcessSuppressionEnabled();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> bool WebProcessProxy::allPagesAreProcessSuppressible() const
</span></span></pre>
</div>
</div>
</body>
</html>