Changeset 139875 in webkit

Timestamp:

Jan 16, 2013 5:50:31 AM (11 years ago)

Author:

commit-queue@webkit.org

Message:

[chromium] move setMockDeviceOrientation to TestRunner library
​https://bugs.webkit.org/show_bug.cgi?id=106895

Patch by Dan Carney <​dcarney@google.com> on 2013-01-16
Reviewed by Jochen Eisinger.

• DumpRenderTree/chromium/DRTTestRunner.cpp:

(DRTTestRunner::DRTTestRunner):

• DumpRenderTree/chromium/DRTTestRunner.h:

(DRTTestRunner):

• DumpRenderTree/chromium/TestRunner/public/WebTestDelegate.h:

(WebKit):
(WebTestRunner::WebTestDelegate::setDeviceOrientation):

• DumpRenderTree/chromium/TestRunner/src/TestRunner.cpp:

(WebTestRunner::TestRunner::TestRunner):
(WebTestRunner::TestRunner::setMockDeviceOrientation):
(WebTestRunner):

• DumpRenderTree/chromium/TestRunner/src/TestRunner.h:

(TestRunner):

• DumpRenderTree/chromium/WebViewHost.cpp:

(WebViewHost::setDeviceOrientation):

• DumpRenderTree/chromium/WebViewHost.h:

(WebViewHost):

Location:

trunk/Tools

Files:

• ChangeLog (modified) (1 diff)
• DumpRenderTree/chromium/DRTTestRunner.cpp (modified) (3 diffs)
• DumpRenderTree/chromium/DRTTestRunner.h (modified) (1 diff)
• DumpRenderTree/chromium/TestRunner/public/WebTestDelegate.h (modified) (2 diffs)
• DumpRenderTree/chromium/TestRunner/src/TestRunner.cpp (modified) (3 diffs)
• DumpRenderTree/chromium/TestRunner/src/TestRunner.h (modified) (1 diff)
• DumpRenderTree/chromium/WebViewHost.cpp (modified) (1 diff)
• DumpRenderTree/chromium/WebViewHost.h (modified) (1 diff)

trunk/Tools/ChangeLog

@@ +1 @@
+2013-01-16  Dan Carney  <dcarney@google.com>
+
+        [chromium] move setMockDeviceOrientation to TestRunner library
+        https://bugs.webkit.org/show_bug.cgi?id=106895
+
+        Reviewed by Jochen Eisinger.
+
+        * DumpRenderTree/chromium/DRTTestRunner.cpp:
+        (DRTTestRunner::DRTTestRunner):
+        * DumpRenderTree/chromium/DRTTestRunner.h:
+        (DRTTestRunner):
+        * DumpRenderTree/chromium/TestRunner/public/WebTestDelegate.h:
+        (WebKit):
+        (WebTestRunner::WebTestDelegate::setDeviceOrientation):
+        * DumpRenderTree/chromium/TestRunner/src/TestRunner.cpp:
+        (WebTestRunner::TestRunner::TestRunner):
+        (WebTestRunner::TestRunner::setMockDeviceOrientation):
+        (WebTestRunner):
+        * DumpRenderTree/chromium/TestRunner/src/TestRunner.h:
+        (TestRunner):
+        * DumpRenderTree/chromium/WebViewHost.cpp:
+        (WebViewHost::setDeviceOrientation):
+        * DumpRenderTree/chromium/WebViewHost.h:
+        (WebViewHost):
+
 2013-01-16  Jochen Eisinger  <jochen@chromium.org>
 

trunk/Tools/DumpRenderTree/chromium/DRTTestRunner.cpp

@@ -42 +42 @@
 #include "WebBindings.h"
 #include "WebConsoleMessage.h"
-#include "WebDeviceOrientation.h"
-#include "WebDeviceOrientationClientMock.h"
 #include "WebDocument.h"
 #include "WebElement.h"
@@ -126 +124 @@
     bindMethod("setCustomPolicyDelegate", &DRTTestRunner::setCustomPolicyDelegate);
     bindMethod("setGeolocationPermission", &DRTTestRunner::setGeolocationPermission);
-    bindMethod("setMockDeviceOrientation", &DRTTestRunner::setMockDeviceOrientation);
     bindMethod("setMockGeolocationPositionUnavailableError", &DRTTestRunner::setMockGeolocationPositionUnavailableError);
     bindMethod("setMockGeolocationPosition", &DRTTestRunner::setMockGeolocationPosition);
@@ -526 +523 @@
 }
 
