Merge WebKit at r72805: Initial merge by Git

Note that this is a backwards merge from Chromium release 9.0.600.0
to 9.0.597.0, to align with the Chromium 9 stable release branch.

Change-Id: I5d2bb4e8cee9d39ae8485abf48bdb55ecf8b3790

1 files changed, 5 insertions, 5 deletions

diff --git a/WebKitTools/DumpRenderTree/chromium/LayoutTestController.cpp b/WebKitTools/DumpRenderTree/chromium/LayoutTestController.cpp
index a55070e..e51ebb3 100644
--- a/WebKitTools/DumpRenderTree/chromium/LayoutTestController.cpp
+++ b/WebKitTools/DumpRenderTree/chromium/LayoutTestController.cpp
@@ -1174,7 +1174,7 @@ bool LayoutTestController::cppVariantToBool(const CppVariant& value)
 {
     if (value.isBool())
         return value.toBoolean();
-    if (value.isNumber())
+    if (value.isInt32())
         return value.toInt32();
     if (value.isString()) {
         string valueString = value.toString();
@@ -1189,7 +1189,7 @@ bool LayoutTestController::cppVariantToBool(const CppVariant& value)
 
 int32_t LayoutTestController::cppVariantToInt32(const CppVariant& value)
 {
-    if (value.isNumber())
+    if (value.isInt32())
         return value.toInt32();
     if (value.isString()) {
         string stringSource = value.toString();
@@ -1342,7 +1342,7 @@ void LayoutTestController::clearAllDatabases(const CppArgumentList& arguments, C
 void LayoutTestController::setDatabaseQuota(const CppArgumentList& arguments, CppVariant* result)
 {
     result->setNull();
-    if ((arguments.size() >= 1) && arguments[0].isNumber())
+    if ((arguments.size() >= 1) && arguments[0].isInt32())
         webkit_support::SetDatabaseQuota(arguments[0].toInt32());
 }
 
@@ -1444,7 +1444,7 @@ void LayoutTestController::setTimelineProfilingEnabled(const CppArgumentList& ar
 void LayoutTestController::evaluateInWebInspector(const CppArgumentList& arguments, CppVariant* result)
 {
     result->setNull();
-    if (arguments.size() < 2 || !arguments[0].isNumber() || !arguments[1].isString())
+    if (arguments.size() < 2 || !arguments[0].isInt32() || !arguments[1].isString())
         return;
     m_shell->drtDevToolsAgent()->evaluateInWebInspector(arguments[0].toInt32(), arguments[1].toString());
 }
@@ -1527,7 +1527,7 @@ void LayoutTestController::setMockGeolocationPosition(const CppArgumentList& arg
 void LayoutTestController::setMockGeolocationError(const CppArgumentList& arguments, CppVariant* result)
 {
     result->setNull();
-    if (arguments.size() < 2 || !arguments[0].isNumber() || !arguments[1].isString())
+    if (arguments.size() < 2 || !arguments[0].isInt32() || !arguments[1].isString())
         return;
     WebGeolocationServiceMock::setMockGeolocationError(arguments[0].toInt32(), cppVariantToWebString(arguments[1]));
 }