Changeset 102352 in webkit

Timestamp:

Dec 8, 2011 11:06:59 AM (12 years ago)

Author:

jonlee@apple.com

Message:

[WK2] Add permissions support (73960)
​https://bugs.webkit.org/show_bug.cgi?id=73960
<rdar://problem/10357008>

Reviewed by Darin Adler.

Source/WebKit2:

• DerivedSources.make: Moved notification files to its own directory. Need to add that path.
• WebKit2.xcodeproj/project.pbxproj: New header and impl files.
• Target.pri: Ditto.
• GNUmakefile.am: Ditto.
• win/WebKit2.vcproj: Ditto.
• win/WebKit2Common.vsprops: Add path to Notifications directory.

Implement permission functions, which go through permission request manager.

• WebProcess/WebCoreSupport/WebNotificationClient.cpp:

(WebKit::WebNotificationClient::requestPermission):
(WebKit::WebNotificationClient::cancelRequestsForPermission):
(WebKit::WebNotificationClient::checkPermission):

New NotificationPermissionRequestManager to make and cancel permission requests, and to retrieve current
policy.

• WebProcess/Notifications/NotificationPermissionRequestManager.cpp: Added.

(WebKit::generateRequestID):
(WebKit::NotificationPermissionRequestManager::create):
(WebKit::NotificationPermissionRequestManager::NotificationPermissionRequestManager):
(WebKit::NotificationPermissionRequestManager::startRequest): Keep track of the provided callback once
policy decision is made.
(WebKit::NotificationPermissionRequestManager::cancelRequest):
(WebKit::NotificationPermissionRequestManager::permissionLevel): Retrieve level through a synchronous
message to the proxy.
(WebKit::NotificationPermissionRequestManager::didReceiveNotificationPermissionDecision): Invoke the callback.

• WebProcess/Notifications/NotificationPermissionRequestManager.h: Added.

(WebKit::isRequestIDValid): Make sure any provided request IDs are valid.

Added new NotificationPermissionRequest class.

• UIProcess/Notifications/NotificationPermissionRequest.cpp: Added.

(WebKit::NotificationPermissionRequest::create):
(WebKit::NotificationPermissionRequest::NotificationPermissionRequest):
(WebKit::NotificationPermissionRequest::allow): Notify manager of decision.
(WebKit::NotificationPermissionRequest::deny): Ditto.
(WebKit::NotificationPermissionRequest::invalidate): Disassociate with manager.
(WebKit::NotificationPermissionRequest::type):

• UIProcess/Notifications/NotificationPermissionRequest.h: Added.

WKAPI support for NotificationPermissionRequest:

• Shared/API/c/WKBase.h:
• Shared/APIObject.h:
• UIProcess/API/C/WKAPICast.h:
• UIProcess/API/C/WKNotificationPermissionRequest.cpp: Added.

(WKNotificationPermissionRequestGetTypeID):
(WKNotificationPermissionRequestAllow):
(WKNotificationPermissionRequestDeny):

• UIProcess/API/C/WKNotificationPermissionRequest.h: Added.

Other additions to WK API:

• UIProcess/API/C/WKNotificationProvider.h: Added new callback for WKNotificationProviders, to return policy

for a given security origin.

• UIProcess/API/C/WKPage.h: Added new callback to WKPageUIClient to ask user to decide on policy.

New NotificationPermissionRequestManagerProxy to create requests.

• UIProcess/Notifications/NotificationPermissionRequestManagerProxy.cpp: Added.

(WebKit::NotificationPermissionRequestManagerProxy::NotificationPermissionRequestManagerProxy):
(WebKit::NotificationPermissionRequestManagerProxy::invalidateRequests):
(WebKit::NotificationPermissionRequestManagerProxy::createRequest):
(WebKit::NotificationPermissionRequestManagerProxy::didReceiveNotificationPermissionDecision):

• UIProcess/Notifications/NotificationPermissionRequestManagerProxy.h: Added.

Added new message to notification manager: NotificationPermissionLevel, to retrieve policy. The current
JS API retrieves the permission synchronously, so the message needs to be sent synchronously also.

• UIProcess/Notifications/WebNotificationManagerProxy.messages.in: Moved from Source/WebKit2/UIProcess/WebNotificationManagerProxy.messages.in.
• UIProcess/Notifications/WebNotificationProvider.cpp: Moved from Source/WebKit2/UIProcess/WebNotificationProvider.cpp.

(WebKit::WebNotificationProvider::policyForNotificationPermissionAtOrigin): Added.

• UIProcess/Notifications/WebNotificationProvider.h: Moved from Source/WebKit2/UIProcess/WebNotificationProvider.h.
• UIProcess/WebProcessProxy.cpp:

(WebKit::WebProcessProxy::didReceiveSyncMessage): Boilerplate to forward messages to notification manager.

• UIProcess/Notifications/WebNotificationManagerProxy.cpp: Moved from Source/WebKit2/UIProcess/WebNotificationManagerProxy.cpp.

(WebKit::WebNotificationManagerProxy::create):
(WebKit::WebNotificationManagerProxy::WebNotificationManagerProxy):
(WebKit::WebNotificationManagerProxy::invalidate):
(WebKit::WebNotificationManagerProxy::initializeProvider):
(WebKit::WebNotificationManagerProxy::didReceiveMessage):
(WebKit::WebNotificationManagerProxy::didReceiveSyncMessage):
(WebKit::WebNotificationManagerProxy::show):
(WebKit::WebNotificationManagerProxy::cancel):
(WebKit::WebNotificationManagerProxy::didDestroyNotification):
(WebKit::WebNotificationManagerProxy::notificationPermissionLevel): Retrieve the policy from the provider.
(WebKit::WebNotificationManagerProxy::providerDidShowNotification):
(WebKit::WebNotificationManagerProxy::providerDidClickNotification):
(WebKit::WebNotificationManagerProxy::providerDidCloseNotifications):

• UIProcess/Notifications/WebNotificationManagerProxy.h: Moved from Source/WebKit2/UIProcess/WebNotificationManagerProxy.h.

(WebKit::WebNotificationManagerProxy::clearContext):
(WebKit::WebNotificationManagerProxy::type):

Added NotificationPermissionRequestManagerProxy to WebPageProxy, to allow a request for permission to
go through to the UI client. Added new message to WebPageProxy, RequestNotificationPermission.

• UIProcess/WebPageProxy.cpp:

(WebKit::WebPageProxy::WebPageProxy):
(WebKit::WebPageProxy::close): Invalidate pending requests.
(WebKit::WebPageProxy::processDidCrash): Ditto.
(WebKit::WebPageProxy::requestNotificationPermission): Forward request to UI client.

• UIProcess/WebPageProxy.h:
• UIProcess/WebPageProxy.messages.in:

• UIProcess/WebUIClient.cpp:

(WebKit::WebUIClient::decidePolicyForNotificationPermissionRequest):

• UIProcess/WebUIClient.h:

Added new message DidReceiveNotificationPermissionDecision. The WebPage forwards the message to the
permission request manager.

• WebProcess/WebPage/WebPage.messages.in: Added new message DidReceiveNotificationPermissionDecision
• WebProcess/WebPage/WebPage.cpp:

(WebKit::WebPage::notificationPermissionRequestManager): Create manager on request.
(WebKit::WebPage::didReceiveNotificationPermissionDecision):

• WebProcess/WebPage/WebPage.h:

Moving files to Notifications/ subdirectory.

• UIProcess/Notifications/WebNotification.cpp: Moved from Source/WebKit2/UIProcess/WebNotification.cpp.
• UIProcess/Notifications/WebNotification.h: Moved from Source/WebKit2/UIProcess/WebNotification.h.

Tools:

Add null function item to comply with added callback to WKPageUIClient.

• MiniBrowser/mac/BrowserWindowController.m:

(-[BrowserWindowController awakeFromNib]):

• WebKitTestRunner/TestController.cpp:

(WTR::TestController::createOtherPage):
(WTR::TestController::initialize):

Location:

trunk

Files:

• Source/WebKit2/ChangeLog (modified) (1 diff)
• Source/WebKit2/DerivedSources.make (modified) (1 diff)
• Source/WebKit2/GNUmakefile.am (modified) (9 diffs)
• Source/WebKit2/Shared/API/c/WKBase.h (modified) (1 diff)
• Source/WebKit2/Shared/APIObject.h (modified) (1 diff)
• Source/WebKit2/Target.pri (modified) (8 diffs)
• Source/WebKit2/UIProcess/API/C/WKAPICast.h (modified) (2 diffs)
• Source/WebKit2/UIProcess/API/C/WKNotificationPermissionRequest.cpp (copied) (copied from trunk/Source/WebKit2/UIProcess/WebNotificationProvider.h) (1 diff)
• Source/WebKit2/UIProcess/API/C/WKNotificationPermissionRequest.h (moved) (moved from trunk/Source/WebKit2/UIProcess/WebNotificationProvider.h) (1 diff)
• Source/WebKit2/UIProcess/API/C/WKNotificationProvider.h (modified) (1 diff)
• Source/WebKit2/UIProcess/API/C/WKPage.h (modified) (2 diffs)
• Source/WebKit2/UIProcess/Notifications (added)
• Source/WebKit2/UIProcess/Notifications/NotificationPermissionRequest.cpp (moved) (moved from trunk/Source/WebKit2/UIProcess/WebNotification.cpp) (1 diff)
• Source/WebKit2/UIProcess/Notifications/NotificationPermissionRequest.h (copied) (copied from trunk/Source/WebKit2/UIProcess/WebNotificationProvider.h) (1 diff)
• Source/WebKit2/UIProcess/Notifications/NotificationPermissionRequestManagerProxy.cpp (moved) (moved from trunk/Source/WebKit2/UIProcess/WebNotificationProvider.cpp) (1 diff)
• Source/WebKit2/UIProcess/Notifications/NotificationPermissionRequestManagerProxy.h (copied) (copied from trunk/Source/WebKit2/UIProcess/WebNotificationProvider.h) (1 diff)
• Source/WebKit2/UIProcess/Notifications/WebNotification.cpp (copied) (copied from trunk/Source/WebKit2/UIProcess/WebNotification.cpp) (1 diff)
• Source/WebKit2/UIProcess/Notifications/WebNotification.h (copied) (copied from trunk/Source/WebKit2/UIProcess/WebNotification.h) (1 diff)
• Source/WebKit2/UIProcess/Notifications/WebNotificationManagerProxy.cpp (moved) (moved from trunk/Source/WebKit2/UIProcess/WebNotificationManagerProxy.cpp) (4 diffs)
• Source/WebKit2/UIProcess/Notifications/WebNotificationManagerProxy.h (moved) (moved from trunk/Source/WebKit2/UIProcess/WebNotificationManagerProxy.h) (5 diffs)
• Source/WebKit2/UIProcess/Notifications/WebNotificationManagerProxy.messages.in (moved) (moved from trunk/Source/WebKit2/UIProcess/WebNotificationManagerProxy.messages.in) (1 diff)
• Source/WebKit2/UIProcess/Notifications/WebNotificationProvider.cpp (copied) (copied from trunk/Source/WebKit2/UIProcess/WebNotificationProvider.cpp) (2 diffs)
• Source/WebKit2/UIProcess/Notifications/WebNotificationProvider.h (copied) (copied from trunk/Source/WebKit2/UIProcess/WebNotificationProvider.h) (2 diffs)
• Source/WebKit2/UIProcess/WebPageProxy.cpp (modified) (5 diffs)
• Source/WebKit2/UIProcess/WebPageProxy.h (modified) (3 diffs)
• Source/WebKit2/UIProcess/WebPageProxy.messages.in (modified) (1 diff)
• Source/WebKit2/UIProcess/WebProcessProxy.cpp (modified) (2 diffs)
• Source/WebKit2/UIProcess/WebUIClient.cpp (modified) (2 diffs)
• Source/WebKit2/UIProcess/WebUIClient.h (modified) (2 diffs)
• Source/WebKit2/WebKit2.xcodeproj/project.pbxproj (modified) (11 diffs)
• Source/WebKit2/WebProcess/Notifications/NotificationPermissionRequestManager.cpp (added)
• Source/WebKit2/WebProcess/Notifications/NotificationPermissionRequestManager.h (moved) (moved from trunk/Source/WebKit2/UIProcess/WebNotification.h) (2 diffs)
• Source/WebKit2/WebProcess/Notifications/WebNotificationManager.h (modified) (1 diff)
• Source/WebKit2/WebProcess/WebCoreSupport/WebNotificationClient.cpp (modified) (2 diffs)
• Source/WebKit2/WebProcess/WebPage/WebPage.cpp (modified) (3 diffs)
• Source/WebKit2/WebProcess/WebPage/WebPage.h (modified) (4 diffs)
• Source/WebKit2/WebProcess/WebPage/WebPage.messages.in (modified) (1 diff)
• Source/WebKit2/win/WebKit2.vcproj (modified) (4 diffs)
• Source/WebKit2/win/WebKit2Common.vsprops (modified) (1 diff)
• Tools/ChangeLog (modified) (1 diff)
• Tools/MiniBrowser/mac/BrowserWindowController.m (modified) (1 diff)
• Tools/WebKitTestRunner/TestController.cpp (modified) (2 diffs)

