Changeset 62939 in webkit

Timestamp:

Jul 9, 2010 4:47:15 AM (14 years ago)

Author:

yael.aharon@nokia.com

Message:

2010-07-09 Yael Aharon <​yael.aharon@nokia.com>

Reviewed by Laszlo Gombos.

NotificationPresenter needs a cancelRequestPermission API
​https://bugs.webkit.org/show_bug.cgi?id=41783

Updated NotificationPresenter API, to use ScriptExecutionContext instead of origin.
Added new API NotificationPresenter::cancelRequestsForPermision
The new API will be implemented and a test will be added in a followup patch.

• notifications/Notification.cpp: (WebCore::Notification::Notification):
• notifications/NotificationCenter.cpp: (WebCore::NotificationCenter::checkPermission): (WebCore::NotificationCenter::requestPermission): (WebCore::NotificationCenter::disconnectFrame):
• notifications/NotificationCenter.h:
• notifications/NotificationPresenter.h:

2010-07-09 Yael Aharon <​yael.aharon@nokia.com>

Reviewed by Laszlo Gombos.

NotificationPresenter needs a cancelRequestPermission API
​https://bugs.webkit.org/show_bug.cgi?id=41783

Updated the NotificationPresenter API.

• src/NotificationPresenterImpl.cpp: (WebKit::NotificationPresenterImpl::checkPermission): (WebKit::NotificationPresenterImpl::requestPermission):
• src/NotificationPresenterImpl.h: (WebKit::NotificationPresenterImpl::cancelRequestsForPermission):

2010-07-09 Yael Aharon <​yael.aharon@nokia.com>

Reviewed by Laszlo Gombos.

NotificationPresenter needs a cancelRequestPermission API
​https://bugs.webkit.org/show_bug.cgi?id=41783

Updated NotificationPresenter API to use ScriptExecutionContext instead of origin
and added a new NotificationPresenter::cancelRequestsForPermission API.
The new API will be implemented in a followup patch.

• WebCoreSupport/NotificationPresenterClientQt.cpp: (WebCore::NotificationPresenterClientQt::requestPermission): (WebCore::NotificationPresenterClientQt::checkPermission): (WebCore::NotificationPresenterClientQt::cancelRequestsForPermission):
• WebCoreSupport/NotificationPresenterClientQt.h:

Location:

trunk

Files:

• WebCore/ChangeLog (modified) (1 diff)
• WebCore/notifications/Notification.cpp (modified) (2 diffs)
• WebCore/notifications/NotificationCenter.cpp (modified) (2 diffs)
• WebCore/notifications/NotificationCenter.h (modified) (1 diff)
• WebCore/notifications/NotificationPresenter.h (modified) (2 diffs)
• WebKit/chromium/ChangeLog (modified) (1 diff)
• WebKit/chromium/src/NotificationPresenterImpl.cpp (modified) (2 diffs)
• WebKit/chromium/src/NotificationPresenterImpl.h (modified) (1 diff)
• WebKit/qt/ChangeLog (modified) (1 diff)
• WebKit/qt/WebCoreSupport/NotificationPresenterClientQt.cpp (modified) (4 diffs)
• WebKit/qt/WebCoreSupport/NotificationPresenterClientQt.h (modified) (2 diffs)

trunk/WebCore/ChangeLog

@@ +1 @@
+2010-07-09  Yael Aharon  <yael.aharon@nokia.com>
+
+        Reviewed by Laszlo Gombos.
+
+        NotificationPresenter needs a cancelRequestPermission API
+        https://bugs.webkit.org/show_bug.cgi?id=41783
+
+        Updated NotificationPresenter API, to use ScriptExecutionContext instead of origin.
+        Added new API NotificationPresenter::cancelRequestsForPermision
+        The new API will be implemented and a test will be added in a followup patch.
+
+        * notifications/Notification.cpp:
+        (WebCore::Notification::Notification):
+        * notifications/NotificationCenter.cpp:
+        (WebCore::NotificationCenter::checkPermission):
+        (WebCore::NotificationCenter::requestPermission):
+        (WebCore::NotificationCenter::disconnectFrame):
+        * notifications/NotificationCenter.h:
+        * notifications/NotificationPresenter.h:
+
 2010-07-09  Andreas Wictor  <andreas.wictor@xcerion.com>
 

trunk/WebCore/notifications/Notification.cpp

