[BlackBerry] DumpRenderTreeSupport: update the set position methods
authorcommit-queue@webkit.org <commit-queue@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Thu, 28 Feb 2013 09:25:41 +0000 (09:25 +0000)
committercommit-queue@webkit.org <commit-queue@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Thu, 28 Feb 2013 09:25:41 +0000 (09:25 +0000)
https://bugs.webkit.org/show_bug.cgi?id=110578

Patch by Xan Lopez <xlopez@rim.com> on 2013-02-28
Reviewed by Rob Buis.

TestRunner::setMockGeolocationPosition() changed in r130416:
http://trac.webkit.org/changeset/130416/trunk/Tools/DumpRenderTree/TestRunner.h

Source/WebKit/blackberry:

* WebKitSupport/DumpRenderTreeSupport.cpp:
(DumpRenderTreeSupport::setMockGeolocationPosition):
* WebKitSupport/DumpRenderTreeSupport.h:
(DumpRenderTreeSupport):

Tools:

DumpRenderTreeSupport::setMockGeolocationError() was renamed to
setMockGeolocationPositionUnavailableError() in r129444:
http://trac.webkit.org/changeset/129444/trunk/Source/WebKit/blackberry/WebKitSupport/DumpRenderTreeSupport.h

* DumpRenderTree/blackberry/TestRunnerBlackBerry.cpp:
(TestRunner::setMockGeolocationPosition):
(TestRunner::setMockGeolocationPositionUnavailableError):

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@144274 268f45cc-cd09-0410-ab3c-d52691b4dbfc

Source/WebKit/blackberry/ChangeLog
Source/WebKit/blackberry/WebKitSupport/DumpRenderTreeSupport.cpp
Source/WebKit/blackberry/WebKitSupport/DumpRenderTreeSupport.h
Tools/ChangeLog
Tools/DumpRenderTree/blackberry/TestRunnerBlackBerry.cpp

index 89a72ae..a7348c9 100644 (file)
@@ -1,3 +1,18 @@
+2013-02-28  Xan Lopez  <xlopez@rim.com>
+
+        [BlackBerry] DumpRenderTreeSupport: update the set position methods
+        https://bugs.webkit.org/show_bug.cgi?id=110578
+
+        Reviewed by Rob Buis.
+
+        TestRunner::setMockGeolocationPosition() changed in r130416:
+        http://trac.webkit.org/changeset/130416/trunk/Tools/DumpRenderTree/TestRunner.h
+
+        * WebKitSupport/DumpRenderTreeSupport.cpp:
+        (DumpRenderTreeSupport::setMockGeolocationPosition):
+        * WebKitSupport/DumpRenderTreeSupport.h:
+        (DumpRenderTreeSupport):
+
 2013-02-27  Andrew Lo  <anlo@rim.com>
 
         [BlackBerry] Need WebPage API for animating scroll position & zoom changes
index eeb75fd..44b36c8 100644 (file)
@@ -111,10 +111,10 @@ void DumpRenderTreeSupport::setMockGeolocationPermission(WebPage* webPage, bool
     mockClient->setPermission(allowed);
 }
 
-void DumpRenderTreeSupport::setMockGeolocationPosition(WebPage* webPage, double latitude, double longitude, double accuracy)
+void DumpRenderTreeSupport::setMockGeolocationPosition(WebPage* webPage, double latitude, double longitude, double accuracy, bool providesAltitude, double altitude, bool providesAltitudeAccuracy, double altitudeAccuracy, bool providesHeading, double heading, bool providesSpeed, double speed)
 {
     GeolocationClientMock* mockClient = toGeolocationClientMock(GeolocationController::from(corePage(webPage))->client());
-    mockClient->setPosition(GeolocationPosition::create(currentTime(), latitude, longitude, accuracy));
+    mockClient->setPosition(GeolocationPosition::create(currentTime(), latitude, longitude, accuracy, providesAltitude, altitude, providesAltitudeAccuracy, altitudeAccuracy, providesHeading, heading, providesSpeed, speed));
 }
 
 void DumpRenderTreeSupport::scalePageBy(WebPage* webPage, float scaleFactor, float x, float y)