trunk/Source/WebKit2/ChangeLog

@@ +1 @@
+2011-12-06  Jon Lee  <jonlee@apple.com>
+
+        [WK2] Add permissions support (73960)
+        https://bugs.webkit.org/show_bug.cgi?id=73960
+        <rdar://problem/10357008>
+
+        Reviewed by Darin Adler.
+
+        * DerivedSources.make: Moved notification files to its own directory. Need to add that path.
+        * WebKit2.xcodeproj/project.pbxproj: New header and impl files.
+        * Target.pri: Ditto.
+        * GNUmakefile.am: Ditto.
+        * win/WebKit2.vcproj: Ditto.
+        * win/WebKit2Common.vsprops: Add path to Notifications directory.
+
+        Implement permission functions, which go through permission request manager.
+
+        * WebProcess/WebCoreSupport/WebNotificationClient.cpp:
+        (WebKit::WebNotificationClient::requestPermission):
+        (WebKit::WebNotificationClient::cancelRequestsForPermission):
+        (WebKit::WebNotificationClient::checkPermission):
+
+        New NotificationPermissionRequestManager to make and cancel permission requests, and to retrieve current
+        policy.
+
+        * WebProcess/Notifications/NotificationPermissionRequestManager.cpp: Added.
+        (WebKit::generateRequestID):
+        (WebKit::NotificationPermissionRequestManager::create):
+        (WebKit::NotificationPermissionRequestManager::NotificationPermissionRequestManager):
+        (WebKit::NotificationPermissionRequestManager::startRequest): Keep track of the provided callback once
+        policy decision is made.
+        (WebKit::NotificationPermissionRequestManager::cancelRequest):
+        (WebKit::NotificationPermissionRequestManager::permissionLevel): Retrieve level through a synchronous
+        message to the proxy.
+        (WebKit::NotificationPermissionRequestManager::didReceiveNotificationPermissionDecision): Invoke the callback.
+        * WebProcess/Notifications/NotificationPermissionRequestManager.h: Added.
+        (WebKit::isRequestIDValid): Make sure any provided request IDs are valid.
+
+        Added new NotificationPermissionRequest class.
+
+        * UIProcess/Notifications/NotificationPermissionRequest.cpp: Added.
+        (WebKit::NotificationPermissionRequest::create):
+        (WebKit::NotificationPermissionRequest::NotificationPermissionRequest):
+        (WebKit::NotificationPermissionRequest::allow): Notify manager of decision.
+        (WebKit::NotificationPermissionRequest::deny): Ditto.
+        (WebKit::NotificationPermissionRequest::invalidate): Disassociate with manager.
+        (WebKit::NotificationPermissionRequest::type):
+        * UIProcess/Notifications/NotificationPermissionRequest.h: Added.
+
+        WKAPI support for NotificationPermissionRequest:
+
+        * Shared/API/c/WKBase.h:
+        * Shared/APIObject.h:
+        * UIProcess/API/C/WKAPICast.h:
+        * UIProcess/API/C/WKNotificationPermissionRequest.cpp: Added.
+        (WKNotificationPermissionRequestGetTypeID):
+        (WKNotificationPermissionRequestAllow):
+        (WKNotificationPermissionRequestDeny):
+        * UIProcess/API/C/WKNotificationPermissionRequest.h: Added.
+
+        Other additions to WK API:
+
+        * UIProcess/API/C/WKNotificationProvider.h: Added new callback for WKNotificationProviders, to return policy
+        for a given security origin.
+        * UIProcess/API/C/WKPage.h: Added new callback to WKPageUIClient to ask user to decide on policy.
+
+        New NotificationPermissionRequestManagerProxy to create requests.
+
+        * UIProcess/Notifications/NotificationPermissionRequestManagerProxy.cpp: Added.
+        (WebKit::NotificationPermissionRequestManagerProxy::NotificationPermissionRequestManagerProxy):
+        (WebKit::NotificationPermissionRequestManagerProxy::invalidateRequests):
+        (WebKit::NotificationPermissionRequestManagerProxy::createRequest):
+        (WebKit::NotificationPermissionRequestManagerProxy::didReceiveNotificationPermissionDecision):
+        * UIProcess/Notifications/NotificationPermissionRequestManagerProxy.h: Added.
+
+        Added new message to notification manager: NotificationPermissionLevel, to retrieve policy. The current
+        JS API retrieves the permission synchronously, so the message needs to be sent synchronously also.
+
+        * UIProcess/Notifications/WebNotificationManagerProxy.messages.in: Moved from Source/WebKit2/UIProcess/WebNotificationManagerProxy.messages.in.
+        * UIProcess/Notifications/WebNotificationProvider.cpp: Moved from Source/WebKit2/UIProcess/WebNotificationProvider.cpp.
+        (WebKit::WebNotificationProvider::policyForNotificationPermissionAtOrigin): Added.
+        * UIProcess/Notifications/WebNotificationProvider.h: Moved from Source/WebKit2/UIProcess/WebNotificationProvider.h.
+        * UIProcess/WebProcessProxy.cpp:
+        (WebKit::WebProcessProxy::didReceiveSyncMessage): Boilerplate to forward messages to notification manager.
+
+        * UIProcess/Notifications/WebNotificationManagerProxy.cpp: Moved from Source/WebKit2/UIProcess/WebNotificationManagerProxy.cpp.
+        (WebKit::WebNotificationManagerProxy::create):
+        (WebKit::WebNotificationManagerProxy::WebNotificationManagerProxy):
+        (WebKit::WebNotificationManagerProxy::invalidate):
+        (WebKit::WebNotificationManagerProxy::initializeProvider):
+        (WebKit::WebNotificationManagerProxy::didReceiveMessage):
+        (WebKit::WebNotificationManagerProxy::didReceiveSyncMessage):
+        (WebKit::WebNotificationManagerProxy::show):
+        (WebKit::WebNotificationManagerProxy::cancel):
+        (WebKit::WebNotificationManagerProxy::didDestroyNotification):
+        (WebKit::WebNotificationManagerProxy::notificationPermissionLevel): Retrieve the policy from the provider.
+        (WebKit::WebNotificationManagerProxy::providerDidShowNotification):
+        (WebKit::WebNotificationManagerProxy::providerDidClickNotification):
+        (WebKit::WebNotificationManagerProxy::providerDidCloseNotifications):
+        * UIProcess/Notifications/WebNotificationManagerProxy.h: Moved from Source/WebKit2/UIProcess/WebNotificationManagerProxy.h.
+        (WebKit::WebNotificationManagerProxy::clearContext):
+        (WebKit::WebNotificationManagerProxy::type):
+
+        Added NotificationPermissionRequestManagerProxy to WebPageProxy, to allow a request for permission to
+        go through to the UI client. Added new message to WebPageProxy, RequestNotificationPermission.
+
+        * UIProcess/WebPageProxy.cpp:
+        (WebKit::WebPageProxy::WebPageProxy):
+        (WebKit::WebPageProxy::close): Invalidate pending requests.
+        (WebKit::WebPageProxy::processDidCrash): Ditto.
+        (WebKit::WebPageProxy::requestNotificationPermission): Forward request to UI client.
+        * UIProcess/WebPageProxy.h:
+        * UIProcess/WebPageProxy.messages.in:
+
+        * UIProcess/WebUIClient.cpp:
+        (WebKit::WebUIClient::decidePolicyForNotificationPermissionRequest):
+        * UIProcess/WebUIClient.h:
+
+        Added new message DidReceiveNotificationPermissionDecision. The WebPage forwards the message to the
+        permission request manager.
+
+        * WebProcess/WebPage/WebPage.messages.in: Added new message DidReceiveNotificationPermissionDecision
+        * WebProcess/WebPage/WebPage.cpp:
+        (WebKit::WebPage::notificationPermissionRequestManager): Create manager on request.
+        (WebKit::WebPage::didReceiveNotificationPermissionDecision):
+        * WebProcess/WebPage/WebPage.h:
+
+        Moving files to Notifications/ subdirectory.
+
+        * UIProcess/Notifications/WebNotification.cpp: Moved from Source/WebKit2/UIProcess/WebNotification.cpp.
+        * UIProcess/Notifications/WebNotification.h: Moved from Source/WebKit2/UIProcess/WebNotification.h.
+
 2011-12-08  Nayan Kumar K  <nayankk@motorola.com>
 

trunk/Source/WebKit2/DerivedSources.make

@@ -41 +41 @@
     $(WebKit2)/UIProcess \
     $(WebKit2)/UIProcess/Downloads \
+    $(WebKit2)/UIProcess/Notifications \
     $(WebKit2)/UIProcess/Plugins \
 #

trunk/Source/WebKit2/GNUmakefile.am

@@ -58 +58 @@
         $(WebKit2)/UIProcess/API/C/WKKeyValueStorageManager.h \
         $(WebKit2)/UIProcess/API/C/WKMediaCacheManager.h \
+        $(WebKit2)/UIProcess/API/C/WKNativeEvent.h \
+        $(WebKit2)/UIProcess/API/C/WKNavigationData.h \
         $(WebKit2)/UIProcess/API/C/WKNotification.h \
         $(WebKit2)/UIProcess/API/C/WKNotificationManager.h \
+        $(WebKit2)/UIProcess/API/C/WKNotificationPermissionRequest.h \
         $(WebKit2)/UIProcess/API/C/WKNotificationProvider.h \
-        $(WebKit2)/UIProcess/API/C/WKNativeEvent.h \
-        $(WebKit2)/UIProcess/API/C/WKNavigationData.h \
         $(WebKit2)/UIProcess/API/C/WKOpenPanelParameters.h \
         $(WebKit2)/UIProcess/API/C/WKOpenPanelResultListener.h \
@@ -486 +487 @@
         Source/WebKit2/UIProcess/API/C/WKNotificationManager.cpp \
         Source/WebKit2/UIProcess/API/C/WKNotificationManager.h \
+        Source/WebKit2/UIProcess/API/C/WKNotificationPermissionRequest.cpp \
+        Source/WebKit2/UIProcess/API/C/WKNotificationPermissionRequest.h \
         Source/WebKit2/UIProcess/API/C/WKNotificationProvider.h \
         Source/WebKit2/UIProcess/API/C/WKOpenPanelParameters.cpp \
@@ -582 +585 @@
         Source/WebKit2/UIProcess/Launcher/ThreadLauncher.cpp \
         Source/WebKit2/UIProcess/Launcher/ThreadLauncher.h \
+        Source/WebKit2/UIProcess/Notifications/NotificationPermissionRequest.cpp \
+        Source/WebKit2/UIProcess/Notifications/NotificationPermissionRequest.h \
+        Source/WebKit2/UIProcess/Notifications/NotificationPermissionRequestManagerProxy.cpp \
+        Source/WebKit2/UIProcess/Notifications/NotificationPermissionRequestManagerProxy.h \
+        Source/WebKit2/UIProcess/Notifications/WebNotification.cpp \
+        Source/WebKit2/UIProcess/Notifications/WebNotification.h \
+        Source/WebKit2/UIProcess/Notifications/WebNotificationManagerProxy.cpp \
+        Source/WebKit2/UIProcess/Notifications/WebNotificationManagerProxy.h \
+        Source/WebKit2/UIProcess/Notifications/WebNotificationProvider.cpp \
+        Source/WebKit2/UIProcess/Notifications/WebNotificationProvider.h \
         Source/WebKit2/UIProcess/PageClient.h \
         Source/WebKit2/UIProcess/Plugins/PluginInfoStore.cpp \
@@ -660 +673 @@
         Source/WebKit2/UIProcess/WebMediaCacheManagerProxy.cpp \
         Source/WebKit2/UIProcess/WebMediaCacheManagerProxy.h \
-        Source/WebKit2/UIProcess/WebNotification.cpp \
-        Source/WebKit2/UIProcess/WebNotification.h \
-        Source/WebKit2/UIProcess/WebNotificationManagerProxy.cpp \
-        Source/WebKit2/UIProcess/WebNotificationManagerProxy.h \
-        Source/WebKit2/UIProcess/WebNotificationProvider.cpp \
-        Source/WebKit2/UIProcess/WebNotificationProvider.h \
         Source/WebKit2/UIProcess/WebLoaderClient.cpp \
         Source/WebKit2/UIProcess/WebLoaderClient.h \
@@ -796 +803 @@
         Source/WebKit2/WebProcess/MediaCache/WebMediaCacheManager.cpp \
         Source/WebKit2/WebProcess/MediaCache/WebMediaCacheManager.h \
+        Source/WebKit2/WebProcess/Notifications/NotificationPermissionRequestManager.cpp \
+        Source/WebKit2/WebProcess/Notifications/NotificationPermissionRequestManager.h \
         Source/WebKit2/WebProcess/Notifications/WebNotificationManager.cpp \
         Source/WebKit2/WebProcess/Notifications/WebNotificationManager.h \
