Changeset 47084 in webkit

Timestamp:

Aug 11, 2009 8:30:17 PM (15 years ago)

Author:

mrowe@apple.com

Message:

2009-08-11 John Gregg <​johnnyg@google.com>

Reviewed by Maciej Stachowiak.

WebCore:
Move the accessor for notifications presenter from WebUIDelegate
to WebUIDelegate2 which extends it. When making this call from
WebCoreSupport, check using QueryInterface before calling.

​https://bugs.webkit.org/show_bug.cgi?id=28198

• Interfaces/IWebUIDelegate.idl:
• Interfaces/IWebUIDelegate2.idl: Added.
• Interfaces/WebKit.idl:
• WebCoreSupport/WebDesktopNotificationsDelegate.cpp:

(WebDesktopNotificationsDelegate::show):
(WebDesktopNotificationsDelegate::cancel):
(WebDesktopNotificationsDelegate::notificationObjectDestroyed):
(WebDesktopNotificationsDelegate::requestPermission):
(WebDesktopNotificationsDelegate::checkPermission):
(WebDesktopNotificationsDelegate::hasNotificationDelegate):
(WebDesktopNotificationsDelegate::notificationDelegate):

• WebCoreSupport/WebDesktopNotificationsDelegate.h:

DumpRenderTree:
Switch DumpRenderTree to contain a WebUIDelegate2, which extends
WebUIDelegate, so that the notifications tests will still work.
​https://bugs.webkit.org/show_bug.cgi?id=28198

• DumpRenderTree/win/UIDelegate.h:

Location:

trunk

Files:

• WebKit/win/ChangeLog (modified) (1 diff)
• WebKit/win/Interfaces/IWebUIDelegate.idl (modified) (1 diff)
• WebKit/win/Interfaces/IWebUIDelegate2.idl (copied) (copied from trunk/WebKit/win/WebCoreSupport/WebDesktopNotificationsDelegate.h) (1 diff)
• WebKit/win/Interfaces/WebKit.idl (modified) (1 diff)
• WebKit/win/WebCoreSupport/WebDesktopNotificationsDelegate.cpp (modified) (3 diffs)
• WebKit/win/WebCoreSupport/WebDesktopNotificationsDelegate.h (modified) (1 diff)
• WebKitTools/ChangeLog (modified) (1 diff)
• WebKitTools/DumpRenderTree/win/UIDelegate.h (modified) (1 diff)

trunk/WebKit/win/ChangeLog

@@ +1 @@
+2009-08-11  John Gregg  <johnnyg@google.com>
+
+        Reviewed by Maciej Stachowiak.
+
+        Move the accessor for notifications presenter from WebUIDelegate
+        to WebUIDelegate2 which extends it.  When making this call from
+        WebCoreSupport, check using QueryInterface before calling.
+
+        https://bugs.webkit.org/show_bug.cgi?id=28198
+
+        * Interfaces/IWebUIDelegate.idl:
+        * Interfaces/IWebUIDelegate2.idl: Added.
+        * Interfaces/WebKit.idl:
+        * WebCoreSupport/WebDesktopNotificationsDelegate.cpp:
+        (WebDesktopNotificationsDelegate::show):
+        (WebDesktopNotificationsDelegate::cancel):
+        (WebDesktopNotificationsDelegate::notificationObjectDestroyed):
+        (WebDesktopNotificationsDelegate::requestPermission):
+        (WebDesktopNotificationsDelegate::checkPermission):
+        (WebDesktopNotificationsDelegate::hasNotificationDelegate):
+        (WebDesktopNotificationsDelegate::notificationDelegate):
+        * WebCoreSupport/WebDesktopNotificationsDelegate.h:
+
 2009-08-11  Drew Wilson  <atwilson@google.com>
 

trunk/WebKit/win/Interfaces/IWebUIDelegate.idl

@@ -756 +756 @@
                                  [in] WebScrollbarControlPart pressedPart, [in] BOOL vertical, [in] float value, [in] float proportion, [in] WebScrollbarControlPartMask parts);
     HRESULT paintCustomScrollCorner([in] IWebView* webView, [in] HDC hDC, [in] RECT rect);
-
-    HRESULT desktopNotificationsDelegate([out, retval] IWebDesktopNotificationsDelegate** result);
 }

trunk/WebKit/win/Interfaces/IWebUIDelegate2.idl

@@ -29 +29 @@
  */
 
-#include <WebCore/COMPtr.h>
-#include <WebCore/Notification.h>
-#include <WebCore/NotificationPresenter.h>
+#ifndef DO_NO_IMPORTS
+import "oaidl.idl";
+import "ocidl.idl";
+#endif
 
-#if ENABLE(NOTIFICATIONS)
+/*!
+    @category WebUIDelegate2
+    @discussion An extension of WebUIDelegate which additionally
+    provides access to a notification presenter.
+    @interface NSObject (WebUIDelegate2)
+*/
+[
+    object,
+    oleautomation,
+    uuid(C6DEF152-86CD-11de-8BF4-ADD456D89593),
+    pointer_default(unique)
+]
 