index bbc0455..a30062f 100644 (file)
@@ -55,7 +55,7 @@ public:
     static void resetGeolocationMock(BlackBerry::WebKit::WebPage*);
     static void setMockGeolocationPositionUnavailableError(BlackBerry::WebKit::WebPage*, const WTF::String message);
     static void setMockGeolocationPermission(BlackBerry::WebKit::WebPage*, bool allowed);
-    static void setMockGeolocationPosition(BlackBerry::WebKit::WebPage*, double latitude, double longitude, double accuracy);
+    static void setMockGeolocationPosition(BlackBerry::WebKit::WebPage*, double latitude, double longitude, double accuracy, bool providesAltitude, double altitude, bool providesAltitudeAccuracy, double altitudeAccuracy, bool providesHeading, double heading, bool providesSpeed, double speed);
     static void setMockDeviceOrientation(BlackBerry::WebKit::WebPage*, bool canProvideAlpha, double alpha, bool canProvideBeta, double beta, bool canProvideGamma, double gamma);
     static void scalePageBy(BlackBerry::WebKit::WebPage*, float, float, float);
     static JSValueRef computedStyleIncludingVisitedInfo(JSContextRef, JSValueRef);
index 79ba0d9..6f6bb3d 100644 (file)
@@ -1,5 +1,23 @@
 2013-02-28  Xan Lopez  <xlopez@rim.com>
 
+        [BlackBerry] DumpRenderTreeSupport: update the set position methods
+        https://bugs.webkit.org/show_bug.cgi?id=110578
+
+        Reviewed by Rob Buis.
+
+        TestRunner::setMockGeolocationPosition() changed in r130416:
+        http://trac.webkit.org/changeset/130416/trunk/Tools/DumpRenderTree/TestRunner.h
+
+        DumpRenderTreeSupport::setMockGeolocationError() was renamed to
+        setMockGeolocationPositionUnavailableError() in r129444:
+        http://trac.webkit.org/changeset/129444/trunk/Source/WebKit/blackberry/WebKitSupport/DumpRenderTreeSupport.h
+
+        * DumpRenderTree/blackberry/TestRunnerBlackBerry.cpp:
+        (TestRunner::setMockGeolocationPosition):
+        (TestRunner::setMockGeolocationPositionUnavailableError):
+
+2013-02-28  Xan Lopez  <xlopez@rim.com>
+
         [BlackBerry] WorkQueueItemBlackBerry: use the new FrameLoader API
         https://bugs.webkit.org/show_bug.cgi?id=110465
 
index 7c08aae..af3b3c6 100644 (file)
@@ -375,15 +375,15 @@ void TestRunner::setAlwaysAcceptCookies(bool alwaysAcceptCookies)
     notImplemented();
 }
 
-void TestRunner::setMockGeolocationPosition(double latitude, double longitude, double accuracy)
+void TestRunner::setMockGeolocationPosition(double latitude, double longitude, double accuracy, bool providesAltitude, double altitude, bool providesAltitudeAccuracy, double altitudeAccuracy, bool providesHeading, double heading, bool providesSpeed, double speed)
 {
-    DumpRenderTreeSupport::setMockGeolocationPosition(BlackBerry::WebKit::DumpRenderTree::currentInstance()->page(), latitude, longitude, accuracy);
+    DumpRenderTreeSupport::setMockGeolocationPosition(BlackBerry::WebKit::DumpRenderTree::currentInstance()->page(), latitude, longitude, accuracy, providesAltitude, altitude, providesAltitudeAccuracy, altitudeAccuracy, providesHeading, heading, providesSpeed, speed);
 }
 
-void TestRunner::setMockGeolocationError(int code, JSStringRef message)
+void TestRunner::setMockGeolocationPositionUnavailableError(JSStringRef message)
 {
     String messageStr = jsStringRefToWebCoreString(message);
-    DumpRenderTreeSupport::setMockGeolocationError(BlackBerry::WebKit::DumpRenderTree::currentInstance()->page(), code, messageStr);
+    DumpRenderTreeSupport::setMockGeolocationPositionUnavailableError(BlackBerry::WebKit::DumpRenderTree::currentInstance()->page(), messageStr);
 }
 
 void TestRunner::showWebInspector()