@@ -934 +943 @@
         -I$(srcdir)/Source/WebKit2/UIProcess/Launcher \
         -I$(srcdir)/Source/WebKit2/UIProcess/Launcher/gtk \
+        -I$(srcdir)/Source/WebKit2/UIProcess/Notifications \
         -I$(srcdir)/Source/WebKit2/UIProcess/Plugins \
         -I$(srcdir)/Source/WebKit2/UIProcess/Plugins/gtk \
@@ -1060 +1070 @@
         $(WebKit2)/UIProcess/Downloads \
         $(WebKit2)/UIProcess/Geolocation \
+        $(WebKit2)/UIProcess/Notifications \
         $(WebKit2)/UIProcess/Plugins \
         $(WebKit2)/UIProcess/ResourceCache \
@@ -1454 +1465 @@
         $(shell ls $(WebKit2)/UIProcess/*.in) \
         $(shell ls $(WebKit2)/UIProcess/Downloads/*.in) \
+        $(shell ls $(WebKit2)/UIProcess/Notifications/*.in) \
         $(shell ls $(WebKit2)/UIProcess/Plugins/*.in) \
         $(shell ls $(WebKit2)/WebProcess/*.in) \
@@ -1464 +1476 @@
         $(shell ls $(WebKit2)/WebProcess/KeyValueStorage/*.in) \
         $(shell ls $(WebKit2)/WebProcess/MediaCache/*.in) \
+        $(shell ls $(WebKit2)/WebProcess/Notifications/*.in) \
         $(shell ls $(WebKit2)/WebProcess/Plugins/*.in) \
         $(shell ls $(WebKit2)/WebProcess/ResourceCache/*.in) \

trunk/Source/WebKit2/Shared/API/c/WKBase.h

@@ -98 +98 @@
 typedef const struct OpaqueWKNotification* WKNotificationRef;
 typedef const struct OpaqueWKNotificationManager* WKNotificationManagerRef;
+typedef const struct OpaqueWKNotificationPermissionRequest* WKNotificationPermissionRequestRef;
 typedef const struct OpaqueWKNotificationProvider* WKNotificationProviderRef;
 typedef const struct OpaqueWKOpenPanelParameters* WKOpenPanelParametersRef;

trunk/Source/WebKit2/Shared/APIObject.h

@@ -92 +92 @@
         TypeNotification,
         TypeNotificationManager,
+        TypeNotificationPermissionRequest,
         TypeOpenPanelParameters,
         TypeOpenPanelResultListener,

trunk/Source/WebKit2/Target.pri

@@ -158 +158 @@
     UIProcess/API/C/WKNotification.h \
     UIProcess/API/C/WKNotificationManager.h \
+    UIProcess/API/C/WKNotificationPermissionRequest.h \
     UIProcess/API/C/WKNotificationProvider.h \
     UIProcess/API/C/WKPage.h \
@@ -195 +196 @@
     UIProcess/Launcher/ProcessLauncher.h \
     UIProcess/Launcher/ThreadLauncher.h \
+    UIProcess/Notifications/NotificationPermissionRequest.h \
+    UIProcess/Notifications/NotificationPermissionRequestManagerProxy.h \
+    UIProcess/Notifications/WebNotification.h \
+    UIProcess/Notifications/WebNotificationManagerProxy.h \
+    UIProcess/Notifications/WebNotificationProvider.h \
     UIProcess/PageClient.h \
     UIProcess/Plugins/PluginInfoStore.h \
@@ -233 +239 @@
     UIProcess/WebMediaCacheManagerProxy.h \
     UIProcess/WebNavigationData.h \
-    UIProcess/WebNotification.h \
-    UIProcess/WebNotificationManagerProxy.h \
-    UIProcess/WebNotificationProvider.h \
     UIProcess/WebOpenPanelResultListenerProxy.h \
     UIProcess/WebPageContextMenuClient.h \
@@ -305 +308 @@
     WebProcess/KeyValueStorage/WebKeyValueStorageManager.h \
     WebProcess/MediaCache/WebMediaCacheManager.h \
+    WebProcess/Notifications/NotificationPermissionRequestManager.h \
     WebProcess/Notifications/WebNotificationManager.h \
     WebProcess/ResourceCache/WebResourceCacheManager.h \
@@ -478 +482 @@
     UIProcess/API/C/WKNotification.cpp \
     UIProcess/API/C/WKNotificationManager.cpp \
+    UIProcess/API/C/WKNotificationPermissionRequest.cpp \
     UIProcess/API/C/WKOpenPanelParameters.cpp \
     UIProcess/API/C/WKOpenPanelResultListener.cpp \
@@ -511 +516 @@
     UIProcess/Launcher/qt/ProcessLauncherQt.cpp \
     UIProcess/Launcher/qt/ThreadLauncherQt.cpp \
+    UIProcess/Notifications/NotificationPermissionRequest.cpp \
+    UIProcess/Notifications/NotificationPermissionRequestManagerProxy.cpp \
+    UIProcess/Notifications/WebNotification.cpp \
+    UIProcess/Notifications/WebNotificationManagerProxy.cpp \
+    UIProcess/Notifications/WebNotificationProvider.cpp \
     UIProcess/Plugins/PluginInfoStore.cpp \
     UIProcess/Plugins/PluginProcessProxy.cpp \
@@ -549 +559 @@
     UIProcess/WebMediaCacheManagerProxy.cpp \
     UIProcess/WebNavigationData.cpp \
-    UIProcess/WebNotification.cpp \
-    UIProcess/WebNotificationManagerProxy.cpp \
-    UIProcess/WebNotificationProvider.cpp \
     UIProcess/WebOpenPanelResultListenerProxy.cpp \
     UIProcess/WebPageContextMenuClient.cpp \
@@ -637 +644 @@
     WebProcess/KeyValueStorage/WebKeyValueStorageManager.cpp \
     WebProcess/MediaCache/WebMediaCacheManager.cpp \
+    WebProcess/Notifications/NotificationPermissionRequestManager.cpp \
     WebProcess/Notifications/WebNotificationManager.cpp \
     WebProcess/ResourceCache/WebResourceCacheManager.cpp \

trunk/Source/WebKit2/UIProcess/API/C/WKAPICast.h

@@ -53 +53 @@
 class DownloadProxy;
 class GeolocationPermissionRequestProxy;
+class NotificationPermissionRequest;
 class WebApplicationCacheManagerProxy;
 class WebBackForwardList;
@@ -109 +110 @@
 WK_ADD_API_MAPPING(WKNavigationDataRef, WebNavigationData)
 WK_ADD_API_MAPPING(WKNotificationManagerRef, WebNotificationManagerProxy)
+WK_ADD_API_MAPPING(WKNotificationPermissionRequestRef, NotificationPermissionRequest)
 WK_ADD_API_MAPPING(WKNotificationProviderRef, WebNotificationProvider)
 WK_ADD_API_MAPPING(WKNotificationRef, WebNotification)

trunk/Source/WebKit2/UIProcess/API/C/WKNotificationPermissionRequest.cpp

@@ -24 +24 @@
  */
 
-#ifndef WebNotificationProvider_h
-#define WebNotificationProvider_h
+#include "config.h"
+#include "WKNotificationPermissionRequest.h"
 
-#include "APIClient.h"
-#include "WKNotificationProvider.h"
-#include <wtf/Forward.h>
+#include "NotificationPermissionRequest.h"
+#include "WKAPICast.h"
 
-namespace WebKit {
+using namespace WebKit;
 
-class WebNotification;
-class WebNotificationManagerProxy;
-    
-class WebNotificationProvider : public APIClient<WKNotificationProvider, kWKNotificationProviderCurrentVersion> {
-public:
-    void show(WebNotification*);
-    void cancel(WebNotification*);
-    void didDestroyNotification(WebNotification*);
+WKTypeID WKNotificationPermissionRequestGetTypeID()
+{
+    return toAPI(NotificationPermissionRequest::APIType);
+}
 
-    void addNotificationManager(WebNotificationManagerProxy*);
-    void removeNotificationManager(WebNotificationManagerProxy*);
-};
+void WKNotificationPermissionRequestAllow(WKNotificationPermissionRequestRef notificationPermissionRequest)
+{
+    return toImpl(notificationPermissionRequest)->allow();
+}
 
-} // namespace WebKit
-
-#endif // WebNotificationProvider_h
+void WKNotificationPermissionRequestDeny(WKNotificationPermissionRequestRef notificationPermissionRequest)
+{
+    return toImpl(notificationPermissionRequest)->deny();
+}

trunk/Source/WebKit2/UIProcess/API/C/WKNotificationPermissionRequest.h

@@ -24 +24 @@
  */
 
-#ifndef WebNotificationProvider_h
-#define WebNotificationProvider_h
+#ifndef WKNotificationPermissionRequest_h
+#define WKNotificationPermissionRequest_h
 
-#include "APIClient.h"
-#include "WKNotificationProvider.h"
-#include <wtf/Forward.h>
+#include <WebKit2/WKBase.h>
 
-namespace WebKit {
+#ifdef __cplusplus
+extern "C" {
+#endif
 
-class WebNotification;
-class WebNotificationManagerProxy;
-    
-class WebNotificationProvider : public APIClient<WKNotificationProvider, kWKNotificationProviderCurrentVersion> {
-public:
-    void show(WebNotification*);
-    void cancel(WebNotification*);
-    void didDestroyNotification(WebNotification*);
+WK_EXPORT WKTypeID WKNotificationPermissionRequestGetTypeID();
 
-    void addNotificationManager(WebNotificationManagerProxy*);
-    void removeNotificationManager(WebNotificationManagerProxy*);
-};
+WK_EXPORT void WKNotificationPermissionRequestAllow(WKNotificationPermissionRequestRef notificationPermissionRequest);
+WK_EXPORT void WKNotificationPermissionRequestDeny(WKNotificationPermissionRequestRef notificationPermissionRequest);
 
-} // namespace WebKit
+#ifdef __cplusplus
+}
+#endif
 
-#endif // WebNotificationProvider_h
+#endif // WKNotificationPermissionRequest_h

trunk/Source/WebKit2/UIProcess/API/C/WKNotificationProvider.h

@@ -36 +36 @@
 typedef void (*WKNotificationProviderCancelCallback)(WKNotificationRef notification, const void* clientInfo);
 typedef void (*WKNotificationProviderDidDestroyNotificationCallback)(WKNotificationRef notification, const void* clientInfo);
+typedef int (*WKNotificationProviderPolicyForNotificationPermissionAtOriginCallback)(WKSecurityOriginRef origin, const void *clientInfo);
 typedef void (*WKNotificationProviderAddNotificationManagerCallback)(WKNotificationManagerRef manager, const void* clientInfo);
 typedef void (*WKNotificationProviderRemoveNotificationManagerCallback)(WKNotificationManagerRef manager, const void* clientInfo);
 
 struct WKNotificationProvider {
-    int                                                       version;
-    const void*                                               clientInfo;
-    WKNotificationProviderShowCallback                        show;
-    WKNotificationProviderCancelCallback                      cancel;
-    WKNotificationProviderDidDestroyNotificationCallback      didDestroyNotification;
-    WKNotificationProviderAddNotificationManagerCallback      addNotificationManager;
-    WKNotificationProviderRemoveNotificationManagerCallback   removeNotificationManager;
+    int                                                                   version;
+    const void*                                                           clientInfo;
+    WKNotificationProviderShowCallback                                    show;
+    WKNotificationProviderCancelCallback                                  cancel;
+    WKNotificationProviderDidDestroyNotificationCallback                  didDestroyNotification;
+    WKNotificationProviderPolicyForNotificationPermissionAtOriginCallback policyForNotificationPermissionAtOrigin;
+    WKNotificationProviderAddNotificationManagerCallback                  addNotificationManager;
+    WKNotificationProviderRemoveNotificationManagerCallback               removeNotificationManager;
 };
 typedef struct WKNotificationProvider WKNotificationProvider;

trunk/Source/WebKit2/UIProcess/API/C/WKPage.h

@@ -198 +198 @@
 typedef void (*WKPageSaveDataToFileInDownloadsFolderCallback)(WKPageRef page, WKStringRef suggestedFilename, WKStringRef mimeType, WKURLRef originatingURL, WKDataRef data, const void* clientInfo);
 typedef bool (*WKPageShouldInterruptJavaScriptCallback)(WKPageRef page, const void *clientInfo);
+typedef void (*WKPageDecidePolicyForNotificationPermissionRequestCallback)(WKPageRef page, WKSecurityOriginRef origin, WKNotificationPermissionRequestRef permissionRequest, const void *clientInfo);
 
 // Deprecated    
@@ -251 +252 @@
     WKPageCreateNewPageCallback                                         createNewPage;
     WKPageMouseDidMoveOverElementCallback                               mouseDidMoveOverElement;
+    WKPageDecidePolicyForNotificationPermissionRequestCallback          decidePolicyForNotificationPermissionRequest;
 };
 typedef struct WKPageUIClient WKPageUIClient;

