Changeset 110290 in webkit

Timestamp:

Mar 9, 2012 5:11:28 AM (12 years ago)

Author:

charles.wei@torchmobile.com.cn

Message:

[BlackBerry] Web Notification not working after rebase
​https://bugs.webkit.org/show_bug.cgi?id=80690

Reviewed by George Staikos.

1. NotificationPresenterImpl should be in namespace WebCore
2. Need to connect NotificationPresenterImpl to webcore the new way: WebCore::provideNotification(Page*, NotificationPresenter*)
3. Remove the old way of connecting the Notification: ChromeClientBlackBerry::notificationPresenter()

• Api/WebPage.cpp:

(BlackBerry::WebKit::WebPagePrivate::init):

• WebCoreSupport/ChromeClientBlackBerry.cpp:

(WebCore):

• WebCoreSupport/ChromeClientBlackBerry.h:

(ChromeClientBlackBerry):

• WebCoreSupport/NotificationPresenterImpl.cpp:
• WebCoreSupport/NotificationPresenterImpl.h:

Location:

trunk/Source/WebKit/blackberry

Files:

• Api/WebPage.cpp (modified) (2 diffs)
• ChangeLog (modified) (1 diff)
• WebCoreSupport/ChromeClientBlackBerry.cpp (modified) (2 diffs)
• WebCoreSupport/ChromeClientBlackBerry.h (modified) (1 diff)
• WebCoreSupport/NotificationPresenterImpl.cpp (modified) (1 diff)
• WebCoreSupport/NotificationPresenterImpl.h (modified) (1 diff)

trunk/Source/WebKit/blackberry/Api/WebPage.cpp

@@ -73 +73 @@
 #include "NetworkManager.h"
 #include "NodeRenderStyle.h"
+#if ENABLE(NOTIFICATIONS)
+#include "NotificationPresenterImpl.h"
+#endif
 #include "Page.h"
 #include "PageCache.h"
@@ -428 +431 @@
     pageClients.deviceOrientationClient = new DeviceOrientationClientBlackBerry(this);
     m_page = new Page(pageClients);
+
+#if ENABLE(NOTIFICATIONS)
+    WebCore::provideNotification(m_page, NotificationPresenterImpl::instance());
+#endif
 
 #if ENABLE(CLIENT_BASED_GEOLOCATION) && ENABLE_DRT

trunk/Source/WebKit/blackberry/ChangeLog

@@ +1 @@
+2012-03-09  Charles Wei  <charles.wei@torchmobile.com.cn>
+
+        [BlackBerry] Web Notification not working after rebase
+        https://bugs.webkit.org/show_bug.cgi?id=80690
+
+        Reviewed by George Staikos.
+
+        1. NotificationPresenterImpl should be in namespace WebCore
+        2. Need to connect NotificationPresenterImpl to webcore the new way:
+           WebCore::provideNotification(Page*, NotificationPresenter*)
+        3. Remove the old way of connecting the Notification:
+           ChromeClientBlackBerry::notificationPresenter()
+
+        * Api/WebPage.cpp:
+        (BlackBerry::WebKit::WebPagePrivate::init):
+        * WebCoreSupport/ChromeClientBlackBerry.cpp:
+        (WebCore):
+        * WebCoreSupport/ChromeClientBlackBerry.h:
+        (ChromeClientBlackBerry):
+        * WebCoreSupport/NotificationPresenterImpl.cpp:
+        * WebCoreSupport/NotificationPresenterImpl.h:
+
 2012-03-08  Mike Fenton  <mifenton@rim.com>
 

trunk/Source/WebKit/blackberry/WebCoreSupport/ChromeClientBlackBerry.cpp

@@ -44 +44 @@
 #include "Node.h"
 #include "NotImplemented.h"
-#include "NotificationPresenterImpl.h"
 #include "Page.h"
 #include "PageGroup.h"
@@ -726 +725 @@
 #endif
 
-#if ENABLE(NOTIFICATIONS)
-NotificationPresenter* ChromeClientBlackBerry::notificationPresenter() const
-{
-    return WebKit::NotificationPresenterImpl::instance();
-}
-#endif
-
 #if USE(ACCELERATED_COMPOSITING)
 void ChromeClientBlackBerry::attachRootGraphicsLayer(Frame* frame, GraphicsLayer* graphicsLayer)

trunk/Source/WebKit/blackberry/WebCoreSupport/ChromeClientBlackBerry.h

@@ -129 +129 @@
 #endif
 
-#if ENABLE(NOTIFICATIONS)
-    virtual NotificationPresenter* notificationPresenter() const;
-#endif
-
 #if ENABLE(SVG)
     virtual void didSetSVGZoomAndPan(Frame*, unsigned short zoomAndPan);

trunk/Source/WebKit/blackberry/WebCoreSupport/NotificationPresenterImpl.cpp

@@ -27 +27 @@
 #include <UUID.h>
 
-using namespace WebCore;
 
-namespace WebKit {
+namespace WebCore {
 
 NotificationPresenter* NotificationPresenterImpl::instance()

trunk/Source/WebKit/blackberry/WebCoreSupport/NotificationPresenterImpl.h

@@ -30 +30 @@
 #include <wtf/text/StringHash.h>
 
-namespace WebKit {
+namespace WebCore {
 
 class NotificationPresenterImpl : public WebCore::NotificationPresenter, public BlackBerry::Platform::NotificationAckListener {