Changeset 107068 in webkit

Timestamp:

Feb 8, 2012 4:13:50 AM (12 years ago)

Author:

yael.aharon@nokia.com

Message:

[WK2] Text notifications should have an iconURL
​https://bugs.webkit.org/show_bug.cgi?id=77968

Reviewed by Simon Hausmann.

Per ​http://www.w3.org/TR/notifications simple text notifications should have an iconURL.
Add an iconURL to WebNotification and add a public API to access it.

• UIProcess/API/C/WKNotification.cpp:

(WKNotificationCopyiconURL):

• UIProcess/API/C/WKNotification.h:
• UIProcess/Notifications/WebNotification.cpp:

(WebKit::WebNotification::WebNotification):

• UIProcess/Notifications/WebNotification.h:

(WebKit::WebNotification::create):
(WebKit::WebNotification::iconURL):
(WebNotification):

• UIProcess/Notifications/WebNotificationManagerProxy.cpp:

(WebKit::WebNotificationManagerProxy::show):

• UIProcess/Notifications/WebNotificationManagerProxy.h:

(WebNotificationManagerProxy):

• UIProcess/WebPageProxy.cpp:

(WebKit::WebPageProxy::showNotification):

• UIProcess/WebPageProxy.h:

(WebPageProxy):

• UIProcess/WebPageProxy.messages.in:
• WebProcess/Notifications/WebNotificationManager.cpp:

(WebKit::WebNotificationManager::show):

Location:

trunk/Source/WebKit2

Files:

• ChangeLog (modified) (1 diff)
• UIProcess/API/C/WKNotification.cpp (modified) (1 diff)
• UIProcess/API/C/WKNotification.h (modified) (1 diff)
• UIProcess/Notifications/WebNotification.cpp (modified) (1 diff)
• UIProcess/Notifications/WebNotification.h (modified) (3 diffs)
• UIProcess/Notifications/WebNotificationManagerProxy.cpp (modified) (1 diff)
• UIProcess/Notifications/WebNotificationManagerProxy.h (modified) (1 diff)
• UIProcess/WebPageProxy.cpp (modified) (1 diff)
• UIProcess/WebPageProxy.h (modified) (1 diff)
• UIProcess/WebPageProxy.messages.in (modified) (1 diff)
• WebProcess/Notifications/WebNotificationManager.cpp (modified) (1 diff)

trunk/Source/WebKit2/ChangeLog

@@ +1 @@
+2012-02-08  Yael Aharon  <yael.aharon@nokia.com>
+
+        [WK2] Text notifications should have an iconURL
+        https://bugs.webkit.org/show_bug.cgi?id=77968
+
+        Reviewed by Simon Hausmann.
+        
+        Per http://www.w3.org/TR/notifications simple text notifications should have an iconURL.
+        Add an iconURL to WebNotification and add a public API to access it.
+       
+        * UIProcess/API/C/WKNotification.cpp:
+        (WKNotificationCopyiconURL):
+        * UIProcess/API/C/WKNotification.h:
+        * UIProcess/Notifications/WebNotification.cpp:
+        (WebKit::WebNotification::WebNotification):
+        * UIProcess/Notifications/WebNotification.h:
+        (WebKit::WebNotification::create):
+        (WebKit::WebNotification::iconURL):
+        (WebNotification):
+        * UIProcess/Notifications/WebNotificationManagerProxy.cpp:
+        (WebKit::WebNotificationManagerProxy::show):
+        * UIProcess/Notifications/WebNotificationManagerProxy.h:
+        (WebNotificationManagerProxy):
+        * UIProcess/WebPageProxy.cpp:
+        (WebKit::WebPageProxy::showNotification):
+        * UIProcess/WebPageProxy.h:
+        (WebPageProxy):
+        * UIProcess/WebPageProxy.messages.in:
+        * WebProcess/Notifications/WebNotificationManager.cpp:
+        (WebKit::WebNotificationManager::show):
+
 2012-02-08  Philippe Normand  <pnormand@igalia.com>
 

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

@@ -48 +48 @@
 }
 
