Changeset 140100 in webkit

Timestamp:

Jan 17, 2013 8:41:36 PM (11 years ago)

Author:

commit-queue@webkit.org

Message:

[BlackBerry] DRT - Accept http/file URL when running drt-launcher from command line
​https://bugs.webkit.org/show_bug.cgi?id=107107
PR 282192

Patch by Xiaobo Wang <​xbwang@torchmobile.com.cn> on 2013-01-17
Reviewed by Rob Buis.

The DRT application will convert relative/absolute file path to
​file://<real-file-path> format, so we only check for http/file prefix.

• DumpRenderTree/blackberry/DumpRenderTree.cpp:

(BlackBerry::WebKit::isFullUrl):
(WebKit):
(BlackBerry::WebKit::DumpRenderTree::runCurrentTest):

Location:

trunk/Tools

Files:

• ChangeLog (modified) (1 diff)
• DumpRenderTree/blackberry/DumpRenderTree.cpp (modified) (2 diffs)

trunk/Tools/ChangeLog

@@ +1 @@
+2013-01-17  Xiaobo Wang  <xbwang@torchmobile.com.cn>
+
+        [BlackBerry] DRT - Accept http/file URL when running drt-launcher from command line
+        https://bugs.webkit.org/show_bug.cgi?id=107107
+        PR 282192
+
+        Reviewed by Rob Buis.
+
+        The DRT application will convert relative/absolute file path to
+        file://<real-file-path> format, so we only check for http/file prefix.
+
+        * DumpRenderTree/blackberry/DumpRenderTree.cpp:
+        (BlackBerry::WebKit::isFullUrl):
+        (WebKit):
+        (BlackBerry::WebKit::DumpRenderTree::runCurrentTest):
+
 2013-01-17  Frank Farzan  <frankf@chromium.org>
 

trunk/Tools/DumpRenderTree/blackberry/DumpRenderTree.cpp

@@ -161 +161 @@
 }
 
+static bool isFullUrl(const String& url)
+{
+    static Vector<String> *prefixes = 0;
+    if (!prefixes)  {
+        prefixes = new Vector<String>();
+        prefixes->append("http://");
+        prefixes->append("file://");
+    }
+    for (unsigned i = 0; i < prefixes->size(); ++i) {
+        if (url.startsWith(prefixes->at(i), false))
+            return true;
+    }
+    return false;
+}
+
 DumpRenderTree::DumpRenderTree(BlackBerry::WebKit::WebPage* page)
     : m_gcController(0)
@@ -235 +250 @@
         m_currentHttpTest.remove(0, strlen(httpTestSyntax));
         runTest(httpPrefixURL + m_currentHttpTest, imageHash);
-    } else
+    } else if (isFullUrl(*m_currentTest))
+        runTest(*m_currentTest, imageHash);
+    else
         runTest(kSDCLayoutTestsURI + *m_currentTest, imageHash);
 }