Changeset 142253 in webkit

Timestamp:

Feb 8, 2013 3:51:31 AM (11 years ago)

Author:

jochen@chromium.org

Message:

[chromium] copy normalizeLayoutTestURL code to TestRunner library
​https://bugs.webkit.org/show_bug.cgi?id=109269

Reviewed by Kent Tamura.

The method doesn't have any external dependencies, so there's no reason
it should be on the delegate. It's still required by TestShell, however,
by making a copy, we can avoid implementing this in content shell.

• DumpRenderTree/chromium/TestRunner/public/WebTestDelegate.h:

(WebTestDelegate):

• DumpRenderTree/chromium/TestRunner/src/WebPermissions.cpp:

(WebTestRunner::WebPermissions::allowImage):
(WebTestRunner::WebPermissions::allowScriptFromSource):

• DumpRenderTree/chromium/TestShell.cpp:

(TestShell::windowCount):

• DumpRenderTree/chromium/TestShell.h:
• DumpRenderTree/chromium/WebViewHost.cpp:
• DumpRenderTree/chromium/WebViewHost.h:

(WebViewHost):

Location:

trunk/Tools

Files:

• ChangeLog (modified) (1 diff)
• DumpRenderTree/chromium/TestRunner/public/WebTestDelegate.h (modified) (2 diffs)
• DumpRenderTree/chromium/TestRunner/src/WebPermissions.cpp (modified) (3 diffs)
• DumpRenderTree/chromium/TestShell.cpp (modified) (1 diff)
• DumpRenderTree/chromium/TestShell.h (modified) (1 diff)
• DumpRenderTree/chromium/WebViewHost.cpp (modified) (1 diff)
• DumpRenderTree/chromium/WebViewHost.h (modified) (1 diff)

trunk/Tools/ChangeLog

@@ +1 @@
+2013-02-08  Jochen Eisinger  <jochen@chromium.org>
+
+        [chromium] copy normalizeLayoutTestURL code to TestRunner library
+        https://bugs.webkit.org/show_bug.cgi?id=109269
+
+        Reviewed by Kent Tamura.
+
+        The method doesn't have any external dependencies, so there's no reason
+        it should be on the delegate. It's still required by TestShell, however,
+        by making a copy, we can avoid implementing this in content shell.
+
+        * DumpRenderTree/chromium/TestRunner/public/WebTestDelegate.h:
+        (WebTestDelegate):
+        * DumpRenderTree/chromium/TestRunner/src/WebPermissions.cpp:
+        (WebTestRunner::WebPermissions::allowImage):
+        (WebTestRunner::WebPermissions::allowScriptFromSource):
+        * DumpRenderTree/chromium/TestShell.cpp:
+        (TestShell::windowCount):
+        * DumpRenderTree/chromium/TestShell.h:
+        * DumpRenderTree/chromium/WebViewHost.cpp:
+        * DumpRenderTree/chromium/WebViewHost.h:
+        (WebViewHost):
+
 2013-02-08  Raphael Kubo da Costa  <raphael.kubo.da.costa@intel.com>
 

trunk/Tools/DumpRenderTree/chromium/TestRunner/public/WebTestDelegate.h

@@ -55 +55 @@
     virtual void clearContextMenuData() = 0;
     virtual void clearEditCommand() = 0;
-    virtual void fillSpellingSuggestionList(const WebKit::WebString&, WebKit::WebVector<WebKit::WebString>*) { }
     virtual void setEditCommand(const std::string& name, const std::string& value) = 0;
     virtual WebKit::WebContextMenuData* lastContextMenuData() const = 0;
@@ -80 +79 @@
     virtual WebKit::WebIntentRequest* currentWebIntentRequest() { return 0; }
     virtual std::string makeURLErrorDescription(const WebKit::WebURLError&) { return std::string(); }
-    virtual std::string normalizeLayoutTestURL(const std::string&) { return std::string(); }
     virtual void setClientWindowRect(const WebKit::WebRect&) { }
     virtual void showDevTools() { }

trunk/Tools/DumpRenderTree/chromium/TestRunner/src/WebPermissions.cpp