+WKStringRef WKNotificationCopyIconURL(WKNotificationRef notification)
+{
+    return toCopiedAPI(toImpl(notification)->iconURL());
+}
+
 WKSecurityOriginRef WKNotificationGetSecurityOrigin(WKNotificationRef notification)
 {

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

@@ -37 +37 @@
 WK_EXPORT WKStringRef WKNotificationCopyTitle(WKNotificationRef notification);
 WK_EXPORT WKStringRef WKNotificationCopyBody(WKNotificationRef notification);
+WK_EXPORT WKStringRef WKNotificationCopyIconURL(WKNotificationRef notification);
 WK_EXPORT WKSecurityOriginRef WKNotificationGetSecurityOrigin(WKNotificationRef notification);
 WK_EXPORT uint64_t WKNotificationGetID(WKNotificationRef notification);

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

@@ -34 +34 @@
 namespace WebKit {
 
-WebNotification::WebNotification(const String& title, const String& body, const String& originString, uint64_t notificationID)
+WebNotification::WebNotification(const String& title, const String& body, const String& iconURL, const String& originString, uint64_t notificationID)
     : m_title(title)
     , m_body(body)
+    , m_iconURL(iconURL)
     , m_origin(WebSecurityOrigin::createFromString(originString))
     , m_notificationID(notificationID)

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

@@ -46 +46 @@
     static const Type APIType = TypeNotification;
     
-    static PassRefPtr<WebNotification> create(const String& title, const String& body, const String& originString, uint64_t notificationID)
+    static PassRefPtr<WebNotification> create(const String& title, const String& body, const String& iconURL, const String& originString, uint64_t notificationID)
     {
-        return adoptRef(new WebNotification(title, body, originString, notificationID));
+        return adoptRef(new WebNotification(title, body, iconURL, originString, notificationID));
     }
     
     const String& title() const { return m_title; }
     const String& body() const { return m_body; }
+    const String& iconURL() const { return m_iconURL; }
     WebSecurityOrigin* origin() const { return m_origin.get(); }
     
@@ -58 +59 @@
 
 private:
-    WebNotification(const String& title, const String& body, const String& originString, uint64_t notificationID);
+    WebNotification(const String& title, const String& body, const String& iconURL, const String& originString, uint64_t notificationID);
 
     virtual Type type() const { return APIType; }
@@ -64 +65 @@
     String m_title;
     String m_body;
+    String m_iconURL;
     RefPtr<WebSecurityOrigin> m_origin;
     uint64_t m_notificationID;

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

@@ -78 +78 @@
 }
 
-void WebNotificationManagerProxy::show(WebPageProxy* page, const String& title, const String& body, const String& originString, uint64_t notificationID)
+void WebNotificationManagerProxy::show(WebPageProxy* page, const String& title, const String& body, const String& iconURL, const String& originString, uint64_t notificationID)
 {
     if (!isNotificationIDValid(notificationID))
         return;
     
-    RefPtr<WebNotification> notification = WebNotification::create(title, body, originString, notificationID);
+    RefPtr<WebNotification> notification = WebNotification::create(title, body, iconURL, originString, notificationID);
     m_notifications.set(notificationID, notification);
     m_provider.show(page, notification.get());

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

@@ -61 +61 @@
     void populateCopyOfNotificationPermissions(HashMap<String, bool>&);
 
-    void show(WebPageProxy*, const String& title, const String& body, const String& originString, uint64_t notificationID);
+    void show(WebPageProxy*, const String& title, const String& body, const String& iconURL, const String& originString, uint64_t notificationID);
 
     void providerDidShowNotification(uint64_t notificationID);

trunk/Source/WebKit2/UIProcess/WebPageProxy.cpp

@@ -3378 +3378 @@
 }
 
-void WebPageProxy::showNotification(const String& title, const String& body, const String& originString, uint64_t notificationID)
-{
-    m_process->context()->notificationManagerProxy()->show(this, title, body, originString, notificationID);
+void WebPageProxy::showNotification(const String& title, const String& body, const String& iconURL, const String& originString, uint64_t notificationID)
+{
+    m_process->context()->notificationManagerProxy()->show(this, title, body, iconURL, originString, notificationID);
 }
 

trunk/Source/WebKit2/UIProcess/WebPageProxy.h

@@ -726 +726 @@
 
     void requestNotificationPermission(uint64_t notificationID, const String& originString);
-    void showNotification(const String& title, const String& body, const String& originString, uint64_t notificationID);
+    void showNotification(const String& title, const String& body, const String& iconURL, const String& originString, uint64_t notificationID);
     
 #if USE(TILED_BACKING_STORE)

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

@@ -207 +207 @@
     # Notification messages
     RequestNotificationPermission(uint64_t requestID, WTF::String originIdentifier)
-    ShowNotification(WTF::String title, WTF::String body, WTF::String originIdentifier, uint64_t notificationID)
+    ShowNotification(WTF::String title, WTF::String body, WTF::String iconURL, WTF::String originIdentifier, uint64_t notificationID)
 
     # Spelling and grammar messages

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

@@ -122 +122 @@
     it->second.append(notificationID);
     
-    m_process->connection()->send(Messages::WebPageProxy::ShowNotification(notification->contents().title, notification->contents().body, notification->scriptExecutionContext()->securityOrigin()->toString(), notificationID), page->pageID());
+    m_process->connection()->send(Messages::WebPageProxy::ShowNotification(notification->contents().title, notification->contents().body, notification->iconURL().string(), notification->scriptExecutionContext()->securityOrigin()->toString(), notificationID), page->pageID());
     return true;
 #else