trunk/Source/WebKit2/UIProcess/Notifications/NotificationPermissionRequest.cpp

@@ -25 +25 @@
 
 #include "config.h"
-#include "WebNotification.h"
+#include "NotificationPermissionRequest.h"
 
-#include "ArgumentCoders.h"
-#include "ArgumentDecoder.h"
-#include "ArgumentEncoder.h"
-#include "Arguments.h"
+#include "NotificationPermissionRequestManagerProxy.h"
 
 namespace WebKit {
-
-WebNotification::WebNotification()
+    
+PassRefPtr<NotificationPermissionRequest> NotificationPermissionRequest::create(WebKit::NotificationPermissionRequestManagerProxy *manager, uint64_t notificationID)
 {
+    return adoptRef(new NotificationPermissionRequest(manager, notificationID));
 }
 
-WebNotification::WebNotification(const String& title, const String& body, uint64_t notificationID)
-    : m_title(title)
-    , m_body(body)
+NotificationPermissionRequest::NotificationPermissionRequest(NotificationPermissionRequestManagerProxy* manager, uint64_t notificationID)
+    : m_manager(manager)
     , m_notificationID(notificationID)
 {
 }
 
-WebNotification::~WebNotification()
+void NotificationPermissionRequest::allow()
 {
+    if (!m_manager)
+        return;
+    
+    m_manager->didReceiveNotificationPermissionDecision(m_notificationID, true);
+    m_manager = 0;
 }
 
-void WebNotification::encode(CoreIPC::ArgumentEncoder* encoder) const
+void NotificationPermissionRequest::deny()
 {
-    encoder->encode(CoreIPC::In(m_title, m_body, m_notificationID));
+    if (!m_manager)
+        return;
+    
+    m_manager->didReceiveNotificationPermissionDecision(m_notificationID, false);
+    m_manager = 0;
 }
 
-bool WebNotification::decode(CoreIPC::ArgumentDecoder* decoder, WebNotification& notification)
+void NotificationPermissionRequest::invalidate()
 {
-    return decoder->decode(CoreIPC::Out(notification.m_title, notification.m_body, notification.m_notificationID));
+    m_manager = 0;
 }
 

trunk/Source/WebKit2/UIProcess/Notifications/NotificationPermissionRequest.h

@@ -24 +24 @@
  */
 
-#ifndef WebNotificationProvider_h
-#define WebNotificationProvider_h
+#ifndef NotificationPermissionRequest_h
+#define NotificationPermissionRequest_h
 
-#include "APIClient.h"
-#include "WKNotificationProvider.h"
-#include <wtf/Forward.h>
+#include "APIObject.h"
+#include <wtf/PassRefPtr.h>
 
 namespace WebKit {
 
-class WebNotification;
-class WebNotificationManagerProxy;
+class NotificationPermissionRequestManagerProxy;
+
+class NotificationPermissionRequest : public APIObject {
+public:
+    static const Type APIType = TypeNotificationPermissionRequest;
     
-class WebNotificationProvider : public APIClient<WKNotificationProvider, kWKNotificationProviderCurrentVersion> {
-public:
-    void show(WebNotification*);
-    void cancel(WebNotification*);
-    void didDestroyNotification(WebNotification*);
-
-    void addNotificationManager(WebNotificationManagerProxy*);
-    void removeNotificationManager(WebNotificationManagerProxy*);
+    static PassRefPtr<NotificationPermissionRequest> create(NotificationPermissionRequestManagerProxy*, uint64_t notificationID);
+    
+    void allow();
+    void deny();
+    
+    void invalidate();
+    
+private:
+    NotificationPermissionRequest(NotificationPermissionRequestManagerProxy*, uint64_t notificationID);
+    
+    virtual Type type() const { return APIType; }
+    
+    NotificationPermissionRequestManagerProxy* m_manager;
+    uint64_t m_notificationID;    
 };
 
 } // namespace WebKit
 
-#endif // WebNotificationProvider_h
+#endif // NotificationPermissionRequestProxy_h

trunk/Source/WebKit2/UIProcess/Notifications/NotificationPermissionRequestManagerProxy.cpp

@@ -25 +25 @@
 
 #include "config.h"
-#include "WebNotificationProvider.h"
+#include "NotificationPermissionRequestManagerProxy.h"
 
-#include "WKAPICast.h"
-#include "WebNotification.h"
-#include "WebNotificationManagerProxy.h"
+#include "NotificationPermissionRequest.h"
+#include "WebPageMessages.h"
+#include "WebPageProxy.h"
+#include "WebProcessProxy.h"
 
 namespace WebKit {
 
-void WebNotificationProvider::show(WebNotification* notification)
+NotificationPermissionRequestManagerProxy::NotificationPermissionRequestManagerProxy(WebPageProxy* page)
+    : m_page(page)
 {
-    if (!m_client.show)
+}
+
+void NotificationPermissionRequestManagerProxy::invalidateRequests()
+{
+    PendingRequestMap::const_iterator it = m_pendingRequests.begin();
+    PendingRequestMap::const_iterator end = m_pendingRequests.end();
+    for (; it != end; ++it)
+        it->second->invalidate();
+    
+    m_pendingRequests.clear();
+}
+
+PassRefPtr<NotificationPermissionRequest> NotificationPermissionRequestManagerProxy::createRequest(uint64_t notificationID)
+{
+    RefPtr<NotificationPermissionRequest> request = NotificationPermissionRequest::create(this, notificationID);
+    m_pendingRequests.add(notificationID, request.get());
+    return request.release();
+}
+
+void NotificationPermissionRequestManagerProxy::didReceiveNotificationPermissionDecision(uint64_t notificationID, bool allow)
+{
+    if (!m_page->isValid())
         return;
     
-    m_client.show(toAPI(notification), m_client.clientInfo);
-}
-
-void WebNotificationProvider::cancel(WebNotification* notification)
-{
-    if (!m_client.cancel)
+    RefPtr<NotificationPermissionRequest> request = m_pendingRequests.take(notificationID);
+    if (!request)
         return;
     
-    m_client.cancel(toAPI(notification), m_client.clientInfo);
-}
-
-void WebNotificationProvider::didDestroyNotification(WebNotification* notification)
-{
-    if (!m_client.didDestroyNotification)
-        return;
-    
-    m_client.didDestroyNotification(toAPI(notification), m_client.clientInfo);
-}
-
-void WebNotificationProvider::addNotificationManager(WebNotificationManagerProxy* manager)
-{
-    if (!m_client.addNotificationManager)
-        return;
-    
-    m_client.addNotificationManager(toAPI(manager), m_client.clientInfo);
-}
-
-void WebNotificationProvider::removeNotificationManager(WebNotificationManagerProxy* manager)
-{
-    if (!m_client.removeNotificationManager)
-        return;
-    
-    m_client.removeNotificationManager(toAPI(manager), m_client.clientInfo);
+    m_page->process()->send(Messages::WebPage::DidReceiveNotificationPermissionDecision(notificationID, allow), m_page->pageID());
 }
 

trunk/Source/WebKit2/UIProcess/Notifications/NotificationPermissionRequestManagerProxy.h

@@ -24 +24 @@
  */
 
-#ifndef WebNotificationProvider_h
-#define WebNotificationProvider_h
+#ifndef NotificationPermissionRequestManagerProxy_h
+#define NotificationPermissionRequestManagerProxy_h
 
-#include "APIClient.h"
-#include "WKNotificationProvider.h"
-#include <wtf/Forward.h>
+#include "NotificationPermissionRequest.h"
+#include <wtf/HashMap.h>
+#include <wtf/RefPtr.h>
 
 namespace WebKit {
 
-class WebNotification;
-class WebNotificationManagerProxy;
+class GeolocationPermissionRequestProxy;
+class WebPageProxy;
+
+class NotificationPermissionRequestManagerProxy {
+public:
+    explicit NotificationPermissionRequestManagerProxy(WebPageProxy*);
     
-class WebNotificationProvider : public APIClient<WKNotificationProvider, kWKNotificationProviderCurrentVersion> {
-public:
-    void show(WebNotification*);
-    void cancel(WebNotification*);
-    void didDestroyNotification(WebNotification*);
-
-    void addNotificationManager(WebNotificationManagerProxy*);
-    void removeNotificationManager(WebNotificationManagerProxy*);
+    void invalidateRequests();
+    
+    // Create a request to be presented to the user.
+    PassRefPtr<NotificationPermissionRequest> createRequest(uint64_t notificationID);
+    
+    // Called by NotificationPermissionRequest when a decision is made by the user.
+    void didReceiveNotificationPermissionDecision(uint64_t notificationID, bool allow);
+    
+private:
+    typedef HashMap<uint64_t, RefPtr<NotificationPermissionRequest> > PendingRequestMap;
+    PendingRequestMap m_pendingRequests;
+    WebPageProxy* m_page;
 };
 
 } // namespace WebKit
 
-#endif // WebNotificationProvider_h
+
+#endif // NotificationPermissionRequestManagerProxy_h

trunk/Source/WebKit2/UIProcess/Notifications/WebNotification.cpp

@@ -34 +34 @@
 namespace WebKit {
 
-WebNotification::WebNotification()
-{
-}
-
 WebNotification::WebNotification(const String& title, const String& body, uint64_t notificationID)
     : m_title(title)
     , m_body(body)
     , m_notificationID(notificationID)
-{
-}
-
-WebNotification::~WebNotification()
 {
 }

trunk/Source/WebKit2/UIProcess/Notifications/WebNotification.h

@@ -44 +44 @@
     static const Type APIType = TypeNotification;
     
-    WebNotification();
     static PassRefPtr<WebNotification> create(const String& title, const String& body, uint64_t notificationID)
     {
         return adoptRef(new WebNotification(title, body, notificationID));
     }
-    virtual ~WebNotification();
     
     const String& title() const { return m_title; }

trunk/Source/WebKit2/UIProcess/Notifications/WebNotificationManagerProxy.cpp

@@ -31 +31 @@
 #include "WebNotification.h"
 #include "WebNotificationManagerMessages.h"
+#include "WebSecurityOrigin.h"
 #include <WebCore/NotificationContents.h>
 
@@ -48 +49 @@
 }
 
-WebNotificationManagerProxy::~WebNotificationManagerProxy()
-{
-}
-
 void WebNotificationManagerProxy::invalidate()
 {
@@ -65 +62 @@
 {
     didReceiveWebNotificationManagerProxyMessage(connection, messageID, arguments);
+}
+
+void WebNotificationManagerProxy::didReceiveSyncMessage(CoreIPC::Connection* connection, CoreIPC::MessageID messageID, CoreIPC::ArgumentDecoder* arguments, OwnPtr<CoreIPC::ArgumentEncoder>& reply)
+{
+    didReceiveSyncWebNotificationManagerProxyMessage(connection, messageID, arguments, reply);
 }
 
@@ -104 +106 @@
 }
 
+void WebNotificationManagerProxy::notificationPermissionLevel(const String& originIdentifier, uint64_t& permissionLevel)
+{
+    RefPtr<WebSecurityOrigin> origin = WebSecurityOrigin::create(originIdentifier);
+    permissionLevel = m_provider.policyForNotificationPermissionAtOrigin(origin.get());
+}
+
 void WebNotificationManagerProxy::providerDidShowNotification(uint64_t notificationID)
 {

trunk/Source/WebKit2/UIProcess/Notifications/WebNotificationManagerProxy.h

@@ -31 +31 @@
 #include "WebNotificationProvider.h"
 #include <wtf/HashMap.h>
+#include <wtf/OwnPtr.h>
 #include <wtf/PassRefPtr.h>
 
 namespace CoreIPC {
 class ArgumentDecoder;
+class ArgumentEncoder;
 class Connection;
 }
@@ -48 +50 @@
     
     static PassRefPtr<WebNotificationManagerProxy> create(WebContext*);
-    virtual ~WebNotificationManagerProxy();
     
     void invalidate();
@@ -60 +61 @@
     
     void didReceiveMessage(CoreIPC::Connection*, CoreIPC::MessageID, CoreIPC::ArgumentDecoder*);
+    void didReceiveSyncMessage(CoreIPC::Connection*, CoreIPC::MessageID, CoreIPC::ArgumentDecoder*, OwnPtr<CoreIPC::ArgumentEncoder>&);
 
 private:
@@ -67 +69 @@
     
     void didReceiveWebNotificationManagerProxyMessage(CoreIPC::Connection*, CoreIPC::MessageID, CoreIPC::ArgumentDecoder*);
+    void didReceiveSyncWebNotificationManagerProxyMessage(CoreIPC::Connection*, CoreIPC::MessageID, CoreIPC::ArgumentDecoder*, OwnPtr<CoreIPC::ArgumentEncoder>&);
     
     // Message handlers
@@ -72 +75 @@
     void cancel(uint64_t notificationID);
     void didDestroyNotification(uint64_t notificationID);
-    
+    void notificationPermissionLevel(const WTF::String& originIdentifier, uint64_t& permissionLevel);
+
     typedef HashMap<uint64_t, RefPtr<WebNotification> > WebNotificationMap;
     

trunk/Source/WebKit2/UIProcess/Notifications/WebNotificationManagerProxy.messages.in

@@ -25 +25 @@
     Cancel(uint64_t notificationID);
     DidDestroyNotification(uint64_t notificationID);
+
+    NotificationPermissionLevel(WTF::String originIdentifier) -> (uint64_t policy)
 }

trunk/Source/WebKit2/UIProcess/Notifications/WebNotificationProvider.cpp

@@ -30 +30 @@
 #include "WebNotification.h"
 #include "WebNotificationManagerProxy.h"
+#include "WebSecurityOrigin.h"
 
 namespace WebKit {
@@ -57 +58 @@
 }
 
+int WebNotificationProvider::policyForNotificationPermissionAtOrigin(WebSecurityOrigin* origin)
+{
+    if (!m_client.policyForNotificationPermissionAtOrigin)
+        return INT_MIN;
+    
+    return m_client.policyForNotificationPermissionAtOrigin(toAPI(origin), m_client.clientInfo);
+}
+
 void WebNotificationProvider::addNotificationManager(WebNotificationManagerProxy* manager)
 {

trunk/Source/WebKit2/UIProcess/Notifications/WebNotificationProvider.h

@@ -35 +35 @@
 class WebNotification;
 class WebNotificationManagerProxy;
+class WebSecurityOrigin;
     
 class WebNotificationProvider : public APIClient<WKNotificationProvider, kWKNotificationProviderCurrentVersion> {
@@ -41 +42 @@
     void cancel(WebNotification*);
     void didDestroyNotification(WebNotification*);
+    int policyForNotificationPermissionAtOrigin(WebSecurityOrigin*);
 
     void addNotificationManager(WebNotificationManagerProxy*);

trunk/Source/WebKit2/UIProcess/WebPageProxy.cpp

@@ -38 +38 @@
 #include "NativeWebMouseEvent.h"
 #include "NativeWebWheelEvent.h"
+#include "NotificationPermissionRequest.h"
+#include "NotificationPermissionRequestManager.h"
 #include "PageClient.h"
 #include "PrintInfo.h"
@@ -147 +149 @@
     , m_userAgent(standardUserAgent())
     , m_geolocationPermissionRequestManager(this)
+    , m_notificationPermissionRequestManager(this)
     , m_estimatedProgress(0)
     , m_isInWindow(m_pageClient->isViewInWindow())
@@ -365 +368 @@
 
     m_geolocationPermissionRequestManager.invalidateRequests();
+    m_notificationPermissionRequestManager.invalidateRequests();
 
     m_toolTip = String();
@@ -3134 +3138 @@
 
     m_geolocationPermissionRequestManager.invalidateRequests();
+    m_notificationPermissionRequestManager.invalidateRequests();
 
     m_toolTip = String();
@@ -3296 +3301 @@
 }
 
+void WebPageProxy::requestNotificationPermission(uint64_t requestID, const String& originIdentifier)
+{
+    if (!isRequestIDValid(requestID))
+        return;
+
+    RefPtr<WebSecurityOrigin> origin = WebSecurityOrigin::create(originIdentifier);
+    RefPtr<NotificationPermissionRequest> request = m_notificationPermissionRequestManager.createRequest(requestID);
+    
+    if (!m_uiClient.decidePolicyForNotificationPermissionRequest(this, origin.get(), request.get()))
+        request->deny();
+}
+
 float WebPageProxy::headerHeight(WebFrameProxy* frame)
 {

trunk/Source/WebKit2/UIProcess/WebPageProxy.h

@@ -37 +37 @@
 #include "NativeWebTouchEvent.h"
 #endif
+#include "NotificationPermissionRequestManagerProxy.h"
 #include "PlatformProcessIdentifier.h"
 #include "SandboxExtension.h"
@@ -686 +687 @@
     void reattachToWebProcessWithItem(WebBackForwardListItem*);
 
+    void requestNotificationPermission(uint64_t notificationID, const String& originIdentifier);
+    
 #if USE(TILED_BACKING_STORE)
     void pageDidRequestScroll(const WebCore::IntPoint&);
@@ -870 +873 @@
     RefPtr<WebOpenPanelResultListenerProxy> m_openPanelResultListener;
     GeolocationPermissionRequestManagerProxy m_geolocationPermissionRequestManager;
+    NotificationPermissionRequestManagerProxy m_notificationPermissionRequestManager;
 
     double m_estimatedProgress;

trunk/Source/WebKit2/UIProcess/WebPageProxy.messages.in

@@ -195 +195 @@
     # Geolocation messages
     RequestGeolocationPermissionForFrame(uint64_t geolocationID, uint64_t frameID, WTF::String originIdentifier)
+    
+    # Notification messages
+    RequestNotificationPermission(uint64_t requestID, WTF::String originIdentifier)
 
     # Spelling and grammar messages

trunk/Source/WebKit2/UIProcess/WebProcessProxy.cpp

@@ -35 +35 @@
 #include "WebContext.h"
 #include "WebNavigationDataStore.h"
+#include "WebNotificationManagerProxy.h"
 #include "WebPageProxy.h"
 #include "WebProcessMessages.h"
@@ -333 +334 @@
     }
 
+    if (messageID.is<CoreIPC::MessageClassWebNotificationManagerProxy>()) {
+        m_context->notificationManagerProxy()->didReceiveSyncMessage(connection, messageID, arguments, reply);
+        return;
+    }
+
     uint64_t pageID = arguments->destinationID();
     if (!pageID)

trunk/Source/WebKit2/UIProcess/WebUIClient.cpp

@@ -30 +30 @@
 #include "NativeWebKeyboardEvent.h"
 #include "NativeWebWheelEvent.h"
+#include "NotificationPermissionRequest.h"
 #include "WKAPICast.h"
 #include "WebNumber.h"
@@ -332 +333 @@
 }
 
+bool WebUIClient::decidePolicyForNotificationPermissionRequest(WebPageProxy* page, WebSecurityOrigin* origin, NotificationPermissionRequest* permissionRequest)
+{
+    if (!m_client.decidePolicyForNotificationPermissionRequest)
+        return false;
+    
+    m_client.decidePolicyForNotificationPermissionRequest(toAPI(page), toAPI(origin), toAPI(permissionRequest), m_client.clientInfo);
+    return true;
+}
+
 float WebUIClient::headerHeight(WebPageProxy* page, WebFrameProxy* frame)
 {

trunk/Source/WebKit2/UIProcess/WebUIClient.h

@@ -48 +48 @@
 class NativeWebKeyboardEvent;
 class NativeWebWheelEvent;
+class NotificationPermissionRequest;
 class WebData;
 class WebFrameProxy;
@@ -100 +101 @@
     bool runOpenPanel(WebPageProxy*, WebFrameProxy*, WebOpenPanelParameters*, WebOpenPanelResultListenerProxy*);
     bool decidePolicyForGeolocationPermissionRequest(WebPageProxy*, WebFrameProxy*, WebSecurityOrigin*, GeolocationPermissionRequestProxy*);
+    bool decidePolicyForNotificationPermissionRequest(WebPageProxy*, WebSecurityOrigin*, NotificationPermissionRequest*);
 
     // Printing.

trunk/Source/WebKit2/WebKit2.xcodeproj/project.pbxproj

@@ -247 +247 @@
                 29CD55AA128E294F00133C85 /* WKAccessibilityWebPageObject.h in Headers */ = {isa = PBXBuildFile; fileRef = 29CD55A8128E294F00133C85 /* WKAccessibilityWebPageObject.h */; };
                 29CD55AB128E294F00133C85 /* WKAccessibilityWebPageObject.mm in Sources */ = {isa = PBXBuildFile; fileRef = 29CD55A9128E294F00133C85 /* WKAccessibilityWebPageObject.mm */; };
-                3109996F146C741D0029DEB9 /* WebNotificationManagerProxy.h in Headers */ = {isa = PBXBuildFile; fileRef = 3109996A146C73920029DEB9 /* WebNotificationManagerProxy.h */; };
-                31099970146C74200029DEB9 /* WebNotificationManagerProxy.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3109996B146C73B10029DEB9 /* WebNotificationManagerProxy.cpp */; };
                 31099973146C75A20029DEB9 /* WebNotificationClient.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 31099971146C759B0029DEB9 /* WebNotificationClient.cpp */; };
-                3109997A146C8B140029DEB9 /* WebNotificationManager.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 31099978146C8B140029DEB9 /* WebNotificationManager.cpp */; };
-                3109997B146C8B140029DEB9 /* WebNotificationManager.h in Headers */ = {isa = PBXBuildFile; fileRef = 31099979146C8B140029DEB9 /* WebNotificationManager.h */; };
                 310999C7146C9E3D0029DEB9 /* WebNotificationClient.h in Headers */ = {isa = PBXBuildFile; fileRef = 31099968146C71F50029DEB9 /* WebNotificationClient.h */; };
-                312C0C47146DDBBD0016C911 /* WebNotificationProvider.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 312C0C46146DDBBC0016C911 /* WebNotificationProvider.cpp */; };
                 312C0C4A146DDC8A0016C911 /* WKNotificationProvider.h in Headers */ = {isa = PBXBuildFile; fileRef = 312C0C49146DDC8A0016C911 /* WKNotificationProvider.h */; settings = {ATTRIBUTES = (Private, ); }; };
+                3131261E148FF82C00BA2A39 /* NotificationPermissionRequestManager.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 31312619148FF82B00BA2A39 /* NotificationPermissionRequestManager.cpp */; };
+                3131261F148FF82C00BA2A39 /* NotificationPermissionRequestManager.h in Headers */ = {isa = PBXBuildFile; fileRef = 3131261A148FF82B00BA2A39 /* NotificationPermissionRequestManager.h */; };
+                31312620148FF82C00BA2A39 /* WebNotificationManager.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3131261B148FF82B00BA2A39 /* WebNotificationManager.cpp */; };
+                31312621148FF82C00BA2A39 /* WebNotificationManager.h in Headers */ = {isa = PBXBuildFile; fileRef = 3131261C148FF82B00BA2A39 /* WebNotificationManager.h */; };
                 318BE1671473433700A8FBB2 /* WebNotificationManagerProxyMessageReceiver.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 318BE1651473433700A8FBB2 /* WebNotificationManagerProxyMessageReceiver.cpp */; };
                 318BE1681473433700A8FBB2 /* WebNotificationManagerProxyMessages.h in Headers */ = {isa = PBXBuildFile; fileRef = 318BE1661473433700A8FBB2 /* WebNotificationManagerProxyMessages.h */; };