-void DRTTestRunner::setMockDeviceOrientation(const CppArgumentList& arguments, CppVariant* result)
-{
-    result->setNull();
-    if (arguments.size() < 6 || !arguments[0].isBool() || !arguments[1].isNumber() || !arguments[2].isBool() || !arguments[3].isNumber() || !arguments[4].isBool() || !arguments[5].isNumber())
-        return;
-
-    WebDeviceOrientation orientation;
-    orientation.setNull(false);
-    if (arguments[0].toBoolean())
-        orientation.setAlpha(arguments[1].toDouble());
-    if (arguments[2].toBoolean())
-        orientation.setBeta(arguments[3].toDouble());
-    if (arguments[4].toBoolean())
-        orientation.setGamma(arguments[5].toDouble());
-
-    // Note that we only call setOrientation on the main page's mock since this is all that the
-    // tests require. If necessary, we could get a list of WebViewHosts from the TestShell and
-    // call setOrientation on each DeviceOrientationClientMock.
-    m_shell->webViewHost()->deviceOrientationClientMock()->setOrientation(orientation);
-}
-
 // FIXME: For greater test flexibility, we should be able to set each page's geolocation mock individually.
 // https://bugs.webkit.org/show_bug.cgi?id=52368

trunk/Tools/DumpRenderTree/chromium/DRTTestRunner.h

@@ -125 +125 @@
     void numberOfPendingGeolocationPermissionRequests(const CppArgumentList&, CppVariant*);
 
-    // DeviceOrientation related functions
-    void setMockDeviceOrientation(const CppArgumentList&, CppVariant*);
-
     // Geolocation related functions.
     void setGeolocationPermission(const CppArgumentList&, CppVariant*);

trunk/Tools/DumpRenderTree/chromium/TestRunner/public/WebTestDelegate.h

@@ -38 +38 @@
 
 namespace WebKit {
+class WebDeviceOrientation;
 class WebGamepads;
 class WebIntentRequest;
@@ -93 +94 @@
     virtual std::string pathToLocalResource(const std::string& resource) { return std::string(); }
     virtual void setLocale(const std::string&) { }
+    virtual void setDeviceOrientation(WebKit::WebDeviceOrientation&) { }
 };
 

trunk/Tools/DumpRenderTree/chromium/TestRunner/src/TestRunner.cpp

@@ -35 +35 @@
 #include "WebAnimationController.h"
 #include "WebBindings.h"
+#include "WebDeviceOrientation.h"
 #include "WebDocument.h"
 #include "WebElement.h"
@@ -145 +146 @@
     bindMethod("setSmartInsertDeleteEnabled", &TestRunner::setSmartInsertDeleteEnabled);
     bindMethod("setSelectTrailingWhitespaceEnabled", &TestRunner::setSelectTrailingWhitespaceEnabled);
+    bindMethod("setMockDeviceOrientation", &TestRunner::setMockDeviceOrientation);
 
     // The following modify WebPreferences.
@@ -1105 +1107 @@
     m_webView->resize(newSize);
     result->set(true);
+}
+
+void TestRunner::setMockDeviceOrientation(const CppArgumentList& arguments, CppVariant* result)
+{
+    result->setNull();
+    if (arguments.size() < 6 || !arguments[0].isBool() || !arguments[1].isNumber() || !arguments[2].isBool() || !arguments[3].isNumber() || !arguments[4].isBool() || !arguments[5].isNumber())
+        return;
+
+    WebDeviceOrientation orientation;
+    orientation.setNull(false);
+    if (arguments[0].toBoolean())
+        orientation.setAlpha(arguments[1].toDouble());
+    if (arguments[2].toBoolean())
+        orientation.setBeta(arguments[3].toDouble());
+    if (arguments[4].toBoolean())
+        orientation.setGamma(arguments[5].toDouble());
+
+    // Note that we only call setOrientation on the main page's mock since this is all that the
+    // tests require. If necessary, we could get a list of WebViewHosts from the TestShell and
+    // call setOrientation on each DeviceOrientationClientMock.
+    m_delegate->setDeviceOrientation(orientation);
 }
 

trunk/Tools/DumpRenderTree/chromium/TestRunner/src/TestRunner.h

@@ -191 +191 @@
     void disableAutoResizeMode(const CppArgumentList&, CppVariant*);
 
+    // DeviceOrientation related functions
+    void setMockDeviceOrientation(const CppArgumentList&, CppVariant*);
+
     ///////////////////////////////////////////////////////////////////////////
     // Methods modifying WebPreferences.

trunk/Tools/DumpRenderTree/chromium/WebViewHost.cpp

@@ -1136 +1136 @@
 }
 
+void WebViewHost::setDeviceOrientation(WebKit::WebDeviceOrientation& orientation)
+{
+    deviceOrientationClientMock()->setOrientation(orientation);
+}
+
 // Public functions -----------------------------------------------------------
 

trunk/Tools/DumpRenderTree/chromium/WebViewHost.h

@@ -161 +161 @@
     virtual std::string pathToLocalResource(const std::string& url) OVERRIDE;
     virtual void setLocale(const std::string&) OVERRIDE;
+    virtual void setDeviceOrientation(WebKit::WebDeviceOrientation&) OVERRIDE;
 
     // NavigationHost