Diff
Modified: trunk/Source/WebKit2/ChangeLog (159887 => 159888)
--- 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)
@@ -1,3 +1,24 @@
+2013-11-30 Sam Weinig <[email protected]>
+
+ [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.
+
2013-11-30 Dan Bernstein <[email protected]>
<rdar://problem/15560240> ResourceError encoding drops NSURL-valued keys in the NSError’s userInfo, including NSErrorFailingURLKey
Modified: trunk/Source/WebKit2/UIProcess/GeolocationPermissionRequestManagerProxy.cpp (159887 => 159888)
--- 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)
@@ -32,17 +32,15 @@
namespace WebKit {
-GeolocationPermissionRequestManagerProxy::GeolocationPermissionRequestManagerProxy(WebPageProxy* page)
+GeolocationPermissionRequestManagerProxy::GeolocationPermissionRequestManagerProxy(WebPageProxy& page)
: m_page(page)
{
}
void GeolocationPermissionRequestManagerProxy::invalidateRequests()
{
- PendingRequestMap::const_iterator it = m_pendingRequests.begin();
- PendingRequestMap::const_iterator end = m_pendingRequests.end();
- for (; it != end; ++it)
- it->value->invalidate();
+ for (auto request : m_pendingRequests.values())
+ request->invalidate();
m_pendingRequests.clear();
}
@@ -56,15 +54,15 @@
void GeolocationPermissionRequestManagerProxy::didReceiveGeolocationPermissionDecision(uint64_t geolocationID, bool allowed)
{
- if (!m_page->isValid())
+ if (!m_page.isValid())
return;
- PendingRequestMap::iterator it = m_pendingRequests.find(geolocationID);
+ auto it = m_pendingRequests.find(geolocationID);
if (it == m_pendingRequests.end())
return;
#if ENABLE(GEOLOCATION)
- m_page->process()->send(Messages::WebPage::DidReceiveGeolocationPermissionDecision(geolocationID, allowed), m_page->pageID());
+ m_page.process()->send(Messages::WebPage::DidReceiveGeolocationPermissionDecision(geolocationID, allowed), m_page.pageID());
#else
UNUSED_PARAM(allowed);
#endif
Modified: trunk/Source/WebKit2/UIProcess/GeolocationPermissionRequestManagerProxy.h (159887 => 159888)
--- 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)
@@ -35,7 +35,7 @@
class GeolocationPermissionRequestManagerProxy {
public:
- explicit GeolocationPermissionRequestManagerProxy(WebPageProxy*);
+ explicit GeolocationPermissionRequestManagerProxy(WebPageProxy&);
void invalidateRequests();
@@ -46,9 +46,8 @@
void didReceiveGeolocationPermissionDecision(uint64_t, bool allow);
private:
- typedef HashMap<uint64_t, RefPtr<GeolocationPermissionRequestProxy>> PendingRequestMap;
- PendingRequestMap m_pendingRequests;
- WebPageProxy* m_page;
+ HashMap<uint64_t, RefPtr<GeolocationPermissionRequestProxy>> m_pendingRequests;
+ WebPageProxy& m_page;
};
} // namespace WebKit
Modified: trunk/Source/WebKit2/UIProcess/Notifications/NotificationPermissionRequestManagerProxy.cpp (159887 => 159888)
--- 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)
@@ -33,18 +33,16 @@
namespace WebKit {
-NotificationPermissionRequestManagerProxy::NotificationPermissionRequestManagerProxy(WebPageProxy* page)
+NotificationPermissionRequestManagerProxy::NotificationPermissionRequestManagerProxy(WebPageProxy& page)
: m_page(page)
{
}
void NotificationPermissionRequestManagerProxy::invalidateRequests()
{
- PendingRequestMap::const_iterator it = m_pendingRequests.begin();
- PendingRequestMap::const_iterator end = m_pendingRequests.end();
- for (; it != end; ++it)
- it->value->invalidate();
-
+ for (auto request : m_pendingRequests.values())
+ request->invalidate();
+
m_pendingRequests.clear();
}
@@ -57,14 +55,14 @@
void NotificationPermissionRequestManagerProxy::didReceiveNotificationPermissionDecision(uint64_t notificationID, bool allow)
{
- if (!m_page->isValid())
+ if (!m_page.isValid())
return;
RefPtr<NotificationPermissionRequest> request = m_pendingRequests.take(notificationID);
if (!request)
return;
- m_page->process()->send(Messages::WebPage::DidReceiveNotificationPermissionDecision(notificationID, allow), m_page->pageID());
+ m_page.process()->send(Messages::WebPage::DidReceiveNotificationPermissionDecision(notificationID, allow), m_page.pageID());
}
} // namespace WebKit
Modified: trunk/Source/WebKit2/UIProcess/Notifications/NotificationPermissionRequestManagerProxy.h (159887 => 159888)
--- 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)
@@ -36,7 +36,7 @@
class NotificationPermissionRequestManagerProxy {
public:
- explicit NotificationPermissionRequestManagerProxy(WebPageProxy*);
+ explicit NotificationPermissionRequestManagerProxy(WebPageProxy&);
void invalidateRequests();
@@ -47,12 +47,10 @@
void didReceiveNotificationPermissionDecision(uint64_t notificationID, bool allow);
private:
- typedef HashMap<uint64_t, RefPtr<NotificationPermissionRequest>> PendingRequestMap;
- PendingRequestMap m_pendingRequests;
- WebPageProxy* m_page;
+ HashMap<uint64_t, RefPtr<NotificationPermissionRequest>> m_pendingRequests;
+ WebPageProxy& m_page;
};
} // namespace WebKit
-
#endif // NotificationPermissionRequestManagerProxy_h
Modified: trunk/Source/WebKit2/UIProcess/WebPageProxy.cpp (159887 => 159888)
--- 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)
@@ -233,8 +233,8 @@
, m_pageGroup(pageGroup)
, m_mainFrame(0)
, m_userAgent(standardUserAgent())
- , m_geolocationPermissionRequestManager(this)
- , m_notificationPermissionRequestManager(this)
+ , m_geolocationPermissionRequestManager(*this)
+ , m_notificationPermissionRequestManager(*this)
, m_estimatedProgress(0)
, m_viewState(ViewState::NoFlags)
, m_backForwardList(WebBackForwardList::create(this))