@@ -53 +53 @@
 {
     ASSERT(m_presenter);
-    if (m_presenter->checkPermission(context->url()) != NotificationPresenter::PermissionAllowed) {
+    if (m_presenter->checkPermission(context) != NotificationPresenter::PermissionAllowed) {
         ec = SECURITY_ERR;
         return;
@@ -74 +74 @@
 {
     ASSERT(m_presenter);
-    if (m_presenter->checkPermission(context->url()) != NotificationPresenter::PermissionAllowed) {
+    if (m_presenter->checkPermission(context) != NotificationPresenter::PermissionAllowed) {
         ec = SECURITY_ERR;
         return;

trunk/WebCore/notifications/NotificationCenter.cpp

@@ -50 +50 @@
     if (!presenter())
         return NotificationPresenter::PermissionDenied;
-    return m_notificationPresenter->checkPermission(m_scriptExecutionContext->url());
+    return m_notificationPresenter->checkPermission(m_scriptExecutionContext);
 }
 
@@ -57 +57 @@
     if (!presenter())
         return;
-    m_notificationPresenter->requestPermission(m_scriptExecutionContext->securityOrigin(), callback);
+    m_notificationPresenter->requestPermission(m_scriptExecutionContext, callback);
+}
+
+void NotificationCenter::disconnectFrame()
+{
+    m_notificationPresenter->cancelRequestsForPermission(m_scriptExecutionContext);
+    m_notificationPresenter = 0;
 }
 

trunk/WebCore/notifications/NotificationCenter.h

@@ -78 +78 @@
         void requestPermission(PassRefPtr<VoidCallback> callback);
 
-        void disconnectFrame() { m_notificationPresenter = 0; }
+        void disconnectFrame();
 
     private:

trunk/WebCore/notifications/NotificationPresenter.h

@@ -42 +42 @@
     class Notification;
     class KURL;
-    class SecurityOrigin;
+    class ScriptExecutionContext;
     class String;
 
@@ -68 +68 @@
 
         // Requests user permission to show desktop notifications from a particular
-        // origin. The callback parameter should be run when the user has
+        // script context. The callback parameter should be run when the user has
         // made a decision.
-        virtual void requestPermission(SecurityOrigin*, PassRefPtr<VoidCallback>) = 0;
+        virtual void requestPermission(ScriptExecutionContext*, PassRefPtr<VoidCallback>) = 0;
+
+        // Cancel all outstanding requests for the ScriptExecutionContext
+        virtual void cancelRequestsForPermission(ScriptExecutionContext*) = 0;
 
         // Checks the current level of permission.
-        virtual Permission checkPermission(const KURL&) = 0;
+        virtual Permission checkPermission(ScriptExecutionContext*) = 0;
     };
 

trunk/WebKit/chromium/ChangeLog

@@ +1 @@
+2010-07-09  Yael Aharon  <yael.aharon@nokia.com>
+
+        Reviewed by Laszlo Gombos.
+
+        NotificationPresenter needs a cancelRequestPermission API
+        https://bugs.webkit.org/show_bug.cgi?id=41783
+
+        Updated the NotificationPresenter API.
+
+        * src/NotificationPresenterImpl.cpp:
+        (WebKit::NotificationPresenterImpl::checkPermission):
+        (WebKit::NotificationPresenterImpl::requestPermission):
+        * src/NotificationPresenterImpl.h:
+        (WebKit::NotificationPresenterImpl::cancelRequestsForPermission):
+
 2010-07-08  Pavel Feldman  <pfeldman@chromium.org>
 

trunk/WebKit/chromium/src/NotificationPresenterImpl.cpp

@@ -36 +36 @@
 #include "KURL.h"
 #include "Notification.h"
+#include "ScriptExecutionContext.h"
 #include "SecurityOrigin.h"
 
@@ -92 +93 @@
 }
 
-NotificationPresenter::Permission NotificationPresenterImpl::checkPermission(const KURL& sourceURL)
+NotificationPresenter::Permission NotificationPresenterImpl::checkPermission(ScriptExecutionContext* context)
 {
-    int result = m_presenter->checkPermission(sourceURL);
+    int result = m_presenter->checkPermission(context->url());
     return static_cast<NotificationPresenter::Permission>(result);
 }
 
-void NotificationPresenterImpl::requestPermission(SecurityOrigin* origin, PassRefPtr<VoidCallback> callback)
+void NotificationPresenterImpl::requestPermission(ScriptExecutionContext* context, PassRefPtr<VoidCallback> callback)
 {
-    m_presenter->requestPermission(WebSecurityOrigin(origin), new VoidCallbackClient(callback));
+    m_presenter->requestPermission(WebSecurityOrigin(context->securityOrigin()), new VoidCallbackClient(callback));
 }
 

trunk/WebKit/chromium/src/NotificationPresenterImpl.h

@@ -55 +55 @@
     virtual void cancel(WebCore::Notification* object);
     virtual void notificationObjectDestroyed(WebCore::Notification* object);
-    virtual WebCore::NotificationPresenter::Permission checkPermission(const WebCore::KURL& sourceURL);
-    virtual void requestPermission(WebCore::SecurityOrigin* origin, WTF::PassRefPtr<WebCore::VoidCallback> callback);
+    virtual WebCore::NotificationPresenter::Permission checkPermission(WebCore::ScriptExecutionContext*);
+    virtual void requestPermission(WebCore::ScriptExecutionContext* , WTF::PassRefPtr<WebCore::VoidCallback> callback);
+    virtual void cancelRequestsForPermission(WebCore::ScriptExecutionContext*) {}
 
 private:

trunk/WebKit/qt/ChangeLog

@@ +1 @@
+2010-07-09  Yael Aharon  <yael.aharon@nokia.com>
+
+        Reviewed by Laszlo Gombos.
+
+        NotificationPresenter needs a cancelRequestPermission API
+        https://bugs.webkit.org/show_bug.cgi?id=41783
+
+        Updated NotificationPresenter API to use ScriptExecutionContext instead of origin
+        and added a new NotificationPresenter::cancelRequestsForPermission API.
+        The new API will be implemented in a followup patch.
+
+        * WebCoreSupport/NotificationPresenterClientQt.cpp:
+        (WebCore::NotificationPresenterClientQt::requestPermission):
+        (WebCore::NotificationPresenterClientQt::checkPermission):
+        (WebCore::NotificationPresenterClientQt::cancelRequestsForPermission):
+        * WebCoreSupport/NotificationPresenterClientQt.h:
+
 2010-07-09  Kent Hansen  <kent.hansen@nokia.com>
 

trunk/WebKit/qt/WebCoreSupport/NotificationPresenterClientQt.cpp

@@ -38 +38 @@
 #include "KURL.h"
 #include "QtPlatformPlugin.h"
+#include "ScriptExecutionContext.h"
 #include "SecurityOrigin.h"
 
@@ -253 +254 @@
 }
 
-void NotificationPresenterClientQt::requestPermission(SecurityOrigin* origin, PassRefPtr<VoidCallback> callback)
+void NotificationPresenterClientQt::requestPermission(ScriptExecutionContext* context, PassRefPtr<VoidCallback> callback)
 {  
     if (dumpNotification)
-        printf("DESKTOP NOTIFICATION PERMISSION REQUESTED: %s\n", QString(origin->toString()).toUtf8().constData());
-
-    QString originString = origin->toString();
+        printf("DESKTOP NOTIFICATION PERMISSION REQUESTED: %s\n", QString(context->securityOrigin()->toString()).toUtf8().constData());
+
+    QString originString = context->securityOrigin()->toString();
     QHash<QString, QList<RefPtr<VoidCallback> > >::iterator iter = m_pendingPermissionRequests.find(originString);
     if (iter != m_pendingPermissionRequests.end())
@@ -272 +273 @@
 }
 
-NotificationPresenter::Permission NotificationPresenterClientQt::checkPermission(const KURL& url)
+NotificationPresenter::Permission NotificationPresenterClientQt::checkPermission(ScriptExecutionContext* context)
 {
     NotificationPermission permission = NotificationNotAllowed;
-    QString origin = url.string();
+    QString origin = context->url().string();
     if (checkPermissionFunction)
         checkPermissionFunction(m_receiver, origin, permission);
@@ -290 +291 @@
 }
 
+void NotificationPresenterClientQt::cancelRequestsForPermission(ScriptExecutionContext*)
+{
+    // FIXME: This will be implemented for https://bugs.webkit.org/show_bug.cgi?id=41413
+    // to avoid adding and removing new private API
+}
+
 void NotificationPresenterClientQt::allowNotificationForOrigin(const QString& origin)
 {

trunk/WebKit/qt/WebCoreSupport/NotificationPresenterClientQt.h

@@ -46 +46 @@
 
 class Document;
-class KURL;
+class ScriptExecutionContext;
 
 class NotificationWrapper : public QObject, public QWebNotificationData {
@@ -85 +85 @@
     virtual void cancel(Notification*);
     virtual void notificationObjectDestroyed(Notification*);
-    virtual void requestPermission(SecurityOrigin*, PassRefPtr<VoidCallback>);
-    virtual NotificationPresenter::Permission checkPermission(const KURL&);
+    virtual void requestPermission(ScriptExecutionContext*, PassRefPtr<VoidCallback>);
+    virtual NotificationPresenter::Permission checkPermission(ScriptExecutionContext*);
+    virtual void cancelRequestsForPermission(ScriptExecutionContext*);
 
     void cancel(NotificationWrapper*);