Changeset 110701 in webkit

Timestamp:

Mar 14, 2012 8:24:13 AM (12 years ago)

Author:

leo.yang@torchmobile.com.cn

Message:

[BlackBerry] Upstream the BlackBerry change to platform/Cursor.h
​https://bugs.webkit.org/show_bug.cgi?id=81086

Reviewed by Rob Buis.

Source/WebCore:

• platform/Cursor.h:

(WebCore):
(WebCore::Cursor::Cursor):
Add the BlackBerry specific PlatformCursor.

• platform/blackberry/PageClientBlackBerry.h:

There was an alias named PlatformCursorHandle for PlatformCursor
in the internal version of Cursor.h. But it's not necessary so it's
not included in the upstreaming version of Cursor.h. As a result,
use PlatformCursor directly in this file.
(PageClientBlackBerry):

Source/WebKit/blackberry:

There was an alias named PlatformCursorHandle for PlatformCursor
in the internal version of Cursor.h. But it's not necessary so it's
not included in the upstreaming version of Cursor.h. As a result,
use PlatformCursor directly.

• Api/WebPage.cpp:

(BlackBerry::WebKit::WebPagePrivate::setCursor):

• Api/WebPage_p.h:

(WebPagePrivate):

Location:

trunk/Source

Files:

• WebCore/ChangeLog (modified) (1 diff)
• WebCore/platform/Cursor.h (modified) (3 diffs)
• WebCore/platform/blackberry/PageClientBlackBerry.h (modified) (1 diff)
• WebKit/blackberry/Api/WebPage.cpp (modified) (1 diff)
• WebKit/blackberry/Api/WebPage_p.h (modified) (1 diff)
• WebKit/blackberry/ChangeLog (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2012-03-14  Leo Yang  <leo.yang@torchmobile.com.cn>
+
+        [BlackBerry] Upstream the BlackBerry change to platform/Cursor.h
+        https://bugs.webkit.org/show_bug.cgi?id=81086
+
+        Reviewed by Rob Buis.
+
+        * platform/Cursor.h:
+        (WebCore):
+        (WebCore::Cursor::Cursor):
+        Add the BlackBerry specific PlatformCursor.
+        * platform/blackberry/PageClientBlackBerry.h:
+        There was an alias named PlatformCursorHandle for PlatformCursor
+        in the internal version of Cursor.h. But it's not necessary so it's
+        not included in the upstreaming version of Cursor.h. As a result,
+        use PlatformCursor directly in this file.
+        (PageClientBlackBerry):
+
 2012-03-14  Simon Hausmann  <simon.hausmann@nokia.com>
 

trunk/Source/WebCore/platform/Cursor.h

@@ -44 +44 @@
 #elif PLATFORM(CHROMIUM)
 #include "PlatformCursor.h"
+#elif PLATFORM(BLACKBERRY)
+#include <BlackBerryPlatformCursor.h>
 #endif
 
@@ -91 +93 @@
 #elif PLATFORM(CHROMIUM)
     // See PlatformCursor.h
+#elif PLATFORM(BLACKBERRY)
+    typedef BlackBerry::Platform::BlackBerryCursor PlatformCursor;
 #else
     typedef void* PlatformCursor;
@@ -147 +151 @@
 
         Cursor()
-#if !PLATFORM(IOS)
+#if !PLATFORM(IOS) && !PLATFORM(BLACKBERRY)
             : m_platformCursor(0)
 #endif

trunk/Source/WebCore/platform/blackberry/PageClientBlackBerry.h

@@ -40 +40 @@
 class PageClientBlackBerry {
 public:
-    virtual void setCursor(WebCore::PlatformCursorHandle) = 0;
+    virtual void setCursor(WebCore::PlatformCursor) = 0;
     virtual BlackBerry::Platform::NetworkStreamFactory* networkStreamFactory() = 0;
     virtual BlackBerry::Platform::Graphics::Window* platformWindow() const = 0;

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

@@ -1844 +1844 @@
 }
 
-void WebPagePrivate::setCursor(PlatformCursorHandle handle)
+void WebPagePrivate::setCursor(PlatformCursor handle)
 {
     if (m_currentCursor.type() != handle.type()) {

trunk/Source/WebKit/blackberry/Api/WebPage_p.h

@@ -157 +157 @@
 
     // Virtual functions inherited from PageClientBlackBerry.
-    virtual void setCursor(WebCore::PlatformCursorHandle);
+    virtual void setCursor(WebCore::PlatformCursor);
     virtual Platform::NetworkStreamFactory* networkStreamFactory();
     virtual Platform::Graphics::Window* platformWindow() const;

trunk/Source/WebKit/blackberry/ChangeLog

@@ +1 @@
+2012-03-14  Leo Yang  <leo.yang@torchmobile.com.cn>
+
+        [BlackBerry] Upstream the BlackBerry change to platform/Cursor.h
+        https://bugs.webkit.org/show_bug.cgi?id=81086
+
+        Reviewed by Rob Buis.
+
+        There was an alias named PlatformCursorHandle for PlatformCursor
+        in the internal version of Cursor.h. But it's not necessary so it's
+        not included in the upstreaming version of Cursor.h. As a result,
+        use PlatformCursor directly.
+
+        * Api/WebPage.cpp:
+        (BlackBerry::WebKit::WebPagePrivate::setCursor):
+        * Api/WebPage_p.h:
+        (WebPagePrivate):
+
 2012-03-13  Mike Fenton  <mifenton@rim.com>