@@ -261 +260 @@
                 318BE17714743E6000A8FBB2 /* WKNotification.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 318BE17614743E6000A8FBB2 /* WKNotification.cpp */; };
                 318BE17914743E6F00A8FBB2 /* WKNotification.h in Headers */ = {isa = PBXBuildFile; fileRef = 318BE17814743E6A00A8FBB2 /* WKNotification.h */; settings = {ATTRIBUTES = (Private, ); }; };
+                31A2EC48148997C200810D71 /* WebNotification.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 31A2EC41148997BE00810D71 /* WebNotification.cpp */; };
+                31A2EC49148997C200810D71 /* WebNotification.h in Headers */ = {isa = PBXBuildFile; fileRef = 31A2EC42148997BE00810D71 /* WebNotification.h */; };
+                31A2EC4A148997C200810D71 /* WebNotificationManagerProxy.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 31A2EC43148997BE00810D71 /* WebNotificationManagerProxy.cpp */; };
+                31A2EC4B148997C200810D71 /* WebNotificationManagerProxy.h in Headers */ = {isa = PBXBuildFile; fileRef = 31A2EC44148997BF00810D71 /* WebNotificationManagerProxy.h */; };
+                31A2EC4D148997C200810D71 /* WebNotificationProvider.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 31A2EC46148997C000810D71 /* WebNotificationProvider.cpp */; };
+                31A2EC4E148997C200810D71 /* WebNotificationProvider.h in Headers */ = {isa = PBXBuildFile; fileRef = 31A2EC47148997C100810D71 /* WebNotificationProvider.h */; };
+                31A2EC501489980500810D71 /* NotificationPermissionRequestManagerProxy.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 31A2EC4F1489980500810D71 /* NotificationPermissionRequestManagerProxy.cpp */; };
+                31A2EC521489981900810D71 /* NotificationPermissionRequestManagerProxy.h in Headers */ = {isa = PBXBuildFile; fileRef = 31A2EC511489981500810D71 /* NotificationPermissionRequestManagerProxy.h */; };
+                31A2EC551489982E00810D71 /* NotificationPermissionRequest.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 31A2EC541489982E00810D71 /* NotificationPermissionRequest.cpp */; };
+                31A2EC5614899C0900810D71 /* NotificationPermissionRequest.h in Headers */ = {isa = PBXBuildFile; fileRef = 31A2EC531489982500810D71 /* NotificationPermissionRequest.h */; };
+                31A2EC74148D59CA00810D71 /* WKNotificationPermissionRequest.h in Headers */ = {isa = PBXBuildFile; fileRef = 31A2EC72148D59BB00810D71 /* WKNotificationPermissionRequest.h */; settings = {ATTRIBUTES = (Private, ); }; };
+                31A2EC77148D662E00810D71 /* WKNotificationPermissionRequest.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 31A2EC75148D65BB00810D71 /* WKNotificationPermissionRequest.cpp */; };
                 31BA924D148831260062EDB5 /* WebNotificationManagerMessageReceiver.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 31BA9248148830810062EDB5 /* WebNotificationManagerMessageReceiver.cpp */; };
                 31BA924E148831260062EDB5 /* WebNotificationManagerMessages.h in Headers */ = {isa = PBXBuildFile; fileRef = 31BA9249148830810062EDB5 /* WebNotificationManagerMessages.h */; };
