Changeset 84070 in webkit

Timestamp:

Apr 15, 2011 6:53:00 PM (13 years ago)

Author:

commit-queue@webkit.org

Message:

2011-04-15 Chang Shu <​cshu@webkit.org>

Reviewed by Alexey Proskuryakov.

When a message with url embedded is added to console, the "file:" scheme
and path should be stripped.
​https://bugs.webkit.org/show_bug.cgi?id=58665

Unskip passed tests.

• platform/mac-wk2/Skipped:
• platform/qt-wk2/Skipped:

2011-04-15 Chang Shu <​cshu@webkit.org>

Reviewed by Alexey Proskuryakov.

When a message with url embedded is added to console, the "file:" scheme
and path should be stripped.
​https://bugs.webkit.org/show_bug.cgi?id=58665

• WebKitTestRunner/InjectedBundle/InjectedBundlePage.cpp: (WTR::lastFileURLPathComponent): (WTR::InjectedBundlePage::willAddMessageToConsole):

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/platform/mac-wk2/Skipped (modified) (1 diff)
• LayoutTests/platform/qt-wk2/Skipped (modified) (1 diff)
• Tools/ChangeLog (modified) (1 diff)
• Tools/WebKitTestRunner/InjectedBundle/InjectedBundlePage.cpp (modified) (2 diffs)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2011-04-15  Chang Shu  <cshu@webkit.org>
+
+        Reviewed by Alexey Proskuryakov.
+
+        When a message with url embedded is added to console, the "file:" scheme
+        and path should be stripped.
+        https://bugs.webkit.org/show_bug.cgi?id=58665
+
+        Unskip passed tests.
+
+        * platform/mac-wk2/Skipped:
+        * platform/qt-wk2/Skipped:
+
 2011-04-15  Vsevolod Vlasov  <vsevik@chromium.org>
 

trunk/LayoutTests/platform/mac-wk2/Skipped

@@ -1891 +1891 @@
 fast/workers/storage/interrupt-database.html
 fast/workers/storage/use-same-database-in-page-and-workers.html
-fast/xmlhttprequest/xmlhttprequest-no-file-access.html
 fast/xmlhttprequest/xmlhttprequest-nonexistent-file.html
 http/tests/appcache/different-https-origin-resource-main.html

trunk/LayoutTests/platform/qt-wk2/Skipped

@@ -2152 +2152 @@
 fast/workers/storage/change-version-handle-reuse-sync.html
 fast/workers/storage/multiple-databases-garbage-collection.html
-fast/xmlhttprequest/xmlhttprequest-no-file-access.html
 fast/xmlhttprequest/xmlhttprequest-nonexistent-file.html
 storage/open-database-while-transaction-in-progress.html

trunk/Tools/ChangeLog

@@ +1 @@
+2011-04-15  Chang Shu  <cshu@webkit.org>
+
+        Reviewed by Alexey Proskuryakov.
+
+        When a message with url embedded is added to console, the "file:" scheme
+        and path should be stripped.
+        https://bugs.webkit.org/show_bug.cgi?id=58665
+
+        * WebKitTestRunner/InjectedBundle/InjectedBundlePage.cpp:
+        (WTR::lastFileURLPathComponent):
+        (WTR::InjectedBundlePage::willAddMessageToConsole):
+
 2011-04-15  Jeff Miller  <jeffm@apple.com>
 

trunk/Tools/WebKitTestRunner/InjectedBundle/InjectedBundlePage.cpp

@@ -749 +749 @@
 }
 
+static string lastFileURLPathComponent(const string& path)
+{
+    size_t pos = path.find("file://");
+    ASSERT(string::npos != pos);
+
+    string tmpPath = path.substr(pos + 7);
+    if (tmpPath.empty())
+        return tmpPath;
+
+    // Remove the trailing delimiter
+    if (tmpPath[tmpPath.length() - 1] == '/')
+        tmpPath.erase(tmpPath.length() - 1);
+
+    pos = tmpPath.rfind('/');
+    if (string::npos != pos)
+        return tmpPath.substr(pos + 1);
+
+    return tmpPath;
+}
+
 void InjectedBundlePage::willAddMessageToConsole(WKStringRef message, uint32_t lineNumber)
 {
@@ -754 +774 @@
         return;
 
-    // FIXME: Strip file: urls.
-    InjectedBundle::shared().os() << "CONSOLE MESSAGE: line " << lineNumber << ": " << message << "\n";
+    string messageString = toSTD(message);
+    size_t fileProtocolStart = messageString.find("file://");
+    if (fileProtocolStart != string::npos)
+        // FIXME: The code below does not handle additional text after url nor multiple urls. This matches DumpRenderTree implementation.
+        messageString = messageString.substr(0, fileProtocolStart) + lastFileURLPathComponent(messageString.substr(fileProtocolStart));
+
+    InjectedBundle::shared().os() << "CONSOLE MESSAGE: line " << lineNumber << ": " << messageString << "\n";
 }