Attachment 131793 Details for Bug 80482 – Patch

[patch] Patch

bug-80482-20120313233831.patch (text/plain), 22.51 KB, created by Jon Lee on 2012-03-13 23:37:15 PDT

(hide)

Description:

Filename:

MIME Type:

Creator: Jon Lee

Created: 2012-03-13 23:37:15 PDT

Size: 22.51 KB

patch

obsolete

>Subversion Revision: 110663
>diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog
>index 085dbbf115fa7058e26777ed36a02aeb9e5bca2a..cebee342275d9d7e60a34fda28d3c01885147c5e 100644
>--- a/Source/WebCore/ChangeLog
>+++ b/Source/WebCore/ChangeLog
>@@ -1,3 +1,24 @@
>+2012-03-13  Jon Lee  <jonlee@apple.com>
>+
>+        Rename notification properties and functions
>+        https://bugs.webkit.org/show_bug.cgi?id=80482
>+        <rdar://problem/10912432>
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        * notifications/Notification.cpp:
>+        (WebCore::Notification::~Notification): Use close().
>+        (WebCore::Notification::close):
>+        * notifications/Notification.h:
>+        (Notification):
>+        (WebCore::Notification::cancel): Wrap in ENABLE(LEGACY_NOTIFICATIONS), and use close().
>+        (WebCore::Notification::replaceId): Wrap in ENABLE(LEGACY_NOTIFICATIONS), and use tag().
>+        (WebCore::Notification::setReplaceId): Wrap in ENABLE(LEGACY_NOTIFICATIONS), and use setTag().
>+        (WebCore::Notification::tag):
>+        (WebCore::Notification::setTag):
>+        * notifications/Notification.idl: Wrap cancel() and replaceID in ENABLE(LEGACY_NOTIFICATIONS), and
>+        close() and tag in ENABLE(NOTIFICATIONS).
>+
> 2012-03-13  Luke Macpherson   <macpherson@chromium.org>
> 
>         Move opacity clamping into RenderStyle setter.
>diff --git a/Source/WebKit/chromium/ChangeLog b/Source/WebKit/chromium/ChangeLog
>index cff3a976680c2bdd2992d2ea642736c1abd5e1a5..de12b2bb4625ae23e91137cbdced15c0000891a6 100644
>--- a/Source/WebKit/chromium/ChangeLog
>+++ b/Source/WebKit/chromium/ChangeLog
>@@ -1,3 +1,14 @@
>+2012-03-13  Jon Lee  <jonlee@apple.com>
>+
>+        Rename notification properties and functions
>+        https://bugs.webkit.org/show_bug.cgi?id=80482
>+        <rdar://problem/10912432>
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        * src/WebNotification.cpp:
>+        (WebKit::WebNotification::replaceId): Refactor to call tag().
>+
> 2012-03-13  Shawn Singh  <shawnsingh@chromium.org>
> 
>         [chromium] wrong transform causing incorrect culling
>diff --git a/Source/WebKit/mac/ChangeLog b/Source/WebKit/mac/ChangeLog
>index 25e4cd607426f8d8132f533750a2f916e5f04ba5..13a45f06c5ea07913b31f02e802e3ba63403aa0a 100644
>--- a/Source/WebKit/mac/ChangeLog
>+++ b/Source/WebKit/mac/ChangeLog
>@@ -1,3 +1,15 @@
>+2012-03-13  Jon Lee  <jonlee@apple.com>
>+
>+        Rename notification properties and functions
>+        https://bugs.webkit.org/show_bug.cgi?id=80482
>+        <rdar://problem/10912432>
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        * WebView/WebNotification.h: Rename replaceID to tag.
>+        * WebView/WebNotification.mm:
>+        (-[WebNotification tag]):
>+
> 2012-03-13  Adam Barth  <abarth@webkit.org> && Benjamin Poulain  <bpoulain@apple.com>
> 
>         Always enable ENABLE(CLIENT_BASED_GEOLOCATION)
>diff --git a/Source/WebKit/qt/ChangeLog b/Source/WebKit/qt/ChangeLog
>index 64cb65d31e9612afa5cd3906053f0a9bad4da638..3525cc71682d9989e76ab247c62c984aee18b525 100644
>--- a/Source/WebKit/qt/ChangeLog
>+++ b/Source/WebKit/qt/ChangeLog
>@@ -1,3 +1,15 @@
>+2012-03-13  Jon Lee  <jonlee@apple.com>
>+
>+        Rename notification properties and functions
>+        https://bugs.webkit.org/show_bug.cgi?id=80482
>+        <rdar://problem/10912432>
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        * WebCoreSupport/NotificationPresenterClientQt.cpp:
>+        (WebCore::NotificationPresenterClientQt::show): Refactor to call tag().
>+        (WebCore::NotificationPresenterClientQt::removeReplacedNotificationFromQueue): Refactor to call tag().
>+
> 2012-03-13  Benjamin Poulain  <bpoulain@apple.com>
> 
>         Attempt to fix QtMinimal bot after r110595
>diff --git a/Source/WebKit2/ChangeLog b/Source/WebKit2/ChangeLog
>index 1f4b3b08e45c4928d490087b2bf45c59a8d92412..d7658bc8ae96b94957167e0c74d1db41a41c4baa 100644
>--- a/Source/WebKit2/ChangeLog
>+++ b/Source/WebKit2/ChangeLog
>@@ -1,3 +1,33 @@
>+2012-03-13  Jon Lee  <jonlee@apple.com>
>+
>+        Rename notification properties and functions
>+        https://bugs.webkit.org/show_bug.cgi?id=80482
>+        <rdar://problem/10912432>
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        Rename APIs to use tag.
>+        * UIProcess/API/C/WKNotification.cpp:
>+        (WKNotificationCopyTag):
>+        * UIProcess/API/C/WKNotification.h:
>+        * UIProcess/Notifications/WebNotification.cpp:
>+        (WebKit::WebNotification::WebNotification):
>+        * UIProcess/Notifications/WebNotification.h:
>+        (WebKit::WebNotification::create):
>+        (WebKit::WebNotification::tag):
>+        (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-03-13  Anders Carlsson  <andersca@apple.com>
> 
>         Find bouncy doesnât hide when a subframe is scrolled
>diff --git a/Source/WebCore/notifications/Notification.cpp b/Source/WebCore/notifications/Notification.cpp
>index 5de0e527c6a33386558158ae489453bd0a5bf9d6..baa6c31effdc3dfd7dac7a3910d83ac108c30f60 100644
>--- a/Source/WebCore/notifications/Notification.cpp
>+++ b/Source/WebCore/notifications/Notification.cpp
>@@ -96,7 +96,7 @@ Notification::~Notification()
> {
>     if (m_state == Loading) {
>         ASSERT_NOT_REACHED();
>-        cancel();
>+        close();
>     }
> }
> 
>@@ -144,7 +144,7 @@ void Notification::show()
> #endif
> }
> 
>-void Notification::cancel() 
>+void Notification::close()
> {
>     switch (m_state) {
>     case Idle:
>diff --git a/Source/WebCore/notifications/Notification.h b/Source/WebCore/notifications/Notification.h
>index dd0d6ed84ad3079d88ba02a02bcacc6a645cb39d..ac0101cfc172ec59dfff70be21102a43fda60971 100644
>--- a/Source/WebCore/notifications/Notification.h
>+++ b/Source/WebCore/notifications/Notification.h
>@@ -67,7 +67,10 @@ public:
>     virtual ~Notification();
> 
>     void show();
>-    void cancel();
>+#if ENABLE(LEGACY_NOTIFICATIONS)
>+    void cancel() { close(); }
>+#endif
>+    void close();
> 
>     bool isHTML() const { return m_isHTML; }
>     void setHTML(bool isHTML) { m_isHTML = isHTML; }
>@@ -82,9 +85,14 @@ public:
> 
>     String dir() const { return m_direction; }
>     void setDir(const String& dir) { m_direction = dir; }
>-    
>-    String replaceId() const { return m_replaceId; }
>-    void setReplaceId(const String& replaceId) { m_replaceId = replaceId; }
>+
>+#if ENABLE(LEGACY_NOTIFICATIONS)
>+    String replaceId() const { return tag(); }
>+    void setReplaceId(const String& replaceId) { setTag(replaceId); }
>+#endif
>+
>+    String tag() const { return m_tag; }
>+    void setTag(const String& tag) { m_tag = tag; }
> 
>     TextDirection direction() const { return dir() == "rtl" ? RTL : LTR; }
> 
>@@ -143,7 +151,7 @@ private:
>     NotificationContents m_contents;
> 
>     String m_direction;
>-    String m_replaceId;
>+    String m_tag;
> 
>     enum NotificationState {
>         Idle = 0,
>diff --git a/Source/WebCore/notifications/Notification.idl b/Source/WebCore/notifications/Notification.idl
>index d8cb3cc39a25e71743e9f75e9e8cf4c180e22168..4c0166cf3c14618f84204933d23fa3b2b3cfadc8 100644
>--- a/Source/WebCore/notifications/Notification.idl
>+++ b/Source/WebCore/notifications/Notification.idl
>@@ -38,7 +38,12 @@ module threads {
>         OmitConstructor
>     ] Notification {
>         void show();
>+#if defined(ENABLE_LEGACY_NOTIFICATIONS) && ENABLE_LEGACY_NOTIFICATIONS
>         void cancel();
>+#endif
>+#if defined(ENABLE_NOTIFICATIONS) && ENABLE_NOTIFICATIONS
>+        void close();
>+#endif
> 
>         attribute EventListener onshow;
>         // FIXME: The latest Web Notifications standard uses the onshow event listener.
>@@ -49,7 +54,12 @@ module threads {
>         attribute EventListener onclick;
> 
>         attribute DOMString dir;
>+#if defined(ENABLE_LEGACY_NOTIFICATIONS) && ENABLE_LEGACY_NOTIFICATIONS
>         attribute DOMString replaceId;
>+#endif
>+#if defined(ENABLE_NOTIFICATIONS) && ENABLE_NOTIFICATIONS
>+        attribute DOMString tag;
>+#endif
> 
>         // EventTarget interface
>         void addEventListener(in DOMString type, 
>diff --git a/Source/WebKit/chromium/src/WebNotification.cpp b/Source/WebKit/chromium/src/WebNotification.cpp
>index 849dc4f674a41af10faf9d2882a2608980f10f9a..4e7156db836ce3ef9def9ec408e42b6bcc60c143 100644
>--- a/Source/WebKit/chromium/src/WebNotification.cpp
>+++ b/Source/WebKit/chromium/src/WebNotification.cpp
>@@ -106,7 +106,7 @@ WebTextDirection WebNotification::direction() const
> 
> WebString WebNotification::replaceId() const
> {
>-    return m_private->replaceId();
>+    return m_private->tag();
> }
> 
> void WebNotification::detachPresenter()
>diff --git a/Source/WebKit/mac/WebView/WebNotification.h b/Source/WebKit/mac/WebView/WebNotification.h
>index 8ecc1068674ec498316d63642313b09e0b1246a1..fb9c50e5d3a7d2b4c395ef463003573ac2ecf124 100644
>--- a/Source/WebKit/mac/WebView/WebNotification.h
>+++ b/Source/WebKit/mac/WebView/WebNotification.h
>@@ -36,7 +36,7 @@
> 
> - (NSString *)title;
> - (NSString *)body;
>-- (NSString *)replaceID;
>+- (NSString *)tag;
> - (WebSecurityOrigin *)origin;
> - (uint64_t)notificationID;
> 
>diff --git a/Source/WebKit/mac/WebView/WebNotification.mm b/Source/WebKit/mac/WebView/WebNotification.mm
>index 557332cba1b08299c334e1a25268643d6014ee06..88fd9ef816d36c0dc435d72ec3fec0fe72065682 100644
>--- a/Source/WebKit/mac/WebView/WebNotification.mm
>+++ b/Source/WebKit/mac/WebView/WebNotification.mm
>@@ -101,11 +101,11 @@ Notification* core(WebNotification *notification)
> #endif
> }
> 
>-- (NSString *)replaceID
>+- (NSString *)tag
> {
> #if ENABLE(NOTIFICATIONS)
>     ASSERT(core(self));
>-    return core(self)->replaceId();
>+    return core(self)->tag();
> #else
>     return nil;
> #endif
>diff --git a/Source/WebKit/qt/WebCoreSupport/NotificationPresenterClientQt.cpp b/Source/WebKit/qt/WebCoreSupport/NotificationPresenterClientQt.cpp
>index 00052184a9ff871510e3d801e1da0a87ac9ade63..2ca5e8ef82eed7998743bcd7957c9428bd892ba4 100644
>--- a/Source/WebKit/qt/WebCoreSupport/NotificationPresenterClientQt.cpp
>+++ b/Source/WebKit/qt/WebCoreSupport/NotificationPresenterClientQt.cpp
>@@ -175,7 +175,7 @@ bool NotificationPresenterClientQt::show(Notification* notification)
>     if (notification->scriptExecutionContext()->isWorkerContext())
>         return false;
>     notification->setPendingActivity(notification);
>-    if (!notification->replaceId().isEmpty())
>+    if (!notification->tag().isEmpty())
>         removeReplacedNotificationFromQueue(notification);
>     if (dumpNotification)
>         dumpShowText(notification);
>@@ -398,7 +398,7 @@ void NotificationPresenterClientQt::removeReplacedNotificationFromQueue(Notifica
> 
>     while (iter != end) {
>         Notification* existingNotification = iter.key();
>-        if (existingNotification->replaceId() == notification->replaceId() && existingNotification->url().protocol() == notification->url().protocol() && existingNotification->url().host() == notification->url().host()) {
>+        if (existingNotification->tag() == notification->tag() && existingNotification->url().protocol() == notification->url().protocol() && existingNotification->url().host() == notification->url().host()) {
>             oldNotification = iter.key();
>             break;
>         }
>diff --git a/Source/WebKit2/UIProcess/API/C/WKNotification.cpp b/Source/WebKit2/UIProcess/API/C/WKNotification.cpp
>index 5dfcbba29fb33d8303522e13f04a84b0006a1951..26700e1aae16cdf91920a7473e9a3778234421d5 100644
>--- a/Source/WebKit2/UIProcess/API/C/WKNotification.cpp
>+++ b/Source/WebKit2/UIProcess/API/C/WKNotification.cpp
>@@ -52,9 +52,9 @@ WKStringRef WKNotificationCopyIconURL(WKNotificationRef notification)
>     return toCopiedAPI(toImpl(notification)->iconURL());
> }
> 
>-WKStringRef WKNotificationCopyReplaceID(WKNotificationRef notification)
>+WKStringRef WKNotificationCopyTag(WKNotificationRef notification)
> {
>-    return toCopiedAPI(toImpl(notification)->replaceID());
>+    return toCopiedAPI(toImpl(notification)->tag());
> }
> 
> WKSecurityOriginRef WKNotificationGetSecurityOrigin(WKNotificationRef notification)
>diff --git a/Source/WebKit2/UIProcess/API/C/WKNotification.h b/Source/WebKit2/UIProcess/API/C/WKNotification.h
>index 11ea9727537e03deb380aaafb9882cf2b61dded3..3f4b1a90064142453121bdc638c6b7496219da5f 100644
>--- a/Source/WebKit2/UIProcess/API/C/WKNotification.h
>+++ b/Source/WebKit2/UIProcess/API/C/WKNotification.h
>@@ -37,7 +37,7 @@ WK_EXPORT WKTypeID WKNotificationGetTypeID();
> WK_EXPORT WKStringRef WKNotificationCopyTitle(WKNotificationRef notification);
> WK_EXPORT WKStringRef WKNotificationCopyBody(WKNotificationRef notification);
> WK_EXPORT WKStringRef WKNotificationCopyIconURL(WKNotificationRef notification);
>-WK_EXPORT WKStringRef WKNotificationCopyReplaceID(WKNotificationRef notification);
>+WK_EXPORT WKStringRef WKNotificationCopyTag(WKNotificationRef notification);
> WK_EXPORT WKSecurityOriginRef WKNotificationGetSecurityOrigin(WKNotificationRef notification);
> WK_EXPORT uint64_t WKNotificationGetID(WKNotificationRef notification);
> 
>diff --git a/Source/WebKit2/UIProcess/Notifications/WebNotification.cpp b/Source/WebKit2/UIProcess/Notifications/WebNotification.cpp
>index 99ba0ede1b099d9d91d63e29af8c45907dea1401..fb8ddb0a68121d7ff7db244a796bab42506c39d6 100644
>--- a/Source/WebKit2/UIProcess/Notifications/WebNotification.cpp
>+++ b/Source/WebKit2/UIProcess/Notifications/WebNotification.cpp
>@@ -33,11 +33,11 @@
> 
> namespace WebKit {
> 
>-WebNotification::WebNotification(const String& title, const String& body, const String& iconURL, const String& replaceID, const String& originString, uint64_t notificationID)
>+WebNotification::WebNotification(const String& title, const String& body, const String& iconURL, const String& tag, const String& originString, uint64_t notificationID)
>     : m_title(title)
>     , m_body(body)
>     , m_iconURL(iconURL)
>-    , m_replaceID(replaceID)
>+    , m_tag(tag)
>     , m_origin(WebSecurityOrigin::createFromString(originString))
>     , m_notificationID(notificationID)
> {
>diff --git a/Source/WebKit2/UIProcess/Notifications/WebNotification.h b/Source/WebKit2/UIProcess/Notifications/WebNotification.h
>index 19bda4050d077ad377d2c4ce130683f9cc1df210..3355aab7e92212af32b4dd8ab0221816ffdb5e9e 100644
>--- a/Source/WebKit2/UIProcess/Notifications/WebNotification.h
>+++ b/Source/WebKit2/UIProcess/Notifications/WebNotification.h
>@@ -45,28 +45,28 @@ class WebNotification : public APIObject {
> public:
>     static const Type APIType = TypeNotification;
>     
>-    static PassRefPtr<WebNotification> create(const String& title, const String& body, const String& iconURL, const String& replaceID, const String& originString, uint64_t notificationID)
>+    static PassRefPtr<WebNotification> create(const String& title, const String& body, const String& iconURL, const String& tag, const String& originString, uint64_t notificationID)
>     {
>-        return adoptRef(new WebNotification(title, body, iconURL, replaceID, originString, notificationID));
>+        return adoptRef(new WebNotification(title, body, iconURL, tag, originString, notificationID));
>     }
>     
>     const String& title() const { return m_title; }
>     const String& body() const { return m_body; }
>     const String& iconURL() const { return m_iconURL; }
>-    const String& replaceID() const { return m_replaceID; }
>+    const String& tag() const { return m_tag; }
>     WebSecurityOrigin* origin() const { return m_origin.get(); }
>     
>     uint64_t notificationID() const { return m_notificationID; }
> 
> private:
>-    WebNotification(const String& title, const String& body, const String& iconURL, const String& replaceID, const String& originString, uint64_t notificationID);
>+    WebNotification(const String& title, const String& body, const String& iconURL, const String& tag, const String& originString, uint64_t notificationID);
> 
>     virtual Type type() const { return APIType; }
>     
>     String m_title;
>     String m_body;
>     String m_iconURL;
>-    String m_replaceID;
>+    String m_tag;
>     RefPtr<WebSecurityOrigin> m_origin;
>     uint64_t m_notificationID;
> };
>diff --git a/Source/WebKit2/UIProcess/Notifications/WebNotificationManagerProxy.cpp b/Source/WebKit2/UIProcess/Notifications/WebNotificationManagerProxy.cpp
>index 27a889e2624ed3a6e48a92382c10b2b6dec19a5e..7d4f8c3fca0440f88a4ef774f328df08edc984ee 100644
>--- a/Source/WebKit2/UIProcess/Notifications/WebNotificationManagerProxy.cpp
>+++ b/Source/WebKit2/UIProcess/Notifications/WebNotificationManagerProxy.cpp
>@@ -77,12 +77,12 @@ void WebNotificationManagerProxy::didReceiveMessage(CoreIPC::Connection* connect
>     didReceiveWebNotificationManagerProxyMessage(connection, messageID, arguments);
> }
> 
>-void WebNotificationManagerProxy::show(WebPageProxy* page, const String& title, const String& body, const String& iconURL, const String& replaceID, const String& originString, uint64_t notificationID)
>+void WebNotificationManagerProxy::show(WebPageProxy* page, const String& title, const String& body, const String& iconURL, const String& tag, const String& originString, uint64_t notificationID)
> {
>     if (!isNotificationIDValid(notificationID))
>         return;
>     
>-    RefPtr<WebNotification> notification = WebNotification::create(title, body, iconURL, replaceID, originString, notificationID);
>+    RefPtr<WebNotification> notification = WebNotification::create(title, body, iconURL, tag, originString, notificationID);
>     m_notifications.set(notificationID, notification);
>     m_provider.show(page, notification.get());
> }
>diff --git a/Source/WebKit2/UIProcess/Notifications/WebNotificationManagerProxy.h b/Source/WebKit2/UIProcess/Notifications/WebNotificationManagerProxy.h
>index edfccc1797da129aae0684a36a2b1ccb2e560123..e028d6b93a0152fbd85e074b98d4a4c9e413c393 100644
>--- a/Source/WebKit2/UIProcess/Notifications/WebNotificationManagerProxy.h
>+++ b/Source/WebKit2/UIProcess/Notifications/WebNotificationManagerProxy.h
>@@ -60,7 +60,7 @@ public:
>     void initializeProvider(const WKNotificationProvider*);
>     void populateCopyOfNotificationPermissions(HashMap<String, bool>&);
> 
>-    void show(WebPageProxy*, const String& title, const String& body, const String& iconURL, const String& replaceID, const String& originString, uint64_t notificationID);
>+    void show(WebPageProxy*, const String& title, const String& body, const String& iconURL, const String& tag, const String& originString, uint64_t notificationID);
> 
>     void providerDidShowNotification(uint64_t notificationID);
>     void providerDidClickNotification(uint64_t notificationID);
>diff --git a/Source/WebKit2/UIProcess/WebPageProxy.cpp b/Source/WebKit2/UIProcess/WebPageProxy.cpp
>index e8bbcaf1d9751656a5e0c5d0d737e6a39301e645..d5677a70405c6343590a26f057efc092b3c9d109 100644
>--- a/Source/WebKit2/UIProcess/WebPageProxy.cpp
>+++ b/Source/WebKit2/UIProcess/WebPageProxy.cpp
>@@ -3449,9 +3449,9 @@ void WebPageProxy::requestNotificationPermission(uint64_t requestID, const Strin
>         request->deny();
> }
> 
>-void WebPageProxy::showNotification(const String& title, const String& body, const String& iconURL, const String& replaceID, const String& originString, uint64_t notificationID)
>+void WebPageProxy::showNotification(const String& title, const String& body, const String& iconURL, const String& tag, const String& originString, uint64_t notificationID)
> {
>-    m_process->context()->notificationManagerProxy()->show(this, title, body, iconURL, replaceID, originString, notificationID);
>+    m_process->context()->notificationManagerProxy()->show(this, title, body, iconURL, tag, originString, notificationID);
> }
> 
> float WebPageProxy::headerHeight(WebFrameProxy* frame)
>diff --git a/Source/WebKit2/UIProcess/WebPageProxy.h b/Source/WebKit2/UIProcess/WebPageProxy.h
>index ee233d23f7318035e1ac4c2a38317eb4f7a8e773..5d4577f0c2a7e61a71ce78d0e7ba895e2cccc795 100644
>--- a/Source/WebKit2/UIProcess/WebPageProxy.h
>+++ b/Source/WebKit2/UIProcess/WebPageProxy.h
>@@ -737,7 +737,7 @@ private:
>     void reattachToWebProcessWithItem(WebBackForwardListItem*);
> 
>     void requestNotificationPermission(uint64_t notificationID, const String& originString);
>-    void showNotification(const String& title, const String& body, const String& iconURL, const String& replaceID, const String& originString, uint64_t notificationID);
>+    void showNotification(const String& title, const String& body, const String& iconURL, const String& tag, const String& originString, uint64_t notificationID);
>     
> #if USE(TILED_BACKING_STORE)
>     void pageDidRequestScroll(const WebCore::IntPoint&);
>diff --git a/Source/WebKit2/UIProcess/WebPageProxy.messages.in b/Source/WebKit2/UIProcess/WebPageProxy.messages.in
>index 64432d24cab87753c9413b9b6c2cb3ee516eb56f..97cf127468873c4461669b80f029316eda98d84e 100644
>--- a/Source/WebKit2/UIProcess/WebPageProxy.messages.in
>+++ b/Source/WebKit2/UIProcess/WebPageProxy.messages.in
>@@ -208,7 +208,7 @@ messages -> WebPageProxy {
>     
>     # Notification messages
>     RequestNotificationPermission(uint64_t requestID, WTF::String originIdentifier)
>-    ShowNotification(WTF::String title, WTF::String body, WTF::String iconURL, WTF::String replaceID, WTF::String originIdentifier, uint64_t notificationID)
>+    ShowNotification(WTF::String title, WTF::String body, WTF::String iconURL, WTF::String tag, WTF::String originIdentifier, uint64_t notificationID)
> 
>     # Spelling and grammar messages
> #if USE(UNIFIED_TEXT_CHECKING)  
>diff --git a/Source/WebKit2/WebProcess/Notifications/WebNotificationManager.cpp b/Source/WebKit2/WebProcess/Notifications/WebNotificationManager.cpp
>index 9e5cf9546649d4bcbb39f13b51e52d326e79a4e7..fca30be878f7a06f435c1b784c234ae53dcf9657 100644
>--- a/Source/WebKit2/WebProcess/Notifications/WebNotificationManager.cpp
>+++ b/Source/WebKit2/WebProcess/Notifications/WebNotificationManager.cpp
>@@ -117,7 +117,7 @@ bool WebNotificationManager::show(Notification* notification, WebPage* page)
>     NotificationContextMap::iterator it = m_notificationContextMap.add(notification->scriptExecutionContext(), Vector<uint64_t>()).first;
>     it->second.append(notificationID);
>     
>-    m_process->connection()->send(Messages::WebPageProxy::ShowNotification(notification->contents().title, notification->contents().body, notification->iconURL().string(), notification->replaceId(), notification->scriptExecutionContext()->securityOrigin()->toString(), notificationID), page->pageID());
>+    m_process->connection()->send(Messages::WebPageProxy::ShowNotification(notification->contents().title, notification->contents().body, notification->iconURL().string(), notification->tag(), notification->scriptExecutionContext()->securityOrigin()->toString(), notificationID), page->pageID());
>     return true;
> #else
>     return false;

Actions: View | Formatted Diff | Diff

Attachments on bug 80482: 130724 | 130729 | 130900 | 131792 | 131793 | 135015