-                31C11AB3148452E90049A4CC /* WebNotification.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 31C11AB1148452E90049A4CC /* WebNotification.cpp */; };
-                31C11AB4148452E90049A4CC /* WebNotification.h in Headers */ = {isa = PBXBuildFile; fileRef = 31C11AB2148452E90049A4CC /* WebNotification.h */; };
                 31EA25D2134F78C0005B1452 /* NativeWebMouseEventMac.mm in Sources */ = {isa = PBXBuildFile; fileRef = 31EA25D0134F78B2005B1452 /* NativeWebMouseEventMac.mm */; };
                 330934471315B9220097A7BC /* WebCookieManagerMessageReceiver.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 330934431315B9220097A7BC /* WebCookieManagerMessageReceiver.cpp */; };
@@ -1228 +1237 @@
                 29CD55A9128E294F00133C85 /* WKAccessibilityWebPageObject.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = WKAccessibilityWebPageObject.mm; sourceTree = "<group>"; };
                 31099968146C71F50029DEB9 /* WebNotificationClient.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = WebNotificationClient.h; sourceTree = "<group>"; };
-                3109996A146C73920029DEB9 /* WebNotificationManagerProxy.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = WebNotificationManagerProxy.h; sourceTree = "<group>"; };
-                3109996B146C73B10029DEB9 /* WebNotificationManagerProxy.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = WebNotificationManagerProxy.cpp; sourceTree = "<group>"; };
-                3109996D146C73C40029DEB9 /* WebNotificationManagerProxy.messages.in */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = WebNotificationManagerProxy.messages.in; sourceTree = "<group>"; };
                 31099971146C759B0029DEB9 /* WebNotificationClient.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = WebNotificationClient.cpp; sourceTree = "<group>"; };
-                31099978146C8B140029DEB9 /* WebNotificationManager.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = WebNotificationManager.cpp; path = Notifications/WebNotificationManager.cpp; sourceTree = "<group>"; };
-                31099979146C8B140029DEB9 /* WebNotificationManager.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = WebNotificationManager.h; path = Notifications/WebNotificationManager.h; sourceTree = "<group>"; };
-                312C0C46146DDBBC0016C911 /* WebNotificationProvider.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = WebNotificationProvider.cpp; sourceTree = "<group>"; };
-                312C0C48146DDBD30016C911 /* WebNotificationProvider.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = WebNotificationProvider.h; sourceTree = "<group>"; };
                 312C0C49146DDC8A0016C911 /* WKNotificationProvider.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WKNotificationProvider.h; sourceTree = "<group>"; };
+                31312619148FF82B00BA2A39 /* NotificationPermissionRequestManager.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = NotificationPermissionRequestManager.cpp; sourceTree = "<group>"; };
+                3131261A148FF82B00BA2A39 /* NotificationPermissionRequestManager.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = NotificationPermissionRequestManager.h; sourceTree = "<group>"; };
+                3131261B148FF82B00BA2A39 /* WebNotificationManager.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = WebNotificationManager.cpp; sourceTree = "<group>"; };
+                3131261C148FF82B00BA2A39 /* WebNotificationManager.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WebNotificationManager.h; sourceTree = "<group>"; };
+                3131261D148FF82C00BA2A39 /* WebNotificationManager.messages.in */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = WebNotificationManager.messages.in; sourceTree = "<group>"; };
                 318BE1651473433700A8FBB2 /* WebNotificationManagerProxyMessageReceiver.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = WebNotificationManagerProxyMessageReceiver.cpp; sourceTree = "<group>"; };
                 318BE1661473433700A8FBB2 /* WebNotificationManagerProxyMessages.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WebNotificationManagerProxyMessages.h; sourceTree = "<group>"; };
@@ -1243 +1250 @@
                 318BE17614743E6000A8FBB2 /* WKNotification.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = WKNotification.cpp; sourceTree = "<group>"; };
                 318BE17814743E6A00A8FBB2 /* WKNotification.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = WKNotification.h; sourceTree = "<group>"; };
+                31A2EC41148997BE00810D71 /* WebNotification.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = WebNotification.cpp; sourceTree = "<group>"; };
+                31A2EC42148997BE00810D71 /* WebNotification.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WebNotification.h; sourceTree = "<group>"; };
+                31A2EC43148997BE00810D71 /* WebNotificationManagerProxy.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = WebNotificationManagerProxy.cpp; sourceTree = "<group>"; };
+                31A2EC44148997BF00810D71 /* WebNotificationManagerProxy.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WebNotificationManagerProxy.h; sourceTree = "<group>"; };
+                31A2EC45148997BF00810D71 /* WebNotificationManagerProxy.messages.in */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = WebNotificationManagerProxy.messages.in; sourceTree = "<group>"; };
+                31A2EC46148997C000810D71 /* WebNotificationProvider.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = WebNotificationProvider.cpp; sourceTree = "<group>"; };
+                31A2EC47148997C100810D71 /* WebNotificationProvider.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WebNotificationProvider.h; sourceTree = "<group>"; };
+                31A2EC4F1489980500810D71 /* NotificationPermissionRequestManagerProxy.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = NotificationPermissionRequestManagerProxy.cpp; sourceTree = "<group>"; };
+                31A2EC511489981500810D71 /* NotificationPermissionRequestManagerProxy.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = NotificationPermissionRequestManagerProxy.h; sourceTree = "<group>"; };
+                31A2EC531489982500810D71 /* NotificationPermissionRequest.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = NotificationPermissionRequest.h; sourceTree = "<group>"; };
+                31A2EC541489982E00810D71 /* NotificationPermissionRequest.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = NotificationPermissionRequest.cpp; sourceTree = "<group>"; };
+                31A2EC72148D59BB00810D71 /* WKNotificationPermissionRequest.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = WKNotificationPermissionRequest.h; sourceTree = "<group>"; };
+                31A2EC75148D65BB00810D71 /* WKNotificationPermissionRequest.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = WKNotificationPermissionRequest.cpp; sourceTree = "<group>"; };
                 31BA9248148830810062EDB5 /* WebNotificationManagerMessageReceiver.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = WebNotificationManagerMessageReceiver.cpp; sourceTree = "<group>"; };
                 31BA9249148830810062EDB5 /* WebNotificationManagerMessages.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WebNotificationManagerMessages.h; sourceTree = "<group>"; };
-                31C11AB1148452E90049A4CC /* WebNotification.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = WebNotification.cpp; sourceTree = "<group>"; };
-                31C11AB2148452E90049A4CC /* WebNotification.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WebNotification.h; sourceTree = "<group>"; };
                 31EA25D0134F78B2005B1452 /* NativeWebMouseEventMac.mm */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.objcpp; path = NativeWebMouseEventMac.mm; sourceTree = "<group>"; };
                 31EA25D3134F78D6005B1452 /* NativeWebMouseEvent.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = NativeWebMouseEvent.h; sourceTree = "<group>"; };
@@ -2487 +2505 @@
                         isa = PBXGroup;
                         children = (
-                                31099978146C8B140029DEB9 /* WebNotificationManager.cpp */,
-                                31099979146C8B140029DEB9 /* WebNotificationManager.h */,
+                                31312619148FF82B00BA2A39 /* NotificationPermissionRequestManager.cpp */,
+                                3131261A148FF82B00BA2A39 /* NotificationPermissionRequestManager.h */,
+                                3131261B148FF82B00BA2A39 /* WebNotificationManager.cpp */,
+                                3131261C148FF82B00BA2A39 /* WebNotificationManager.h */,
+                                3131261D148FF82C00BA2A39 /* WebNotificationManager.messages.in */,
                         );
                         name = "Notifications (User)";
+                        path = Notifications;
+                        sourceTree = "<group>";
+                };
+                31A2EC401489973700810D71 /* Notifications */ = {
+                        isa = PBXGroup;
+                        children = (
+                                31A2EC4F1489980500810D71 /* NotificationPermissionRequestManagerProxy.cpp */,
+                                31A2EC511489981500810D71 /* NotificationPermissionRequestManagerProxy.h */,
+                                31A2EC541489982E00810D71 /* NotificationPermissionRequest.cpp */,
+                                31A2EC531489982500810D71 /* NotificationPermissionRequest.h */,
+                                31A2EC41148997BE00810D71 /* WebNotification.cpp */,
+                                31A2EC42148997BE00810D71 /* WebNotification.h */,
+                                31A2EC43148997BE00810D71 /* WebNotificationManagerProxy.cpp */,
+                                31A2EC44148997BF00810D71 /* WebNotificationManagerProxy.h */,
+                                31A2EC45148997BF00810D71 /* WebNotificationManagerProxy.messages.in */,
+                                31A2EC46148997C000810D71 /* WebNotificationProvider.cpp */,
+                                31A2EC47148997C100810D71 /* WebNotificationProvider.h */,
+                        );
+                        path = Notifications;
                         sourceTree = "<group>";
                 };
@@ -2765 +2805 @@
                                 BC111B18112F5FB400337BAB /* Launcher */,
                                 BCCF085C113F3B7500C650C5 /* mac */,
+                                31A2EC401489973700810D71 /* Notifications */,
                                 1AEFCC0511D01F34008219D3 /* Plugins */,
                                 1A64256712DE42EC00CAAE2C /* BackingStore.cpp */,
@@ -2856 +2897 @@
                                 BCF69FA11176D01400471A52 /* WebNavigationData.cpp */,
                                 BCF69FA01176D01400471A52 /* WebNavigationData.h */,
-                                31C11AB1148452E90049A4CC /* WebNotification.cpp */,
-                                31C11AB2148452E90049A4CC /* WebNotification.h */,
-                                3109996B146C73B10029DEB9 /* WebNotificationManagerProxy.cpp */,
-                                3109996A146C73920029DEB9 /* WebNotificationManagerProxy.h */,
-                                3109996D146C73C40029DEB9 /* WebNotificationManagerProxy.messages.in */,
-                                312C0C46146DDBBC0016C911 /* WebNotificationProvider.cpp */,
-                                312C0C48146DDBD30016C911 /* WebNotificationProvider.h */,
                                 BC1DFEA312B31F87005DF730 /* WebOpenPanelResultListenerProxy.cpp */,
                                 BC1DFEA212B31F87005DF730 /* WebOpenPanelResultListenerProxy.h */,
@@ -2983 +3017 @@
                                 33367638130C99DC006C9DE2 /* WKResourceCacheManager.cpp */,
                                 33367639130C99DC006C9DE2 /* WKResourceCacheManager.h */,
+                                31A2EC72148D59BB00810D71 /* WKNotificationPermissionRequest.h */,
+                                31A2EC75148D65BB00810D71 /* WKNotificationPermissionRequest.cpp */,
                         );
                         path = C;
@@ -4062 +4098 @@
                                 3788A05C14743C90006319E5 /* WKBrowsingContextControllerPrivate.h in Headers */,
                                 BCE9C0B71484714700E33D61 /* WebConnectionMessageKinds.h in Headers */,
-                                3109996F146C741D0029DEB9 /* WebNotificationManagerProxy.h in Headers */,
-                                3109997B146C8B140029DEB9 /* WebNotificationManager.h in Headers */,
                                 310999C7146C9E3D0029DEB9 /* WebNotificationClient.h in Headers */,
                                 312C0C4A146DDC8A0016C911 /* WKNotificationProvider.h in Headers */,
@@ -4069 +4103 @@
                                 318BE17114743DB100A8FBB2 /* WKNotificationManager.h in Headers */,
                                 318BE17914743E6F00A8FBB2 /* WKNotification.h in Headers */,
-                                31C11AB4148452E90049A4CC /* WebNotification.h in Headers */,
                                 31BA924E148831260062EDB5 /* WebNotificationManagerMessages.h in Headers */,
+                                31A2EC49148997C200810D71 /* WebNotification.h in Headers */,
+                                31A2EC4B148997C200810D71 /* WebNotificationManagerProxy.h in Headers */,
+                                31A2EC4E148997C200810D71 /* WebNotificationProvider.h in Headers */,
+                                31A2EC521489981900810D71 /* NotificationPermissionRequestManagerProxy.h in Headers */,
+                                31A2EC5614899C0900810D71 /* NotificationPermissionRequest.h in Headers */,
+                                31A2EC74148D59CA00810D71 /* WKNotificationPermissionRequest.h in Headers */,
+                                3131261F148FF82C00BA2A39 /* NotificationPermissionRequestManager.h in Headers */,
+                                31312621148FF82C00BA2A39 /* WebNotificationManager.h in Headers */,
                         );
                         runOnlyForDeploymentPostprocessing = 0;
