Changeset 106903 in webkit

Timestamp:

Feb 6, 2012, 9:09:11 PM (15 years ago)

Author:

leo.yang@torchmobile.com.cn

Message:

[BlackBerry] Use WebPagePrivate instead of WebPage in GeolocationControllerClientBlackBerry
​https://bugs.webkit.org/show_bug.cgi?id=77927

Reviewed by Antonio Gomes.

WebKit/blackberry/Api/WebPage which has a d pointer is designed for public API.
GeolocationControllerClientBlackBerry in WebKit/blackberry/WebCoreSupport should
use the d pointer directly because the client is internal implementation.

No functionalities changed, no new tests.

• blackberry/WebCoreSupport/GeolocationControllerClientBlackBerry.cpp:

(GeolocationControllerClientBlackBerry::GeolocationControllerClientBlackBerry):
(GeolocationControllerClientBlackBerry::requestPermission):
(GeolocationControllerClientBlackBerry::cancelPermissionRequest):
(GeolocationControllerClientBlackBerry::onLocationUpdate):
(GeolocationControllerClientBlackBerry::onLocationError):

• blackberry/WebCoreSupport/GeolocationControllerClientBlackBerry.h:

(WebKit):
(GeolocationControllerClientBlackBerry):

Location:

trunk/Source/WebKit

Files:

• ChangeLog (modified) (1 diff)
• blackberry/WebCoreSupport/GeolocationControllerClientBlackBerry.cpp (modified) (5 diffs)
• blackberry/WebCoreSupport/GeolocationControllerClientBlackBerry.h (modified) (3 diffs)

trunk/Source/WebKit/ChangeLog

@@ +1 @@
+2012-02-06  Leo Yang  <leo.yang@torchmobile.com.cn>
+
+        [BlackBerry] Use WebPagePrivate instead of WebPage in GeolocationControllerClientBlackBerry
+        https://bugs.webkit.org/show_bug.cgi?id=77927
+
+        Reviewed by Antonio Gomes.
+
+        WebKit/blackberry/Api/WebPage which has a d pointer is designed for public API.
+        GeolocationControllerClientBlackBerry in WebKit/blackberry/WebCoreSupport should
+        use the d pointer directly because the client is internal implementation.
+
+        No functionalities changed, no new tests.
+
+        * blackberry/WebCoreSupport/GeolocationControllerClientBlackBerry.cpp:
+        (GeolocationControllerClientBlackBerry::GeolocationControllerClientBlackBerry):
+        (GeolocationControllerClientBlackBerry::requestPermission):
+        (GeolocationControllerClientBlackBerry::cancelPermissionRequest):
+        (GeolocationControllerClientBlackBerry::onLocationUpdate):
+        (GeolocationControllerClientBlackBerry::onLocationError):
+        * blackberry/WebCoreSupport/GeolocationControllerClientBlackBerry.h:
+        (WebKit):
+        (GeolocationControllerClientBlackBerry):
+
 2012-02-06  Robin Cao  <robin.cao@torchmobile.com.cn>
 

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

@@ -25 +25 @@
 #include "GeolocationError.h"
 #include "Page.h"
-#include "WebPage.h"
 #include "WebPage_p.h"
 
 using namespace WebCore;
 
-GeolocationControllerClientBlackBerry::GeolocationControllerClientBlackBerry(BlackBerry::WebKit::WebPage* webPage)
-    : m_webPage(webPage)
+GeolocationControllerClientBlackBerry::GeolocationControllerClientBlackBerry(BlackBerry::WebKit::WebPagePrivate* webPagePrivate)
+    : m_webPagePrivate(webPagePrivate)
     , m_tracker(0)
     , m_accuracy(false)
@@ -68 +67 @@
     if (!frame)
         return;
-    m_webPage->d->m_page->chrome()->requestGeolocationPermissionForFrame(frame, location);
+    m_webPagePrivate->m_page->chrome()->requestGeolocationPermissionForFrame(frame, location);
 }
 
@@ -76 +75 @@
     if (!frame)
         return;
-    m_webPage->d->m_page->chrome()->cancelGeolocationPermissionRequestForFrame(frame, location);
+    m_webPagePrivate->m_page->chrome()->cancelGeolocationPermissionRequestForFrame(frame, location);
 }
 
@@ -84 +83 @@
     m_lastPosition = GeolocationPosition::create(timestamp, latitude, longitude, accuracy, altitudeValid, altitude, altitudeAccuracyValid,
                                                  altitudeAccuracy, headingValid, heading, speedValid, speed);
-    m_webPage->d->m_page->geolocationController()->positionChanged(m_lastPosition.get());
+    m_webPagePrivate->m_page->geolocationController()->positionChanged(m_lastPosition.get());
 }
 
@@ -90 +89 @@
 {
     RefPtr<GeolocationError> error = GeolocationError::create(GeolocationError::PositionUnavailable, String::fromUTF8(errorStr));
-    m_webPage->d->m_page->geolocationController()->errorOccurred(error.get());
+    m_webPagePrivate->m_page->geolocationController()->errorOccurred(error.get());
 }
 

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

@@ -20 +20 @@
 #define GeolocationControllerClientBlackBerry_h
 
-#include "WebPage.h"
 #include <BlackBerryPlatformGeoTracker.h>
 #include <BlackBerryPlatformGeoTrackerListener.h>
@@ -26 +25 @@
 #include <GeolocationPosition.h>
 
+namespace BlackBerry {
+namespace WebKit {
+class WebPagePrivate;
+}
+}
+
 namespace WebCore {
 
 class GeolocationControllerClientBlackBerry : public GeolocationClient, public BlackBerry::Platform::GeoTrackerListener {
 public:
-    GeolocationControllerClientBlackBerry(BlackBerry::WebKit::WebPage*);
+    GeolocationControllerClientBlackBerry(BlackBerry::WebKit::WebPagePrivate*);
 
     virtual void geolocationDestroyed();
@@ -47 +52 @@
 
 private:
-    BlackBerry::WebKit::WebPage* m_webPage;
+    BlackBerry::WebKit::WebPagePrivate* m_webPagePrivate;
     BlackBerry::Platform::GeoTracker* m_tracker;
     RefPtr<GeolocationPosition> m_lastPosition;