Changeset 55888 in webkit

Timestamp:

Mar 11, 2010 10:11:58 PM (14 years ago)

Author:

eric@webkit.org

Message:

2010-03-11 Aaron Boodman <​aa@chromium.org>

Kill WebDocument::applicationID() (part 1).

Modify interface to WebCore::NotificationPresenter::checkPermission()
and remove implementation of WebDocument::applicationID(). Breaking
API changes will be in a subsequent change.
​https://bugs.webkit.org/show_bug.cgi?id=35846

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

2010-03-11 Aaron Boodman <​aa@chromium.org>

Kill WebDocument::applicationID() (part 1).

Modify interface to WebCore::NotificationPresenter::checkPermission()
and remove implementation of WebDocument::applicationID(). Breaking
API changes will be in a subsequent change.
​https://bugs.webkit.org/show_bug.cgi?id=35846

• public/WebNotificationPresenter.h:
• src/NotificationPresenterImpl.cpp: (WebKit::NotificationPresenterImpl::checkPermission):
• src/NotificationPresenterImpl.h:
• src/WebDocument.cpp: (WebKit::WebDocument::applicationID):

2010-03-11 Aaron Boodman <​aa@chromium.org>

Kill WebDocument::applicationID() (part 1).

Modify interface to WebCore::NotificationPresenter::checkPermission()
and remove implementation of WebDocument::applicationID(). Breaking
API changes will be in a subsequent change.
​https://bugs.webkit.org/show_bug.cgi?id=35846

• WebCoreSupport/WebDesktopNotificationsDelegate.cpp: (WebDesktopNotificationsDelegate::checkPermission):
• WebCoreSupport/WebDesktopNotificationsDelegate.h:

Location:

trunk

Files:

• WebCore/ChangeLog (modified) (1 diff)
• WebCore/notifications/Notification.cpp (modified) (2 diffs)
• WebCore/notifications/NotificationCenter.cpp (modified) (1 diff)
• WebCore/notifications/NotificationPresenter.h (modified) (1 diff)
• WebKit/chromium/ChangeLog (modified) (1 diff)
• WebKit/chromium/public/WebNotificationPresenter.h (modified) (3 diffs)
• WebKit/chromium/src/NotificationPresenterImpl.cpp (modified) (3 diffs)
• WebKit/chromium/src/NotificationPresenterImpl.h (modified) (1 diff)
• WebKit/chromium/src/WebDocument.cpp (modified) (2 diffs)
• WebKit/win/ChangeLog (modified) (1 diff)
• WebKit/win/WebCoreSupport/WebDesktopNotificationsDelegate.cpp (modified) (1 diff)
• WebKit/win/WebCoreSupport/WebDesktopNotificationsDelegate.h (modified) (1 diff)

trunk/WebCore/ChangeLog

@@ +1 @@
+2010-03-11  Aaron Boodman  <aa@chromium.org>
+
+        Kill WebDocument::applicationID() (part 1).
+
+        Modify interface to WebCore::NotificationPresenter::checkPermission()
+        and remove implementation of WebDocument::applicationID(). Breaking
+        API changes will be in a subsequent change.
+        https://bugs.webkit.org/show_bug.cgi?id=35846
+
+        * notifications/Notification.cpp:
+        (WebCore::Notification::Notification):
+        * notifications/NotificationCenter.cpp:
+        (WebCore::NotificationCenter::checkPermission):
+        * notifications/NotificationPresenter.h:
+
 2010-03-11  Dmitry Titov  <dimich@chromium.org>
 

trunk/WebCore/notifications/Notification.cpp