@@ -4773 +4814 @@
                                 BC4A62A714744EC7006C681A /* WebConnectionToWebProcess.cpp in Sources */,
                                 BC09B8F8147460F7005F5625 /* WebContextConnectionClient.cpp in Sources */,
-                                31099970146C74200029DEB9 /* WebNotificationManagerProxy.cpp in Sources */,
                                 31099973146C75A20029DEB9 /* WebNotificationClient.cpp in Sources */,
-                                3109997A146C8B140029DEB9 /* WebNotificationManager.cpp in Sources */,
-                                312C0C47146DDBBD0016C911 /* WebNotificationProvider.cpp in Sources */,
                                 318BE1671473433700A8FBB2 /* WebNotificationManagerProxyMessageReceiver.cpp in Sources */,
                                 318BE17514743DD700A8FBB2 /* WKNotificationManager.cpp in Sources */,
                                 318BE17714743E6000A8FBB2 /* WKNotification.cpp in Sources */,
-                                31C11AB3148452E90049A4CC /* WebNotification.cpp in Sources */,
                                 31BA924D148831260062EDB5 /* WebNotificationManagerMessageReceiver.cpp in Sources */,
                                 BCD3675C148C26C000447E87 /* WebConnectionToUIProcess.cpp in Sources */,
                                 8CFECE941490F140002AAA32 /* EditorState.cpp in Sources */,
                                 B63403F914910D57001070B5 /* APIObject.cpp in Sources */,
+                                31A2EC48148997C200810D71 /* WebNotification.cpp in Sources */,
+                                31A2EC4A148997C200810D71 /* WebNotificationManagerProxy.cpp in Sources */,
+                                31A2EC4D148997C200810D71 /* WebNotificationProvider.cpp in Sources */,
+                                31A2EC501489980500810D71 /* NotificationPermissionRequestManagerProxy.cpp in Sources */,
+                                31A2EC551489982E00810D71 /* NotificationPermissionRequest.cpp in Sources */,
+                                31A2EC77148D662E00810D71 /* WKNotificationPermissionRequest.cpp in Sources */,
+                                3131261E148FF82C00BA2A39 /* NotificationPermissionRequestManager.cpp in Sources */,
+                                31312620148FF82C00BA2A39 /* WebNotificationManager.cpp in Sources */,
                         );
                         runOnlyForDeploymentPostprocessing = 0;

trunk/Source/WebKit2/WebProcess/Notifications/NotificationPermissionRequestManager.h

@@ -24 +24 @@
  */
 
-#ifndef WebNotification_h
-#define WebNotification_h
+#ifndef NotificationPermissionRequestManager_h
+#define NotificationPermissionRequestManager_h
 
-#include "APIObject.h"
-#include <wtf/PassRefPtr.h>
-#include <wtf/text/WTFString.h>
+#include <WebCore/NotificationPresenter.h>
+#include <WebCore/VoidCallback.h>
+#include <wtf/HashMap.h>
+#include <wtf/RefCounted.h>
+#include <wtf/RefPtr.h>
 
-namespace CoreIPC {
-
-class ArgumentDecoder;
-class ArgumentEncoder;
-
-} // namespace CoreIPC
+namespace WebCore {
+class Notification;    
+class SecurityOrigin;
+}
 
 namespace WebKit {
+
+class WebPage;
+
+/// FIXME: Need to keep a queue of pending notifications which permission is still being requested.
+class NotificationPermissionRequestManager : public RefCounted<NotificationPermissionRequestManager> {
+public:
+    static PassRefPtr<NotificationPermissionRequestManager> create(WebPage*);
     
-class WebNotification : public APIObject {
-public:
-    static const Type APIType = TypeNotification;
+    void startRequest(WebCore::SecurityOrigin*, PassRefPtr<WebCore::VoidCallback>);
+    void cancelRequest(WebCore::SecurityOrigin*);
     
-    WebNotification();
-    static PassRefPtr<WebNotification> create(const String& title, const String& body, uint64_t notificationID)
-    {
-        return adoptRef(new WebNotification(title, body, notificationID));
-    }
-    virtual ~WebNotification();
+    // Synchronous call to retrieve permission level for given security origin
+    WebCore::NotificationPresenter::Permission permissionLevel(WebCore::SecurityOrigin*);
     
-    const String& title() const { return m_title; }
+    void didReceiveNotificationPermissionDecision(uint64_t notificationID, bool allowed);
     
-    const String& body() const { return m_body; }
+private:
+    NotificationPermissionRequestManager(WebPage*);
     
-    uint64_t notificationID() const { return m_notificationID; }
+    HashMap<uint64_t, RefPtr<WebCore::VoidCallback> > m_idToCallbackMap;
+    HashMap<RefPtr<WebCore::SecurityOrigin>, uint64_t> m_originToIDMap;
+    HashMap<uint64_t, RefPtr<WebCore::SecurityOrigin> > m_idToOriginMap;
 
-    void encode(CoreIPC::ArgumentEncoder*) const;
-    static bool decode(CoreIPC::ArgumentDecoder*, WebNotification&);
-
-private:
-    WebNotification(const String& title, const String& body, uint64_t notificationID);
-
-    virtual Type type() const { return APIType; }
-    
-    String m_title;
-    String m_body;
-    uint64_t m_notificationID;
+    WebPage* m_page;
 };
 
-inline bool isNotificationIDValid(uint64_t id)
+inline bool isRequestIDValid(uint64_t id)
 {
     // This check makes sure that the ID is not equal to values needed by
@@ -79 +74 @@
 } // namespace WebKit
 
-#endif // WebNotification_h
+#endif // NotificationPermissionRequestManager_h

trunk/Source/WebKit2/WebProcess/Notifications/WebNotificationManager.h

@@ -39 +39 @@
 
 namespace WebCore {
-class Notification;    
+class Notification;
 }
 

trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebNotificationClient.cpp

@@ -29 +29 @@
 #if ENABLE(NOTIFICATIONS)
 
+#include "NotificationPermissionRequestManager.h"
 #include "WebNotificationManager.h"
+#include "WebPage.h"
 #include "WebProcess.h"
 #include <WebCore/NotImplemented.h>
+#include <WebCore/ScriptExecutionContext.h>
 
 using namespace WebCore;
@@ -75 +78 @@
 }
 
-void WebNotificationClient::requestPermission(ScriptExecutionContext*, PassRefPtr<VoidCallback>)
+void WebNotificationClient::requestPermission(ScriptExecutionContext* context, PassRefPtr<VoidCallback> callback)
 {
-    notImplemented();
+    m_page->notificationPermissionRequestManager()->startRequest(context->securityOrigin(), callback);
 }
 
-void WebNotificationClient::cancelRequestsForPermission(ScriptExecutionContext*)
+void WebNotificationClient::cancelRequestsForPermission(ScriptExecutionContext* context)
 {
-    notImplemented();
+    m_page->notificationPermissionRequestManager()->cancelRequest(context->securityOrigin());
 }
 
-NotificationPresenter::Permission WebNotificationClient::checkPermission(ScriptExecutionContext*)
+NotificationPresenter::Permission WebNotificationClient::checkPermission(ScriptExecutionContext* context)
 {
-    notImplemented();
-    return NotificationPresenter::PermissionDenied;
+    if (!context || !context->isDocument())
+        return NotificationPresenter::PermissionDenied;
+    return m_page->notificationPermissionRequestManager()->permissionLevel(context->securityOrigin());
 }
 

trunk/Source/WebKit2/WebProcess/WebPage/WebPage.cpp

@@ -36 +36 @@
 #include "MessageID.h"
 #include "NetscapePlugin.h"
+#include "NotificationPermissionRequestManager.h"
 #include "PageOverlay.h"
 #include "PluginProxy.h"
@@ -1878 +1879 @@
 #endif
 
+NotificationPermissionRequestManager* WebPage::notificationPermissionRequestManager()
+{
+    if (m_notificationPermissionRequestManager)
+        return m_notificationPermissionRequestManager.get();
+
+    m_notificationPermissionRequestManager = NotificationPermissionRequestManager::create(this);
+    return m_notificationPermissionRequestManager.get();
+}
+
 #if !PLATFORM(GTK) && !PLATFORM(MAC)
 bool WebPage::handleEditingKeyboardEvent(KeyboardEvent* evt)
@@ -2154 +2164 @@
 }
 
