Refactor chromedriver's script execution to reduce amount of custom Value parsing.

chrome/test/webdriver/automation.cc

 // Copyright (c) 2011 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/test/webdriver/automation.h"
 
 #if defined(OS_WIN)
 #include <windows.h>
 #endif
 
@@ skipping 13 matching lines @@
 #include "base/utf_string_conversions.h"
 #include "base/values.h"
 #include "chrome/common/automation_constants.h"
 #include "chrome/common/chrome_constants.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/url_constants.h"
 #include "chrome/test/automation/automation_json_requests.h"
 #include "chrome/test/automation/automation_proxy.h"
 #include "chrome/test/automation/proxy_launcher.h"
 #include "chrome/test/webdriver/frame_path.h"
+#include "chrome/test/webdriver/webdriver_basic_types.h"
 #include "chrome/test/webdriver/webdriver_error.h"
-#include "ui/gfx/point.h"
 
 #if defined(OS_WIN)
 #include "base/win/registry.h"
 #include "base/win/windows_version.h"
 #endif
 
 namespace {
 
 // Gets the path to the default Chrome executable. Returns true on success.
 bool GetDefaultChromeExe(FilePath* browser_exe) {
@@ skipping 189 matching lines @@
                                         &unscoped_value, &error_msg)) {
     *error = new Error(kUnknownError, error_msg);
     return;
   }
   scoped_ptr<Value> value(unscoped_value);
   if (!value->GetAsString(result))
     *error = new Error(kUnknownError, "Execute script did not return string");
 }
 
 void Automation::MouseMove(int tab_id,
-                           const gfx::Point& p,
+                           const Point& p,
                            Error** error) {
   int windex = 0, tab_index = 0;
   *error = GetIndicesForTab(tab_id, &windex, &tab_index);
   if (*error)
     return;
 
   std::string error_msg;
   if (!SendMouseMoveJSONRequest(
-          automation(), windex, tab_index, p.x(), p.y(), &error_msg)) {
+          automation(), windex, tab_index,
+          static_cast<int>(p.x()), static_cast<int>(p.y()), &error_msg)) {
     *error = new Error(kUnknownError, error_msg);
   }
 }
 
 void Automation::MouseClick(int tab_id,
-                            const gfx::Point& p,
+                            const Point& p,
                             automation::MouseButton button,
                             Error** error) {
   int windex = 0, tab_index = 0;
   *error = GetIndicesForTab(tab_id, &windex, &tab_index);
   if (*error)
     return;
 
   std::string error_msg;
   if (!SendMouseClickJSONRequest(
           automation(), windex, tab_index, button, p.x(), p.y(), &error_msg)) {
     *error = new Error(kUnknownError, error_msg);
   }
 }
 
 void Automation::MouseDrag(int tab_id,
-                           const gfx::Point& start,
-                           const gfx::Point& end,
+                           const Point& start,
+                           const Point& end,
                            Error** error) {
   int windex = 0, tab_index = 0;
   *error = GetIndicesForTab(tab_id, &windex, &tab_index);
   if (*error)
     return;
 
   std::string error_msg;
-  if (!SendMouseDragJSONRequest(automation(), windex, tab_index, start.x(),
-                                start.y(), end.x(), end.y(), &error_msg)) {
+  if (!SendMouseDragJSONRequest(
+          automation(), windex, tab_index, static_cast<int>(start.x()),
+          static_cast<int>(start.y()), static_cast<int>(end.x()),

[Paweł Hajdan Jr., 2011/08/02 20:04:47]

Why do we need those static_casts all over the place? It seems like you have
control over everything here, so try to design code so that it doesn't require
those casts.

[kkania, 2011/08/03 17:07:56]

Done.

+          static_cast<int>(end.y()), &error_msg)) {
     *error = new Error(kUnknownError, error_msg);
   }
 }
 
 void Automation::MouseButtonUp(int tab_id,
-                               const gfx::Point& p,
+                               const Point& p,
                                Error** error) {
   *error = CheckAdvancedInteractionsSupported();
   if (*error)
     return;
 
   int windex = 0, tab_index = 0;
   *error = GetIndicesForTab(tab_id, &windex, &tab_index);
   if (*error)
     return;
 
   std::string error_msg;
   if (!SendMouseButtonUpJSONRequest(
-          automation(), windex, tab_index, p.x(), p.y(), &error_msg)) {
+          automation(), windex, tab_index, static_cast<int>(p.x()),
+          static_cast<int>(p.y()), &error_msg)) {
     *error = new Error(kUnknownError, error_msg);
   }
 }
 
 void Automation::MouseButtonDown(int tab_id,
-                                 const gfx::Point& p,
+                                 const Point& p,
                                  Error** error) {
   *error = CheckAdvancedInteractionsSupported();
   if (*error)
     return;
 
   int windex = 0, tab_index = 0;
   *error = GetIndicesForTab(tab_id, &windex, &tab_index);
   if (*error)
     return;
 
   std::string error_msg;
   if (!SendMouseButtonDownJSONRequest(
-          automation(), windex, tab_index, p.x(), p.y(), &error_msg)) {
+          automation(), windex, tab_index, static_cast<int>(p.x()),
+          static_cast<int>(p.y()), &error_msg)) {
     *error = new Error(kUnknownError, error_msg);
   }
 }
 
 void Automation::MouseDoubleClick(int tab_id,
-                                  const gfx::Point& p,
+                                  const Point& p,
                                   Error** error) {
   *error = CheckAdvancedInteractionsSupported();
   if (*error)
     return;
 
   int windex = 0, tab_index = 0;
   *error = GetIndicesForTab(tab_id, &windex, &tab_index);
   if (*error)
     return;
 
   std::string error_msg;
   if (!SendMouseDoubleClickJSONRequest(
-          automation(), windex, tab_index, p.x(), p.y(), &error_msg)) {
+          automation(), windex, tab_index, static_cast<int>(p.x()),
+          static_cast<int>(p.y()), &error_msg)) {
     *error = new Error(kUnknownError, error_msg);
   }
 }
 
 void Automation::DragAndDropFilePaths(
-    int tab_id, const gfx::Point& location,
+    int tab_id, const Point& location,
     const std::vector<FilePath::StringType>& paths, Error** error) {
   int windex = 0, tab_index = 0;
   *error = GetIndicesForTab(tab_id, &windex, &tab_index);
   if (*error) {
     return;
   }
 
   std::string error_msg;
   if (!SendDragAndDropFilePathsJSONRequest(
-          automation(), windex, tab_index, location.x(), location.y(), paths,
+          automation(), windex, tab_index, static_cast<int>(location.x()),
+          static_cast<int>(location.y()), paths,
           &error_msg)) {
     *error = new Error(kUnknownError, error_msg);
   }
 }
 
 void Automation::SendWebKeyEvent(int tab_id,
                                  const WebKeyEvent& key_event,
                                  Error** error) {
   int windex = 0, tab_index = 0;
   *error = GetIndicesForTab(tab_id, &windex, &tab_index);
@@ skipping 256 matching lines @@
       768, 0, "Alerts are not supported for this version of Chrome");
 }
 
 Error* Automation::CheckAdvancedInteractionsSupported() {
   const char* message =
       "Advanced user interactions are not supported for this version of Chrome";
   return CheckVersion(750, 0, message);
 }
 
 }  // namespace webdriver