@@ -50 +50 @@
 {
     ASSERT(m_presenter);
-    Document* document = context->isDocument() ? static_cast<Document*>(context) : 0;
-    if (m_presenter->checkPermission(context->url(), document) != NotificationPresenter::PermissionAllowed) {
+    if (m_presenter->checkPermission(context->securityOrigin()) != NotificationPresenter::PermissionAllowed) {
         ec = SECURITY_ERR;
         return;
@@ -71 +70 @@
 {
     ASSERT(m_presenter);
-    Document* document = context->isDocument() ? static_cast<Document*>(context) : 0;
-    if (m_presenter->checkPermission(context->url(), document) != NotificationPresenter::PermissionAllowed) {
+    if (m_presenter->checkPermission(context->securityOrigin()) != 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(),
-        m_scriptExecutionContext->isDocument() ? static_cast<Document*>(m_scriptExecutionContext) : 0);
+    return m_notificationPresenter->checkPermission(m_scriptExecutionContext->securityOrigin());
 }
 

trunk/WebCore/notifications/NotificationPresenter.h

@@ -72 +72 @@
         virtual void requestPermission(SecurityOrigin*, PassRefPtr<VoidCallback>) = 0;
 
-        // Checks the current level of permission for the specified URL. If the
-        // URL is a document (as opposed to a worker or other ScriptExecutionContext),
-        // |document| will also be provided.
-        virtual Permission checkPermission(const KURL&, Document*) = 0;
+        // Checks the current level of permission.
+        virtual Permission checkPermission(SecurityOrigin*) = 0;
     };
 

trunk/WebKit/chromium/ChangeLog

@@ +1 @@
+2010-03-11  Aaron Boodman  <aa@chromium.org>
+
+        Kill WebDocument::applicationID() (part 1).
+
+        Modify interface to WebCore::NotificationPresenter::checkPermission()
+        and remove implementation of WebDocument::applicationID(). Breaking
+        API changes will be in a subsequent change.
+        https://bugs.webkit.org/show_bug.cgi?id=35846
+
+        * public/WebNotificationPresenter.h:
+        * src/NotificationPresenterImpl.cpp:
+        (WebKit::NotificationPresenterImpl::checkPermission):
+        * src/NotificationPresenterImpl.h:
+        * src/WebDocument.cpp:
+        (WebKit::WebDocument::applicationID):
+
 2010-03-11  Stuart Morgan  <stuartmorgan@chromium.org>
 

trunk/WebKit/chromium/public/WebNotificationPresenter.h

@@ -32 +32 @@
 #define WebNotificationPresenter_h
 
+#include "WebNotificationPermissionCallback.h"
+#include "WebSecurityOrigin.h"
 #include "WebString.h"
 
@@ -38 +40 @@
 class WebDocument;
 class WebNotification;
-class WebNotificationPermissionCallback;
 class WebURL;
 
@@ -60 +61 @@
     virtual void objectDestroyed(const WebNotification&) = 0;
 
+    // Checks the permission level for the given origin.
+    // FIXME: This should become abstract when the below is removed.
+    virtual Permission checkPermission(const WebSecurityOrigin& origin)
+    {
+        return PermissionNotAllowed;
+    };
+
     // Checks the permission level for the given URL. If the URL is being displayed in a document
     // (as opposed to a worker or other ScriptExecutionContext), |document| will also be provided.
-    virtual Permission checkPermission(const WebURL& url, WebDocument* document) = 0;
+    // FIXME: This method should be removed as clients don't need WebDocument anymore.
+    virtual Permission checkPermission(const WebURL& url, WebDocument* document)
+    {
+        return PermissionNotAllowed;
+    }
 
     // Requests permission for a given origin.  This operation is asynchronous and the callback provided
     // will be invoked when the permission decision is made.  Callback pointer must remain
     // valid until called.
-    virtual void requestPermission(const WebString& origin, WebNotificationPermissionCallback* callback) = 0;
+    // FIXME: This method should be removed when clients are moved to the below.
+    virtual void requestPermission(const WebString& origin, WebNotificationPermissionCallback* callback)
+    {
+        callback->permissionRequestComplete();
+    }
+    
+    // FIXME: This method should be abstract when the above is removed.
+    virtual void requestPermission(const WebSecurityOrigin& origin, WebNotificationPermissionCallback* callback)
+    {
+        callback->permissionRequestComplete();
+    }
 };
 

trunk/WebKit/chromium/src/NotificationPresenterImpl.cpp

@@ -34 +34 @@
 #if ENABLE(NOTIFICATIONS)
 
-#include "Document.h"
+#include "KURL.h"
 #include "Notification.h"
 #include "SecurityOrigin.h"
 
-#include "WebDocument.h"
 #include "WebNotification.h"
 #include "WebNotificationPermissionCallback.h"
@@ -93 +92 @@
 }
 
-NotificationPresenter::Permission NotificationPresenterImpl::checkPermission(const KURL& url, Document* document)
+NotificationPresenter::Permission NotificationPresenterImpl::checkPermission(SecurityOrigin* origin)
 {
-    WebDocument webDocument;
-    if (document)
-        webDocument = document;
+    int result = m_presenter->checkPermission(WebSecurityOrigin(origin));
 
-    int result = m_presenter->checkPermission(url, document ? &webDocument : 0);
+    // FIXME: Remove this once clients are updated to use the above signature.
+    if (result == NotificationPresenter::PermissionNotAllowed)
+        result = m_presenter->checkPermission(KURL(KURL(), origin->toString()), 0);
+
     return static_cast<NotificationPresenter::Permission>(result);
 }
@@ -105 +105 @@
 void NotificationPresenterImpl::requestPermission(SecurityOrigin* origin, PassRefPtr<VoidCallback> callback)
 {
+    // FIXME: Remove the first call once clients are updated to use the second signature.
     m_presenter->requestPermission(origin->toString(), new VoidCallbackClient(callback));
+    m_presenter->requestPermission(WebSecurityOrigin(origin), 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& url, WebCore::Document* document);
+    virtual WebCore::NotificationPresenter::Permission checkPermission(WebCore::SecurityOrigin* origin);
     virtual void requestPermission(WebCore::SecurityOrigin* origin, WTF::PassRefPtr<WebCore::VoidCallback> callback);
 

trunk/WebKit/chromium/src/WebDocument.cpp

@@ -33 +33 @@
 
 #include "Document.h"
-#include "DocumentLoader.h"
 #include "Element.h"
 #include "HTMLAllCollection.h"
@@ -111 +110 @@
 WebString WebDocument::applicationID() const
 {
-    const char* kChromeApplicationHeader = "x-chrome-application";
-
-    // First check if the document's response included a header indicating the
-    // application it should go with.
-    const Document* document = constUnwrap<Document>();
-    Frame* frame = document->frame();
-    if (!frame)
-        return WebString();
-
-    DocumentLoader* loader = frame->loader()->documentLoader();
-    if (!loader)
-        return WebString();
-
-    WebString headerValue =
-        loader->response().httpHeaderField(kChromeApplicationHeader);
-    if (!headerValue.isEmpty())
-        return headerValue;
-
-    // Otherwise, fall back to looking for the meta tag.
-    RefPtr<NodeList> metaTags =
-        const_cast<Document*>(document)->getElementsByTagName("meta");
-    for (unsigned i = 0; i < metaTags->length(); ++i) {
-        Element* element = static_cast<Element*>(metaTags->item(i));
-        if (element->hasAttribute("http-equiv")
-            && element->getAttribute("http-equiv").lower() == kChromeApplicationHeader)
-            return element->getAttribute("value");
-    }
-
     return WebString();
 }

trunk/WebKit/win/ChangeLog

@@ +1 @@
+2010-03-11  Aaron Boodman  <aa@chromium.org>
+
+        Kill WebDocument::applicationID() (part 1).
+
+        Modify interface to WebCore::NotificationPresenter::checkPermission()
+        and remove implementation of WebDocument::applicationID(). Breaking
+        API changes will be in a subsequent change.
+        https://bugs.webkit.org/show_bug.cgi?id=35846
+
+        * WebCoreSupport/WebDesktopNotificationsDelegate.cpp:
+        (WebDesktopNotificationsDelegate::checkPermission):
+        * WebCoreSupport/WebDesktopNotificationsDelegate.h:
+
 2010-03-11  Anders Carlsson  <andersca@apple.com>
 

trunk/WebKit/win/WebCoreSupport/WebDesktopNotificationsDelegate.cpp

@@ -175 +175 @@
 NotificationPresenter::Permission WebDesktopNotificationsDelegate::checkPermission(const KURL& url, Document*)
 {
+    return NotificationPresenter::PermissionNotAllowed;
+}
+
+NotificationPresenter::Permission WebDesktopNotificationsDelegate::checkPermission(SecurityOrigin* origin)
+{
     int out = 0;
-    BString org(SecurityOrigin::create(url)->toString());
+    BString org(origin->toString());
     if (hasNotificationDelegate())
         notificationDelegate()->checkNotificationPermission(org, &out);

trunk/WebKit/win/WebCoreSupport/WebDesktopNotificationsDelegate.h

@@ -52 +52 @@
     virtual void requestPermission(WebCore::SecurityOrigin* origin, PassRefPtr<WebCore::VoidCallback> callback);
     virtual WebCore::NotificationPresenter::Permission checkPermission(const KURL& url, Document* document);
+    virtual WebCore::NotificationPresenter::Permission checkPermission(const WebCore::SecurityOrigin* origin);
 
 private: