Title: [129010] trunk/Source
- Revision
- 129010
- Author
- [email protected]
- Date
- 2012-09-19 08:54:15 -0700 (Wed, 19 Sep 2012)
Log Message
[BlackBerry] Add function playerId() in class PageClientBlackBerry
https://bugs.webkit.org/show_bug.cgi?id=97099
Patch by Jonathan Dong <[email protected]> on 2012-09-19
Reviewed by Yong Li.
Source/WebCore:
Added function playerID() in class PageClientBlackBerry.
Internally reviewed by Charles Wei.
No new tests since there's no functional change.
* platform/blackberry/PageClientBlackBerry.h:
Source/WebKit/blackberry:
Implemented PageClientBlackBerry::playerID() in class WebPagePrivate,
and replaced the implementation of FrameLoaderClientBlackBerry::playerId().
Internally reviewed by Charles Wei.
* Api/WebPage.cpp:
(BlackBerry::WebKit::WebPagePrivate::playerID):
(WebKit):
* Api/WebPage_p.h:
(WebPagePrivate):
* WebCoreSupport/FrameLoaderClientBlackBerry.cpp:
(WebCore::FrameLoaderClientBlackBerry::playerId):
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (129009 => 129010)
--- trunk/Source/WebCore/ChangeLog 2012-09-19 15:30:43 UTC (rev 129009)
+++ trunk/Source/WebCore/ChangeLog 2012-09-19 15:54:15 UTC (rev 129010)
@@ -1,3 +1,18 @@
+2012-09-19 Jonathan Dong <[email protected]>
+
+ [BlackBerry] Add function playerId() in class PageClientBlackBerry
+ https://bugs.webkit.org/show_bug.cgi?id=97099
+
+ Reviewed by Yong Li.
+
+ Added function playerID() in class PageClientBlackBerry.
+
+ Internally reviewed by Charles Wei.
+
+ No new tests since there's no functional change.
+
+ * platform/blackberry/PageClientBlackBerry.h:
+
2012-09-19 Raul Hudea <[email protected]>
[CSSRegions][CSSOM] Make sure all Regions APIs are not visible if CSS_REGIONS is not defined
Modified: trunk/Source/WebCore/platform/blackberry/PageClientBlackBerry.h (129009 => 129010)
--- trunk/Source/WebCore/platform/blackberry/PageClientBlackBerry.h 2012-09-19 15:30:43 UTC (rev 129009)
+++ trunk/Source/WebCore/platform/blackberry/PageClientBlackBerry.h 2012-09-19 15:54:15 UTC (rev 129010)
@@ -49,6 +49,7 @@
SaveCredentialYes
};
+ virtual int playerID() const = 0;
virtual void setCursor(WebCore::PlatformCursor) = 0;
virtual BlackBerry::Platform::NetworkStreamFactory* networkStreamFactory() = 0;
virtual BlackBerry::Platform::Graphics::Window* platformWindow() const = 0;
Modified: trunk/Source/WebKit/blackberry/Api/WebPage.cpp (129009 => 129010)
--- trunk/Source/WebKit/blackberry/Api/WebPage.cpp 2012-09-19 15:30:43 UTC (rev 129009)
+++ trunk/Source/WebKit/blackberry/Api/WebPage.cpp 2012-09-19 15:54:15 UTC (rev 129010)
@@ -2058,6 +2058,11 @@
return true; // Needs re-layout!
}
+int WebPagePrivate::playerID() const
+{
+ return m_client ? m_client->getInstanceId() : 0;
+}
+
void WebPagePrivate::setCursor(PlatformCursor handle)
{
if (m_currentCursor.type() != handle.type()) {
Modified: trunk/Source/WebKit/blackberry/Api/WebPage_p.h (129009 => 129010)
--- trunk/Source/WebKit/blackberry/Api/WebPage_p.h 2012-09-19 15:30:43 UTC (rev 129009)
+++ trunk/Source/WebKit/blackberry/Api/WebPage_p.h 2012-09-19 15:54:15 UTC (rev 129010)
@@ -179,6 +179,7 @@
WebCore::IntSize absoluteVisibleOverflowSize() const;
// Virtual functions inherited from PageClientBlackBerry.
+ virtual int playerID() const;
virtual void setCursor(WebCore::PlatformCursor);
virtual Platform::NetworkStreamFactory* networkStreamFactory();
virtual Platform::Graphics::Window* platformWindow() const;
Modified: trunk/Source/WebKit/blackberry/ChangeLog (129009 => 129010)
--- trunk/Source/WebKit/blackberry/ChangeLog 2012-09-19 15:30:43 UTC (rev 129009)
+++ trunk/Source/WebKit/blackberry/ChangeLog 2012-09-19 15:54:15 UTC (rev 129010)
@@ -1,3 +1,23 @@
+2012-09-19 Jonathan Dong <[email protected]>
+
+ [BlackBerry] Add function playerId() in class PageClientBlackBerry
+ https://bugs.webkit.org/show_bug.cgi?id=97099
+
+ Reviewed by Yong Li.
+
+ Implemented PageClientBlackBerry::playerID() in class WebPagePrivate,
+ and replaced the implementation of FrameLoaderClientBlackBerry::playerId().
+
+ Internally reviewed by Charles Wei.
+
+ * Api/WebPage.cpp:
+ (BlackBerry::WebKit::WebPagePrivate::playerID):
+ (WebKit):
+ * Api/WebPage_p.h:
+ (WebPagePrivate):
+ * WebCoreSupport/FrameLoaderClientBlackBerry.cpp:
+ (WebCore::FrameLoaderClientBlackBerry::playerId):
+
2012-09-19 Abbas Sherawala <[email protected]>
[BlackBerry] BackingStorePrivate::resumeScreenAndBackingStoreUpdates more atomic
Modified: trunk/Source/WebKit/blackberry/WebCoreSupport/FrameLoaderClientBlackBerry.cpp (129009 => 129010)
--- trunk/Source/WebKit/blackberry/WebCoreSupport/FrameLoaderClientBlackBerry.cpp 2012-09-19 15:30:43 UTC (rev 129009)
+++ trunk/Source/WebKit/blackberry/WebCoreSupport/FrameLoaderClientBlackBerry.cpp 2012-09-19 15:54:15 UTC (rev 129010)
@@ -118,9 +118,7 @@
int FrameLoaderClientBlackBerry::playerId() const
{
- if (m_webPagePrivate && m_webPagePrivate->m_client)
- return m_webPagePrivate->m_client->getInstanceId();
- return 0;
+ return m_webPagePrivate ? m_webPagePrivate->playerID() : 0;
}
bool FrameLoaderClientBlackBerry::cookiesEnabled() const
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo/webkit-changes
