Changeset 64451 in webkit

Timestamp:

Aug 1, 2010 7:03:18 PM (14 years ago)

Author:

tkent@chromium.org

Message:

2010-08-01 Kent Tamura <​tkent@chromium.org>

Reviewed by Dimitri Glazkov.

[DRT/Chromium] Remove string_util.h dependency
​https://bugs.webkit.org/show_bug.cgi?id=43312

• DumpRenderTree/chromium/LayoutTestController.cpp: (LayoutTestController::pathToLocalResource): Use string::find() instead of StartsWithASCII(). (LayoutTestController::cppVariantToInt32): Use strtol() instead of StringToNumber().

Location:

trunk/WebKitTools

Files:

• ChangeLog (modified) (1 diff)
• DumpRenderTree/chromium/LayoutTestController.cpp (modified) (6 diffs)

trunk/WebKitTools/ChangeLog

@@ +1 @@
+2010-08-01  Kent Tamura  <tkent@chromium.org>
+
+        Reviewed by Dimitri Glazkov.
+
+        [DRT/Chromium] Remove string_util.h dependency
+        https://bugs.webkit.org/show_bug.cgi?id=43312
+
+        * DumpRenderTree/chromium/LayoutTestController.cpp:
+        (LayoutTestController::pathToLocalResource):
+         Use string::find() instead of StartsWithASCII().
+        (LayoutTestController::cppVariantToInt32):
+         Use strtol() instead of StringToNumber().
+
 2010-08-01  Sam Weinig  <sam@webkit.org>
 

trunk/WebKitTools/DumpRenderTree/chromium/LayoutTestController.cpp

@@ -36 +36 @@
 #include "TestShell.h"
 #include "WebViewHost.h"
-#include "base/string_util.h"
 #include "public/WebAnimationController.h"
 #include "public/WebConsoleMessage.h"
@@ -52 +51 @@
 #include "public/WebView.h"
 #include "webkit/support/webkit_support.h"
+#include <algorithm>
+#include <cstdlib>
+#include <limits>
 #include <wtf/text/WTFString.h>
 
@@ -705 +707 @@
     string url = arguments[0].toString();
 #if OS(WINDOWS)
-    if (StartsWithASCII(url, "/tmp/", true)) {
+    if (!url.find("/tmp/")) {
         // We want a temp file.
         const unsigned tempPrefixLength = 5;
@@ -717 +719 @@
             ASSERT(tempLength < bufferSize);
         }
-        std::string resultPath(WebString(tempPath.get(), tempLength).utf8());
+        string resultPath(WebString(tempPath.get(), tempLength).utf8());
         resultPath.append(url.substr(tempPrefixLength));
         result->set(resultPath);
@@ -726 +728 @@
     // Some layout tests use file://// which we resolve as a UNC path.  Normalize
     // them to just file:///.
-    while (StartsWithASCII(url, "file:////", false))
+    string lowerUrl = url;
+    transform(lowerUrl.begin(), lowerUrl.end(), lowerUrl.begin(), ::tolower);
+    while (!lowerUrl.find("file:////")) {
         url = url.substr(0, 8) + url.substr(9);
+        lowerUrl = lowerUrl.substr(0, 8) + lowerUrl.substr(9);
+    }
     result->set(webkit_support::RewriteLayoutTestsURL(url).spec());
 }
@@ -1025 +1031 @@
         return value.toInt32();
     if (value.isString()) {
-        int number;
-        if (StringToInt(value.toString(), &number))
-            return number;
+        string stringSource = value.toString();
+        const char* source = stringSource.data();
+        char* end;
+        long number = strtol(source, &end, 10);
+        if (end == source + stringSource.length() && number >= numeric_limits<int32_t>::min() && number <= numeric_limits<int32_t>::max())
+            return static_cast<int32_t>(number);
     }
     logErrorToConsole("Invalid value for preference. Expected integer value.");