+void WebPage::didReceiveNotificationPermissionDecision(uint64_t notificationID, bool allowed)
+{
+    notificationPermissionRequestManager()->didReceiveNotificationPermissionDecision(notificationID, allowed);
+}
+
 void WebPage::advanceToNextMisspelling(bool startBeforeSelection)
 {

trunk/Source/WebKit2/WebProcess/WebPage/WebPage.h

@@ -103 +103 @@
 class DrawingArea;
 class InjectedBundleBackForwardList;
+class NotificationPermissionRequestManager;
 class PageOverlay;
 class PluginView;
@@ -310 +311 @@
     FindController& findController() { return m_findController; }
     GeolocationPermissionRequestManager& geolocationPermissionRequestManager() { return m_geolocationPermissionRequestManager; }
+    NotificationPermissionRequestManager* notificationPermissionRequestManager();
 
     void pageDidScroll();
@@ -588 +590 @@
 
     void didReceiveGeolocationPermissionDecision(uint64_t geolocationID, bool allowed);
+    void didReceiveNotificationPermissionDecision(uint64_t notificationID, bool allowed);
 
     void advanceToNextMisspelling(bool startBeforeSelection);
@@ -694 +697 @@
     RefPtr<WebOpenPanelResultListener> m_activeOpenPanelResultListener;
     GeolocationPermissionRequestManager m_geolocationPermissionRequestManager;
+    RefPtr<NotificationPermissionRequestManager> m_notificationPermissionRequestManager;
 
     OwnPtr<WebCore::PrintContext> m_printContext;

trunk/Source/WebKit2/WebProcess/WebPage/WebPage.messages.in

@@ -173 +173 @@
     # Geolocation
     DidReceiveGeolocationPermissionDecision(uint64_t geolocationID, bool allowed)
+    
+    # Notification
+    DidReceiveNotificationPermissionDecision(uint64_t notificationID, bool allowed)
 
     SetWindowResizerSize(WebCore::IntSize intersectsView)

trunk/Source/WebKit2/win/WebKit2.vcproj

@@ -1564 +1564 @@
                         >
                         <File
+                                RelativePath="..\WebProcess\WebConnectionToUIProcess.cpp"
+                                >
+                        </File>
+                        <File
+                                RelativePath="..\WebProcess\WebConnectionToUIProcess.h"
+                                >
+                        </File>
+                        <File
                                 RelativePath="..\WebProcess\WebKitMain.cpp"
-                                >
-                        </File>
-                        <File
-                                RelativePath="..\WebProcess\WebConnectionToUIProcess.cpp"
-                                >
-                        </File>
-                        <File
-                                RelativePath="..\WebProcess\WebConnectionToUIProcess.h"
                                 >
                         </File>
@@ -2715 +2715 @@
                                 >
                                 <File
+                                        RelativePath="..\WebProcess\Notifications\NotificationPermissionRequestManager.cpp"
+                                        >
+                                </File>
+                                <File
+                                        RelativePath="..\WebProcess\Notifications\NotificationPermissionRequestManager.h"
+                                        >
+                                </File>
+                                <File
                                         RelativePath="..\WebProcess\Notifications\WebNotificationManager.cpp"
                                         >
@@ -3089 +3097 @@
                         <File
                                 RelativePath="..\UIProcess\WebNavigationData.h"
-                                >
-                        </File>
-                        <File
-                                RelativePath="..\UIProcess\WebNotification.cpp"
-                                >
-                        </File>
-                        <File
-                                RelativePath="..\UIProcess\WebNotification.h"
-                                >
-                        </File>
-                        <File
-                                RelativePath="..\UIProcess\WebNotificationManagerProxy.cpp"
-                                >
-                        </File>
-                        <File
-                                RelativePath="..\UIProcess\WebNotificationManagerProxy.h"
-                                >
-                        </File>
-                        <File
-                                RelativePath="..\UIProcess\WebNotificationManagerProxy.messages.in"
-                                >
-                        </File>
-                        <File
-                                RelativePath="..\UIProcess\WebNotificationProvider.cpp"
-                                >
-                        </File>
-                        <File
-                                RelativePath="..\UIProcess\WebNotificationProvider.h"
                                 >
                         </File>
@@ -3819 +3799 @@
                                 </Filter>
                         </Filter>
+                        <Filter
+                                Name="Notifications (User)"
+                                >
+                                <File
+                                        RelativePath="..\UIProcess\Notifications\NotificationPermissionRequest.cpp"
+                                        >
+                                </File>
+                                <File
+                                        RelativePath="..\UIProcess\Notifications\NotificationPermissionRequest.h"
+                                        >
+                                </File>
+                                <File
+                                        RelativePath="..\UIProcess\Notifications\NotificationPermissionRequestManagerProxy.cpp"
+                                        >
+                                </File>
+                                <File
+                                        RelativePath="..\UIProcess\Notifications\NotificationPermissionRequestManagerProxy.h"
+                                        >
+                                </File>
+                                <File
+                                        RelativePath="..\UIProcess\Notifications\WebNotification.cpp"
+                                        >
+                                </File>
+                                <File
+                                        RelativePath="..\UIProcess\Notifications\WebNotification.h"
+                                        >
+                                </File>
+                                <File
+                                        RelativePath="..\UIProcess\Notifications\WebNotificationManagerProxy.cpp"
+                                        >
+                                </File>
+                                <File
+                                        RelativePath="..\UIProcess\Notifications\WebNotificationManagerProxy.h"
+                                        >
+                                </File>
+                                <File
+                                        RelativePath="..\UIProcess\Notifications\WebNotificationManagerProxy.messages.in"
+                                        >
+                                </File>
+                                <File
+                                        RelativePath="..\UIProcess\Notifications\WebNotificationProvider.cpp"
+                                        >
+                                </File>
+                                <File
+                                        RelativePath="..\UIProcess\Notifications\WebNotificationProvider.h"
+                                        >
+                                </File>
+                        </Filter>
                 </Filter>
                 <Filter

trunk/Source/WebKit2/win/WebKit2Common.vsprops

@@ -7 +7 @@
         <Tool
                 Name="VCCLCompilerTool"
-                AdditionalIncludeDirectories="&quot;$(ProjectDir)&quot;;&quot;$(ProjectDir)\..&quot;;&quot;$(ProjectDir)\..\Platform&quot;;&quot;$(ProjectDir)\..\Platform\cg&quot;;&quot;$(ProjectDir)\..\Platform\CoreIPC&quot;;&quot;$(ProjectDir)\..\PluginProcess&quot;;&quot;$(ProjectDir)\..\Shared&quot;;&quot;$(ProjectDir)\..\Shared\win&quot;;&quot;$(ProjectDir)\..\Shared\cf&quot;;&quot;$(ProjectDir)\..\Shared\API\c&quot;;&quot;$(ProjectDir)\..\Shared\API\c\cf&quot;;&quot;$(ProjectDir)\..\Shared\API\c\win&quot;;&quot;$(ProjectDir)\..\Shared\CoreIPCSupport&quot;;&quot;$(ProjectDir)\..\Shared\Plugins&quot;;&quot;$(ProjectDir)\..\Shared\Plugins\Netscape&quot;;&quot;$(ProjectDir)\..\UIProcess&quot;;&quot;$(ProjectDir)\..\UIProcess\API\C&quot;;&quot;$(ProjectDir)\..\UIProcess\API\C\win&quot;;&quot;$(ProjectDir)\..\UIProcess\API\cpp&quot;;&quot;$(ProjectDir)\..\UIProcess\API\win&quot;;&quot;$(ProjectDir)\..\UIProcess\Authentication&quot;;&quot;$(ProjectDir)\..\UIProcess\Downloads&quot;;&quot;$(ProjectDir)\..\UIProcess\Launcher&quot;;&quot;$(ProjectDir)\..\UIProcess\Plugins&quot;;&quot;$(ProjectDir)\..\UIProcess\win&quot;;&quot;$(ProjectDir)\..\WebProcess&quot;;&quot;$(ProjectDir)\..\WebProcess\WebCoreSupport&quot;;&quot;$(ProjectDir)\..\WebProcess\WebCoreSupport\win&quot;;&quot;$(ProjectDir)\..\WebProcess\WebPage&quot;;&quot;$(ProjectDir)\..\WebProcess\WebPage\win&quot;;&quot;$(ProjectDir)\..\WebProcess\IconDatabase&quot;;&quot;$(ProjectDir)\..\WebProcess\InjectedBundle&quot;;&quot;$(ProjectDir)\..\WebProcess\InjectedBundle\API\c&quot;;&quot;$(ProjectDir)\..\WebProcess\InjectedBundle\DOM&quot;;&quot;$(ProjectDir)\..\WebProcess\InjectedBundle\win&quot;;&quot;$(ProjectDir)\..\WebProcess\Plugins&quot;;&quot;$(ProjectDir)\..\WebProcess\Plugins\Netscape&quot;;&quot;$(ProjectDir)\..\WebProcess\win&quot;;&quot;$(ProjectDir)\..\WebProcess\ApplicationCache&quot;;&quot;$(ProjectDir)\..\WebProcess\Authentication&quot;;&quot;$(ProjectDir)\..\WebProcess\Cookies&quot;;&quot;$(ProjectDir)\..\WebProcess\Cookies\cf&quot;;&quot;$(ProjectDir)\..\WebProcess\Downloads&quot;;&quot;$(ProjectDir)\..\WebProcess\Downloads\cf&quot;;&quot;$(ProjectDir)\..\WebProcess\FullScreen&quot;;&quot;$(ProjectDir)\..\WebProcess\Geolocation&quot;;&quot;$(ProjectDir)\..\WebProcess\KeyValueStorage&quot;;&quot;$(ProjectDir)\..\WebProcess\MediaCache&quot;;&quot;$(ProjectDir)\..\WebProcess\Notifications&quot;;&quot;$(ProjectDir)\..\WebProcess\ResourceCache&quot;;&quot;$(ConfigurationBuildDir)\obj\$(ProjectName)\DerivedSources&quot;;&quot;$(ConfigurationBuildDir)\Include&quot;;&quot;$(ConfigurationBuildDir)\Include\private&quot;;&quot;$(WebKitLibrariesDir)\Include&quot;;&quot;$(WebKitLibrariesDir)\Include\private&quot;;&quot;$(WebKitLibrariesDir)\Include\pthreads&quot;;&quot;$(ConfigurationBuildDir)\Include\JavaScriptCore&quot;;&quot;$(ConfigurationBuildDir)\Include\private\JavaScriptCore&quot;;&quot;$(WebKitLibrariesDir)\Include\JavaScriptCore&quot;;&quot;$(WebKitLibrariesDir)\Include\private\JavaScriptCore&quot;;&quot;$(ConfigurationBuildDir)\Include\WebCore\ForwardingHeaders&quot;;&quot;$(WebKitLibrariesDir)\Include\WebCore\ForwardingHeaders&quot;"
+                AdditionalIncludeDirectories="&quot;$(ProjectDir)&quot;;&quot;$(ProjectDir)\..&quot;;&quot;$(ProjectDir)\..\Platform&quot;;&quot;$(ProjectDir)\..\Platform\cg&quot;;&quot;$(ProjectDir)\..\Platform\CoreIPC&quot;;&quot;$(ProjectDir)\..\PluginProcess&quot;;&quot;$(ProjectDir)\..\Shared&quot;;&quot;$(ProjectDir)\..\Shared\win&quot;;&quot;$(ProjectDir)\..\Shared\cf&quot;;&quot;$(ProjectDir)\..\Shared\API\c&quot;;&quot;$(ProjectDir)\..\Shared\API\c\cf&quot;;&quot;$(ProjectDir)\..\Shared\API\c\win&quot;;&quot;$(ProjectDir)\..\Shared\CoreIPCSupport&quot;;&quot;$(ProjectDir)\..\Shared\Plugins&quot;;&quot;$(ProjectDir)\..\Shared\Plugins\Netscape&quot;;&quot;$(ProjectDir)\..\UIProcess&quot;;&quot;$(ProjectDir)\..\UIProcess\API\C&quot;;&quot;$(ProjectDir)\..\UIProcess\API\C\win&quot;;&quot;$(ProjectDir)\..\UIProcess\API\cpp&quot;;&quot;$(ProjectDir)\..\UIProcess\API\win&quot;;&quot;$(ProjectDir)\..\UIProcess\Authentication&quot;;&quot;$(ProjectDir)\..\UIProcess\Downloads&quot;;&quot;$(ProjectDir)\..\UIProcess\Launcher&quot;;&quot;$(ProjectDir)\..\UIProcess\Notifications&quot;;&quot;$(ProjectDir)\..\UIProcess\Plugins&quot;;&quot;$(ProjectDir)\..\UIProcess\win&quot;;&quot;$(ProjectDir)\..\WebProcess&quot;;&quot;$(ProjectDir)\..\WebProcess\WebCoreSupport&quot;;&quot;$(ProjectDir)\..\WebProcess\WebCoreSupport\win&quot;;&quot;$(ProjectDir)\..\WebProcess\WebPage&quot;;&quot;$(ProjectDir)\..\WebProcess\WebPage\win&quot;;&quot;$(ProjectDir)\..\WebProcess\IconDatabase&quot;;&quot;$(ProjectDir)\..\WebProcess\InjectedBundle&quot;;&quot;$(ProjectDir)\..\WebProcess\InjectedBundle\API\c&quot;;&quot;$(ProjectDir)\..\WebProcess\InjectedBundle\DOM&quot;;&quot;$(ProjectDir)\..\WebProcess\InjectedBundle\win&quot;;&quot;$(ProjectDir)\..\WebProcess\Plugins&quot;;&quot;$(ProjectDir)\..\WebProcess\Plugins\Netscape&quot;;&quot;$(ProjectDir)\..\WebProcess\win&quot;;&quot;$(ProjectDir)\..\WebProcess\ApplicationCache&quot;;&quot;$(ProjectDir)\..\WebProcess\Authentication&quot;;&quot;$(ProjectDir)\..\WebProcess\Cookies&quot;;&quot;$(ProjectDir)\..\WebProcess\Cookies\cf&quot;;&quot;$(ProjectDir)\..\WebProcess\Downloads&quot;;&quot;$(ProjectDir)\..\WebProcess\Downloads\cf&quot;;&quot;$(ProjectDir)\..\WebProcess\FullScreen&quot;;&quot;$(ProjectDir)\..\WebProcess\Geolocation&quot;;&quot;$(ProjectDir)\..\WebProcess\KeyValueStorage&quot;;&quot;$(ProjectDir)\..\WebProcess\MediaCache&quot;;&quot;$(ProjectDir)\..\WebProcess\Notifications&quot;;&quot;$(ProjectDir)\..\WebProcess\ResourceCache&quot;;&quot;$(ConfigurationBuildDir)\obj\$(ProjectName)\DerivedSources&quot;;&quot;$(ConfigurationBuildDir)\Include&quot;;&quot;$(ConfigurationBuildDir)\Include\private&quot;;&quot;$(WebKitLibrariesDir)\Include&quot;;&quot;$(WebKitLibrariesDir)\Include\private&quot;;&quot;$(WebKitLibrariesDir)\Include\pthreads&quot;;&quot;$(ConfigurationBuildDir)\Include\JavaScriptCore&quot;;&quot;$(ConfigurationBuildDir)\Include\private\JavaScriptCore&quot;;&quot;$(WebKitLibrariesDir)\Include\JavaScriptCore&quot;;&quot;$(WebKitLibrariesDir)\Include\private\JavaScriptCore&quot;;&quot;$(ConfigurationBuildDir)\Include\WebCore\ForwardingHeaders&quot;;&quot;$(WebKitLibrariesDir)\Include\WebCore\ForwardingHeaders&quot;"
                 PreprocessorDefinitions="_USRDLL;WEBKIT_EXPORTS;FRAMEWORK_NAME=WebKit;BUILDING_WEBKIT"
                 UsePrecompiledHeader="2"

trunk/Tools/ChangeLog

@@ +1 @@
+2011-12-06  Jon Lee  <jonlee@apple.com>
+
+        [WK2] Add permissions support (73960)
+        https://bugs.webkit.org/show_bug.cgi?id=73960
+        <rdar://problem/10357008>
+
+        Reviewed by Darin Adler.
+
+        Add null function item to comply with added callback to WKPageUIClient.
+
+        * MiniBrowser/mac/BrowserWindowController.m:
+        (-[BrowserWindowController awakeFromNib]):
+        * WebKitTestRunner/TestController.cpp:
+        (WTR::TestController::createOtherPage):
+        (WTR::TestController::initialize):
+
 2011-12-08  Alexander Færøy  <alexander.faeroy@nokia.com>
 

trunk/Tools/MiniBrowser/mac/BrowserWindowController.m

@@ -668 +668 @@
         createNewPage,
         mouseDidMoveOverElement,
+        0, // decidePolicyForNotificationPermissionRequest
     };
     WKPageSetPageUIClient(_webView.pageRef, &uiClient);

trunk/Tools/WebKitTestRunner/TestController.cpp

@@ -205 +205 @@
         createOtherPage,
         0, // mouseDidMoveOverElement
+        0, // decidePolicyForNotificationPermissionRequest
     };
     WKPageSetPageUIClient(newPage, &otherPageUIClient);
@@ -357 +358 @@
         createOtherPage,
         0, // mouseDidMoveOverElement
+        0, // decidePolicyForNotificationPermissionRequest
     };
     WKPageSetPageUIClient(m_mainWebView->page(), &pageUIClient);