@@ -36 +36 @@
 #include <public/WebURL.h>
 
+using namespace std;
+
 namespace WebTestRunner {
+
+namespace {
+
+const char layoutTestsPattern[] = "/LayoutTests/";
+const string::size_type layoutTestsPatternSize = sizeof(layoutTestsPattern) - 1;
+const char fileUrlPattern[] = "file:/";
+const char fileTestPrefix[] = "(file test):";
+const char dataUrlPattern[] = "data:";
+const string::size_type dataUrlPatternSize = sizeof(dataUrlPattern) - 1;
+
+string normalizeLayoutTestURL(const string& url)
+{
+    string result = url;
+    size_t pos;
+    if (!url.find(fileUrlPattern) && ((pos = url.find(layoutTestsPattern)) != string::npos)) {
+        // adjust file URLs to match upstream results.
+        result.replace(0, pos + layoutTestsPatternSize, fileTestPrefix);
+    } else if (!url.find(dataUrlPattern)) {
+        // URL-escape data URLs to match results upstream.
+        string path = url.substr(dataUrlPatternSize);
+        result.replace(dataUrlPatternSize, url.length(), path);
+    }
+    return result;
+}
+
+}
 
 WebPermissions::WebPermissions()
@@ -52 +80 @@
     bool allowed = enabledPerSettings && m_imagesAllowed;
     if (m_dumpCallbacks && m_delegate)
-        m_delegate->printMessage(std::string("PERMISSION CLIENT: allowImage(") + m_delegate->normalizeLayoutTestURL(imageURL.spec()) + "): " + (allowed ? "true" : "false") + "\n");
+        m_delegate->printMessage(std::string("PERMISSION CLIENT: allowImage(") + normalizeLayoutTestURL(imageURL.spec()) + "): " + (allowed ? "true" : "false") + "\n");
     return allowed;
 }
@@ -60 +88 @@
     bool allowed = enabledPerSettings && m_scriptsAllowed;
     if (m_dumpCallbacks && m_delegate)
-        m_delegate->printMessage(std::string("PERMISSION CLIENT: allowScriptFromSource(") + m_delegate->normalizeLayoutTestURL(scriptURL.spec()) + "): " + (allowed ? "true" : "false") + "\n");
+        m_delegate->printMessage(std::string("PERMISSION CLIENT: allowScriptFromSource(") + normalizeLayoutTestURL(scriptURL.spec()) + "): " + (allowed ? "true" : "false") + "\n");
     return allowed;
 }

trunk/Tools/DumpRenderTree/chromium/TestShell.cpp

@@ -826 +826 @@
     return m_windowList.size();
 }
-
-string TestShell::normalizeLayoutTestURL(const string& url)
-{
-    return normalizeLayoutTestURLInternal(url);
-}

trunk/Tools/DumpRenderTree/chromium/TestShell.h

@@ -179 +179 @@
     WindowList windowList() const { return m_windowList; }
 
-    // Returns a string representation of an URL's spec that does not depend on
-    // the location of the layout test in the file system.
-    std::string normalizeLayoutTestURL(const std::string&);
-
 private:
     WebViewHost* createNewWindow(const WebKit::WebURL&, DRTDevToolsAgent*, WebTestRunner::WebTestInterfaces*);

trunk/Tools/DumpRenderTree/chromium/WebViewHost.cpp

@@ -733 +733 @@
 }
 
-std::string WebViewHost::normalizeLayoutTestURL(const std::string& url)
-{
-    return m_shell->normalizeLayoutTestURL(url);
-}
-
 void WebViewHost::showDevTools()
 {

trunk/Tools/DumpRenderTree/chromium/WebViewHost.h

@@ -130 +130 @@
 #endif
     virtual std::string makeURLErrorDescription(const WebKit::WebURLError&) OVERRIDE;
-    virtual std::string normalizeLayoutTestURL(const std::string&) OVERRIDE;
     virtual void setClientWindowRect(const WebKit::WebRect&) OVERRIDE;
     virtual void showDevTools() OVERRIDE;