Changeset 129010 in webkit

Timestamp:

Sep 19, 2012 8:54:15 AM (12 years ago)

Author:

commit-queue@webkit.org

Message:

[BlackBerry] Add function playerId() in class PageClientBlackBerry
​https://bugs.webkit.org/show_bug.cgi?id=97099

Patch by Jonathan Dong <Jonathan Dong> 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):

Location:

trunk/Source

Files:

• WebCore/ChangeLog (modified) (1 diff)
• 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)
• WebKit/blackberry/WebCoreSupport/FrameLoaderClientBlackBerry.cpp (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2012-09-19  Jonathan Dong  <jonathan.dong@torchmobile.com.cn>
+
+        [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  <rhudea@adobe.com>
 

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

@@ -50 +50 @@
     };
 
+    virtual int playerID() const = 0;
     virtual void setCursor(WebCore::PlatformCursor) = 0;
     virtual BlackBerry::Platform::NetworkStreamFactory* networkStreamFactory() = 0;

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

@@ -2057 +2057 @@
     m_mainFrame->view()->setFixedLayoutSize(newSize);
     return true; // Needs re-layout!
+}
+
+int WebPagePrivate::playerID() const
+{
+    return m_client ? m_client->getInstanceId() : 0;
 }
 

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

@@ -180 +180 @@
 
     // Virtual functions inherited from PageClientBlackBerry.
+    virtual int playerID() const;
     virtual void setCursor(WebCore::PlatformCursor);
     virtual Platform::NetworkStreamFactory* networkStreamFactory();

trunk/Source/WebKit/blackberry/ChangeLog

@@ +1 @@
+2012-09-19  Jonathan Dong  <jonathan.dong@torchmobile.com.cn>
+
+        [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  <asherawala@rim.com>
 

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

@@ -119 +119 @@
 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;
 }