Loosen the checks for numbers in layout test controller.

webkit/tools/test_shell/layout_test_controller.cc

 // Copyright (c) 2010 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.
 
 // This file contains the definition for LayoutTestController.
 
 #include <vector>
 
 #include "webkit/tools/test_shell/layout_test_controller.h"
 
@@ skipping 1130 matching lines @@
         WebString::fromUTF8(args[1].ToString()));
   }
   result->SetNull();
 }
 
 // Need these conversions because the format of the value for booleans
 // may vary - for example, on mac "1" and "0" are used for boolean.
 bool LayoutTestController::CppVariantToBool(const CppVariant& value) {
   if (value.isBool())
     return value.ToBoolean();
-  else if (value.isInt32())
+  else if (value.isNumber())
     return 0 != value.ToInt32();
   else if (value.isString()) {
     std::string valueString = value.ToString();
     if (valueString == "true" || valueString == "1")
       return true;
     if (valueString == "false" || valueString == "0")
       return false;
   }
   LogErrorToConsole("Invalid value. Expected boolean value.");
   return false;
 }
 
 int32 LayoutTestController::CppVariantToInt32(const CppVariant& value) {
-  if (value.isInt32())
+  if (value.isNumber())
     return value.ToInt32();
   else if (value.isString()) {
     int number;
     if (base::StringToInt(value.ToString(), &number))
       return number;
   }
   LogErrorToConsole("Invalid value for preference. Expected integer value.");
   return 0;
 }
 
@@ skipping 132 matching lines @@
 
 void LayoutTestController::clearAllDatabases(
     const CppArgumentList& args, CppVariant* result) {
   result->SetNull();
   SimpleDatabaseSystem::GetInstance()->ClearAllDatabases();
 }
 
 void LayoutTestController::setDatabaseQuota(
     const CppArgumentList& args, CppVariant* result) {
   result->SetNull();
-  if ((args.size() >= 1) && args[0].isInt32())
+  if ((args.size() >= 1) && args[0].isNumber())
     SimpleDatabaseSystem::GetInstance()->SetDatabaseQuota(args[0].ToInt32());
 }
 
 void LayoutTestController::setPOSIXLocale(const CppArgumentList& args,
                                           CppVariant* result) {
   result->SetNull();
   if (args.size() == 1 && args[0].isString()) {
     std::string new_locale = args[0].ToString();
     setlocale(LC_ALL, new_locale.c_str());
   }
@@ skipping 89 matching lines @@
     const CppArgumentList& args, CppVariant* result) {
   result->SetNull();
   if (args.size() < 1 || !args[0].isBool())
     return;
   shell_->dev_tools_agent()->setTimelineProfilingEnabled(args[0].ToBoolean());
 }
 
 void LayoutTestController::evaluateInWebInspector(const CppArgumentList& args,
                                                   CppVariant* result) {
   result->SetNull();
-  if (args.size() < 2 || !args[0].isInt32() || !args[1].isString())
+  if (args.size() < 2 || !args[0].isNumber() || !args[1].isString())
     return;
   shell_->dev_tools_agent()->evaluateInWebInspector(args[0].ToInt32(),
                                                     args[1].ToString());
 }
 
 void LayoutTestController::forceRedSelectionColors(const CppArgumentList& args,
                                                    CppVariant* result) {
   result->SetNull();
   shell_->webView()->setSelectionColors(0xffee0000, 0xff00ee00, 0xff000000,
                                         0xffc0c0c0);
@@ skipping 60 matching lines @@
     const CppArgumentList& args, CppVariant* result) {
   if (args.size() < 3 ||
       !args[0].isNumber() || !args[1].isNumber() || !args[2].isNumber())
     return;
   WebGeolocationServiceMock::setMockGeolocationPosition(
       args[0].ToDouble(), args[1].ToDouble(), args[2].ToDouble());
 }
 
 void LayoutTestController::setMockGeolocationError(const CppArgumentList& args,
                                                    CppVariant* result) {
-  if (args.size() < 2 ||
-      !args[0].isInt32() || !args[1].isString())
+  if (args.size() < 2 || !args[0].isNumber() || !args[1].isString())
     return;
   WebGeolocationServiceMock::setMockGeolocationError(
       args[0].ToInt32(), WebString::fromUTF8(args[1].ToString()));
 }
 
 void LayoutTestController::markerTextForListItem(const CppArgumentList& args,
                                                  CppVariant* result) {
   WebElement element;
   if (!WebBindings::getElement(args[0].value.objectValue, &element))
     result->SetNull();
@@ skipping 19 matching lines @@
   shell_->device_orientation_client_mock()->setOrientation(orientation);
 }
 
 void LayoutTestController::hasSpellingMarker(const CppArgumentList& arguments,
                                              CppVariant* result) {
   if (arguments.size() < 2 || !arguments[0].isNumber() || !arguments[1].isNumber())
     return;
   result->Set(shell_->webView()->mainFrame()->selectionStartHasSpellingMarkerFor(
       arguments[0].ToInt32(), arguments[1].ToInt32()));
 }