-interface IWebDesktopNotificationPresenter;
-
-class WebDesktopNotificationsDelegate : public WebCore::NotificationPresenter {
-public:
-    WebDesktopNotificationsDelegate(WebView* view);
-
-    /* WebCore::NotificationPresenter interface */
-    virtual bool show(WebCore::Notification* object);
-    virtual void cancel(WebCore::Notification* object);
-    virtual void notificationObjectDestroyed(WebCore::Notification* object);
-    virtual void requestPermission(WebCore::SecurityOrigin* origin, PassRefPtr<WebCore::VoidCallback> callback);
-    virtual WebCore::NotificationPresenter::Permission checkPermission(WebCore::SecurityOrigin* origin);
-
-private:
-    COMPtr<IWebDesktopNotificationsDelegate> notificationDelegate();
-    
-    WebView* m_webView;
-};
-
-#endif
+interface IWebUIDelegate2 : IWebUIDelegate
+{
+    /*!
+        @method desktopNotificationsDelegate:
+        @abstract Returns the notifications delegate object.
+    */
+    HRESULT desktopNotificationsDelegate([out, retval] IWebDesktopNotificationsDelegate** result);
+}

trunk/WebKit/win/Interfaces/WebKit.idl

@@ -113 +113 @@
 #include "IWebTextRenderer.idl"
 #include "IWebUIDelegate.idl"
+#include "IWebUIDelegate2.idl"
 #include "IWebUIDelegatePrivate.idl"
 #include "IWebURLAuthenticationChallenge.idl"

trunk/WebKit/win/WebCoreSupport/WebDesktopNotificationsDelegate.cpp

@@ -147 +147 @@
 bool WebDesktopNotificationsDelegate::show(Notification* object)
 {
-    notificationDelegate()->showDesktopNotification(NotificationCOMWrapper::create(object));
+    if (hasNotificationDelegate())
+        notificationDelegate()->showDesktopNotification(NotificationCOMWrapper::create(object));
     return true;
 }
@@ -153 +154 @@
 void WebDesktopNotificationsDelegate::cancel(Notification* object)
 {
-    notificationDelegate()->cancelDesktopNotification(NotificationCOMWrapper::create(object));
+    if (hasNotificationDelegate())
+        notificationDelegate()->cancelDesktopNotification(NotificationCOMWrapper::create(object));
 }
 
 void WebDesktopNotificationsDelegate::notificationObjectDestroyed(Notification* object)
 {
-    notificationDelegate()->notificationDestroyed(NotificationCOMWrapper::create(object));
+    if (hasNotificationDelegate())
+        notificationDelegate()->notificationDestroyed(NotificationCOMWrapper::create(object));
 }
 
@@ -164 +167 @@
 {
     BString org(origin->toString());
-    notificationDelegate()->requestNotificationPermission(org);
+    if (hasNotificationDelegate())
+        notificationDelegate()->requestNotificationPermission(org);
 }
 
 NotificationPresenter::Permission WebDesktopNotificationsDelegate::checkPermission(SecurityOrigin* origin)
-{  
-    int out;
+{
+    int out = 0;
     BString org(origin->toString());
-    notificationDelegate()->checkNotificationPermission(org, &out);
+    if (hasNotificationDelegate())
+        notificationDelegate()->checkNotificationPermission(org, &out);
     return (NotificationPresenter::Permission) out;
 }
 
-COMPtr<IWebDesktopNotificationsDelegate> WebDesktopNotificationsDelegate::notificationDelegate()
+bool WebDesktopNotificationsDelegate::hasNotificationDelegate()
 {
     COMPtr<IWebUIDelegate> ui;
     m_webView->uiDelegate(&ui);
-    
+
+    COMPtr<IWebUIDelegate2> ui2;
+    if (SUCCEEDED(ui->QueryInterface(IID_IWebUIDelegate2, &ui2)))
+        return true;
+}
+
+COMPtr<IWebDesktopNotificationsDelegate> WebDesktopNotificationsDelegate::notificationDelegate()
+{
+    COMPtr<IWebUIDelegate> ui;
+    m_webView->uiDelegate(&ui);
+
+    COMPtr<IWebUIDelegate2> ui2;
     COMPtr<IWebDesktopNotificationsDelegate> delegate;
-    ui->desktopNotificationsDelegate(&delegate);
-    
+    if (SUCCEEDED(ui->QueryInterface(IID_IWebUIDelegate2, &ui2)))
+        ui2->desktopNotificationsDelegate(&delegate);
+
     return delegate;
 }

trunk/WebKit/win/WebCoreSupport/WebDesktopNotificationsDelegate.h

@@ -49 +49 @@
 
 private:
+    bool hasNotificationDelegate();
     COMPtr<IWebDesktopNotificationsDelegate> notificationDelegate();
-    
+
     WebView* m_webView;
 };

trunk/WebKitTools/ChangeLog

@@ +1 @@
+2009-08-11  John Gregg  <johnnyg@google.com>
+
+        Reviewed by Maciej Stachowiak.
+
+        Switch DumpRenderTree to contain a WebUIDelegate2, which extends
+        WebUIDelegate, so that the notifications tests will still work.
+        https://bugs.webkit.org/show_bug.cgi?id=28198
+
+        * DumpRenderTree/win/UIDelegate.h:
+
 2009-08-11  Darin Adler  <darin@apple.com>
 

trunk/WebKitTools/DumpRenderTree/win/UIDelegate.h

@@ -38 +38 @@
 class DRTDesktopNotificationPresenter;
 
-class UIDelegate : public IWebUIDelegate, IWebUIDelegatePrivate {
+class UIDelegate : public IWebUIDelegate2, IWebUIDelegatePrivate {
 public:
     UIDelegate();