Title: [110701] trunk/Source
- Revision
- 110701
- Author
- [email protected]
- Date
- 2012-03-14 08:24:13 -0700 (Wed, 14 Mar 2012)
Log 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):
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (110700 => 110701)
--- trunk/Source/WebCore/ChangeLog 2012-03-14 15:15:34 UTC (rev 110700)
+++ trunk/Source/WebCore/ChangeLog 2012-03-14 15:24:13 UTC (rev 110701)
@@ -1,3 +1,21 @@
+2012-03-14 Leo Yang <[email protected]>
+
+ [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 <[email protected]>
[Qt] RunLoopQt is missing reentrancy guards
Modified: trunk/Source/WebCore/platform/Cursor.h (110700 => 110701)
--- trunk/Source/WebCore/platform/Cursor.h 2012-03-14 15:15:34 UTC (rev 110700)
+++ trunk/Source/WebCore/platform/Cursor.h 2012-03-14 15:24:13 UTC (rev 110701)
@@ -43,6 +43,8 @@
#include <QCursor>
#elif PLATFORM(CHROMIUM)
#include "PlatformCursor.h"
+#elif PLATFORM(BLACKBERRY)
+#include <BlackBerryPlatformCursor.h>
#endif
#if PLATFORM(MAC) && !PLATFORM(IOS)
@@ -90,6 +92,8 @@
typedef wxCursor* PlatformCursor;
#elif PLATFORM(CHROMIUM)
// See PlatformCursor.h
+#elif PLATFORM(BLACKBERRY)
+ typedef BlackBerry::Platform::BlackBerryCursor PlatformCursor;
#else
typedef void* PlatformCursor;
#endif
@@ -146,7 +150,7 @@
static const Cursor& fromType(Cursor::Type);
Cursor()
-#if !PLATFORM(IOS)
+#if !PLATFORM(IOS) && !PLATFORM(BLACKBERRY)
: m_platformCursor(0)
#endif
{
Modified: trunk/Source/WebCore/platform/blackberry/PageClientBlackBerry.h (110700 => 110701)
--- trunk/Source/WebCore/platform/blackberry/PageClientBlackBerry.h 2012-03-14 15:15:34 UTC (rev 110700)
+++ trunk/Source/WebCore/platform/blackberry/PageClientBlackBerry.h 2012-03-14 15:24:13 UTC (rev 110701)
@@ -39,7 +39,7 @@
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;
virtual void setPreventsScreenDimming(bool) = 0;
Modified: trunk/Source/WebKit/blackberry/Api/WebPage.cpp (110700 => 110701)
--- trunk/Source/WebKit/blackberry/Api/WebPage.cpp 2012-03-14 15:15:34 UTC (rev 110700)
+++ trunk/Source/WebKit/blackberry/Api/WebPage.cpp 2012-03-14 15:24:13 UTC (rev 110701)
@@ -1843,7 +1843,7 @@
return true; // Needs re-layout!
}
-void WebPagePrivate::setCursor(PlatformCursorHandle handle)
+void WebPagePrivate::setCursor(PlatformCursor handle)
{
if (m_currentCursor.type() != handle.type()) {
m_currentCursor = handle;
Modified: trunk/Source/WebKit/blackberry/Api/WebPage_p.h (110700 => 110701)
--- trunk/Source/WebKit/blackberry/Api/WebPage_p.h 2012-03-14 15:15:34 UTC (rev 110700)
+++ trunk/Source/WebKit/blackberry/Api/WebPage_p.h 2012-03-14 15:24:13 UTC (rev 110701)
@@ -156,7 +156,7 @@
WebCore::IntSize absoluteVisibleOverflowSize() const;
// 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;
virtual void setPreventsScreenDimming(bool preventDimming);
Modified: trunk/Source/WebKit/blackberry/ChangeLog (110700 => 110701)
--- trunk/Source/WebKit/blackberry/ChangeLog 2012-03-14 15:15:34 UTC (rev 110700)
+++ trunk/Source/WebKit/blackberry/ChangeLog 2012-03-14 15:24:13 UTC (rev 110701)
@@ -1,3 +1,20 @@
+2012-03-14 Leo Yang <[email protected]>
+
+ [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 <[email protected]>
[BlackBerry] Input focus state should unfocus the frame selection instead of the field.
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
