<!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>[159888] 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/159888">159888</a></dd>
<dt>Author</dt> <dd>weinig@apple.com</dd>
<dt>Date</dt> <dd>2013-11-30 10:55:27 -0800 (Sat, 30 Nov 2013)</dd>
</dl>
<h3>Log Message</h3>
<pre>[RTTE] The PermissionRequestManagerProxies should use WebPageProxy references.
https://bugs.webkit.org/show_bug.cgi?id=125029
Reviewed by Dan Bernstein.
* UIProcess/GeolocationPermissionRequestManagerProxy.cpp:
(WebKit::GeolocationPermissionRequestManagerProxy::GeolocationPermissionRequestManagerProxy):
(WebKit::GeolocationPermissionRequestManagerProxy::invalidateRequests):
(WebKit::GeolocationPermissionRequestManagerProxy::didReceiveGeolocationPermissionDecision):
* UIProcess/GeolocationPermissionRequestManagerProxy.h:
* UIProcess/Notifications/NotificationPermissionRequestManagerProxy.cpp:
(WebKit::NotificationPermissionRequestManagerProxy::NotificationPermissionRequestManagerProxy):
(WebKit::NotificationPermissionRequestManagerProxy::invalidateRequests):
(WebKit::NotificationPermissionRequestManagerProxy::didReceiveNotificationPermissionDecision):
* UIProcess/Notifications/NotificationPermissionRequestManagerProxy.h:
* UIProcess/WebPageProxy.cpp:
(WebKit::WebPageProxy::WebPageProxy):
Do some additional modernization while we are here.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeLog</a></li>
<li><a href="#trunkSourceWebKit2UIProcessGeolocationPermissionRequestManagerProxycpp">trunk/Source/WebKit2/UIProcess/GeolocationPermissionRequestManagerProxy.cpp</a></li>
<li><a href="#trunkSourceWebKit2UIProcessGeolocationPermissionRequestManagerProxyh">trunk/Source/WebKit2/UIProcess/GeolocationPermissionRequestManagerProxy.h</a></li>
<li><a href="#trunkSourceWebKit2UIProcessNotificationsNotificationPermissionRequestManagerProxycpp">trunk/Source/WebKit2/UIProcess/Notifications/NotificationPermissionRequestManagerProxy.cpp</a></li>
<li><a href="#trunkSourceWebKit2UIProcessNotificationsNotificationPermissionRequestManagerProxyh">trunk/Source/WebKit2/UIProcess/Notifications/NotificationPermissionRequestManagerProxy.h</a></li>
<li><a href="#trunkSourceWebKit2UIProcessWebPageProxycpp">trunk/Source/WebKit2/UIProcess/WebPageProxy.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (159887 => 159888)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2013-11-30 18:49:53 UTC (rev 159887)
+++ trunk/Source/WebKit2/ChangeLog 2013-11-30 18:55:27 UTC (rev 159888)
</span><span class="lines">@@ -1,3 +1,24 @@
</span><ins>+2013-11-30 Sam Weinig <sam@webkit.org>
+
+ [RTTE] The PermissionRequestManagerProxies should use WebPageProxy references.
+ https://bugs.webkit.org/show_bug.cgi?id=125029
+
+ Reviewed by Dan Bernstein.
+
+ * UIProcess/GeolocationPermissionRequestManagerProxy.cpp:
+ (WebKit::GeolocationPermissionRequestManagerProxy::GeolocationPermissionRequestManagerProxy):
+ (WebKit::GeolocationPermissionRequestManagerProxy::invalidateRequests):
+ (WebKit::GeolocationPermissionRequestManagerProxy::didReceiveGeolocationPermissionDecision):
+ * UIProcess/GeolocationPermissionRequestManagerProxy.h:
+ * UIProcess/Notifications/NotificationPermissionRequestManagerProxy.cpp:
+ (WebKit::NotificationPermissionRequestManagerProxy::NotificationPermissionRequestManagerProxy):
+ (WebKit::NotificationPermissionRequestManagerProxy::invalidateRequests):
+ (WebKit::NotificationPermissionRequestManagerProxy::didReceiveNotificationPermissionDecision):
+ * UIProcess/Notifications/NotificationPermissionRequestManagerProxy.h:
+ * UIProcess/WebPageProxy.cpp:
+ (WebKit::WebPageProxy::WebPageProxy):
+ Do some additional modernization while we are here.
+
</ins><span class="cx"> 2013-11-30 Dan Bernstein <mitz@apple.com>
</span><span class="cx">
</span><span class="cx"> <rdar://problem/15560240> ResourceError encoding drops NSURL-valued keys in the NSError’s userInfo, including NSErrorFailingURLKey
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessGeolocationPermissionRequestManagerProxycpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/GeolocationPermissionRequestManagerProxy.cpp (159887 => 159888)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/GeolocationPermissionRequestManagerProxy.cpp 2013-11-30 18:49:53 UTC (rev 159887)
+++ trunk/Source/WebKit2/UIProcess/GeolocationPermissionRequestManagerProxy.cpp 2013-11-30 18:55:27 UTC (rev 159888)
</span><span class="lines">@@ -32,17 +32,15 @@
</span><span class="cx">
</span><span class="cx"> namespace WebKit {
</span><span class="cx">
</span><del>-GeolocationPermissionRequestManagerProxy::GeolocationPermissionRequestManagerProxy(WebPageProxy* page)
</del><ins>+GeolocationPermissionRequestManagerProxy::GeolocationPermissionRequestManagerProxy(WebPageProxy& page)
</ins><span class="cx"> : m_page(page)
</span><span class="cx"> {
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void GeolocationPermissionRequestManagerProxy::invalidateRequests()
</span><span class="cx"> {
</span><del>- PendingRequestMap::const_iterator it = m_pendingRequests.begin();
- PendingRequestMap::const_iterator end = m_pendingRequests.end();
- for (; it != end; ++it)
- it->value->invalidate();
</del><ins>+ for (auto request : m_pendingRequests.values())
+ request->invalidate();
</ins><span class="cx">
</span><span class="cx"> m_pendingRequests.clear();
</span><span class="cx"> }
</span><span class="lines">@@ -56,15 +54,15 @@
</span><span class="cx">
</span><span class="cx"> void GeolocationPermissionRequestManagerProxy::didReceiveGeolocationPermissionDecision(uint64_t geolocationID, bool allowed)
</span><span class="cx"> {
</span><del>- if (!m_page->isValid())
</del><ins>+ if (!m_page.isValid())
</ins><span class="cx"> return;
</span><span class="cx">
</span><del>- PendingRequestMap::iterator it = m_pendingRequests.find(geolocationID);
</del><ins>+ auto it = m_pendingRequests.find(geolocationID);
</ins><span class="cx"> if (it == m_pendingRequests.end())
</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="trunkSourceWebKit2UIProcessGeolocationPermissionRequestManagerProxyh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/GeolocationPermissionRequestManagerProxy.h (159887 => 159888)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/GeolocationPermissionRequestManagerProxy.h 2013-11-30 18:49:53 UTC (rev 159887)
+++ trunk/Source/WebKit2/UIProcess/GeolocationPermissionRequestManagerProxy.h 2013-11-30 18:55:27 UTC (rev 159888)
</span><span class="lines">@@ -35,7 +35,7 @@
</span><span class="cx">
</span><span class="cx"> class GeolocationPermissionRequestManagerProxy {
</span><span class="cx"> public:
</span><del>- explicit GeolocationPermissionRequestManagerProxy(WebPageProxy*);
</del><ins>+ explicit GeolocationPermissionRequestManagerProxy(WebPageProxy&);
</ins><span class="cx">
</span><span class="cx"> void invalidateRequests();
</span><span class="cx">
</span><span class="lines">@@ -46,9 +46,8 @@
</span><span class="cx"> void didReceiveGeolocationPermissionDecision(uint64_t, bool allow);
</span><span class="cx">
</span><span class="cx"> private:
</span><del>- typedef HashMap<uint64_t, RefPtr<GeolocationPermissionRequestProxy>> PendingRequestMap;
- PendingRequestMap m_pendingRequests;
- WebPageProxy* m_page;
</del><ins>+ HashMap<uint64_t, RefPtr<GeolocationPermissionRequestProxy>> m_pendingRequests;
+ WebPageProxy& m_page;
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> } // namespace WebKit
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessNotificationsNotificationPermissionRequestManagerProxycpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/Notifications/NotificationPermissionRequestManagerProxy.cpp (159887 => 159888)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/Notifications/NotificationPermissionRequestManagerProxy.cpp 2013-11-30 18:49:53 UTC (rev 159887)
+++ trunk/Source/WebKit2/UIProcess/Notifications/NotificationPermissionRequestManagerProxy.cpp 2013-11-30 18:55:27 UTC (rev 159888)
</span><span class="lines">@@ -33,18 +33,16 @@
</span><span class="cx">
</span><span class="cx"> namespace WebKit {
</span><span class="cx">
</span><del>-NotificationPermissionRequestManagerProxy::NotificationPermissionRequestManagerProxy(WebPageProxy* page)
</del><ins>+NotificationPermissionRequestManagerProxy::NotificationPermissionRequestManagerProxy(WebPageProxy& page)
</ins><span class="cx"> : m_page(page)
</span><span class="cx"> {
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void NotificationPermissionRequestManagerProxy::invalidateRequests()
</span><span class="cx"> {
</span><del>- PendingRequestMap::const_iterator it = m_pendingRequests.begin();
- PendingRequestMap::const_iterator end = m_pendingRequests.end();
- for (; it != end; ++it)
- it->value->invalidate();
-
</del><ins>+ for (auto request : m_pendingRequests.values())
+ request->invalidate();
+
</ins><span class="cx"> m_pendingRequests.clear();
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -57,14 +55,14 @@
</span><span class="cx">
</span><span class="cx"> void NotificationPermissionRequestManagerProxy::didReceiveNotificationPermissionDecision(uint64_t notificationID, bool allow)
</span><span class="cx"> {
</span><del>- if (!m_page->isValid())
</del><ins>+ if (!m_page.isValid())
</ins><span class="cx"> return;
</span><span class="cx">
</span><span class="cx"> RefPtr<NotificationPermissionRequest> request = m_pendingRequests.take(notificationID);
</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="trunkSourceWebKit2UIProcessNotificationsNotificationPermissionRequestManagerProxyh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/Notifications/NotificationPermissionRequestManagerProxy.h (159887 => 159888)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/Notifications/NotificationPermissionRequestManagerProxy.h 2013-11-30 18:49:53 UTC (rev 159887)
+++ trunk/Source/WebKit2/UIProcess/Notifications/NotificationPermissionRequestManagerProxy.h 2013-11-30 18:55:27 UTC (rev 159888)
</span><span class="lines">@@ -36,7 +36,7 @@
</span><span class="cx">
</span><span class="cx"> class NotificationPermissionRequestManagerProxy {
</span><span class="cx"> public:
</span><del>- explicit NotificationPermissionRequestManagerProxy(WebPageProxy*);
</del><ins>+ explicit NotificationPermissionRequestManagerProxy(WebPageProxy&);
</ins><span class="cx">
</span><span class="cx"> void invalidateRequests();
</span><span class="cx">
</span><span class="lines">@@ -47,12 +47,10 @@
</span><span class="cx"> void didReceiveNotificationPermissionDecision(uint64_t notificationID, bool allow);
</span><span class="cx">
</span><span class="cx"> private:
</span><del>- typedef HashMap<uint64_t, RefPtr<NotificationPermissionRequest>> PendingRequestMap;
- PendingRequestMap m_pendingRequests;
- WebPageProxy* m_page;
</del><ins>+ HashMap<uint64_t, RefPtr<NotificationPermissionRequest>> m_pendingRequests;
+ WebPageProxy& m_page;
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> } // namespace WebKit
</span><span class="cx">
</span><del>-
</del><span class="cx"> #endif // NotificationPermissionRequestManagerProxy_h
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessWebPageProxycpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/WebPageProxy.cpp (159887 => 159888)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/WebPageProxy.cpp 2013-11-30 18:49:53 UTC (rev 159887)
+++ trunk/Source/WebKit2/UIProcess/WebPageProxy.cpp 2013-11-30 18:55:27 UTC (rev 159888)
</span><span class="lines">@@ -233,8 +233,8 @@
</span><span class="cx"> , m_pageGroup(pageGroup)
</span><span class="cx"> , m_mainFrame(0)
</span><span class="cx"> , m_userAgent(standardUserAgent())
</span><del>- , m_geolocationPermissionRequestManager(this)
- , m_notificationPermissionRequestManager(this)
</del><ins>+ , m_geolocationPermissionRequestManager(*this)
+ , m_notificationPermissionRequestManager(*this)
</ins><span class="cx"> , m_estimatedProgress(0)
</span><span class="cx"> , m_viewState(ViewState::NoFlags)
</span><span class="cx"> , m_backForwardList(WebBackForwardList::create(this))
</span></span></pre>
</div>
</div>
</body>
</html>