Changeset 143240 in webkit

Timestamp:

Feb 18, 2013 10:33:04 AM (11 years ago)

Author:

commit-queue@webkit.org

Message:

[JSC]: ASSERT in KURL(ParsedURLStringTag) under sourceMapURLForScript
​https://bugs.webkit.org/show_bug.cgi?id=109987

Patch by Joseph Pecoraro <Joseph Pecoraro> on 2013-02-18
Reviewed by Pavel Feldman.

Source/WebCore:

Improved an existing test to cover this.

• bindings/js/ScriptDebugServer.cpp:

(WebCore::ScriptDebugServer::dispatchDidParseSource):
Remove the sourceURL parsing and script.url replacement from the JSC
implementation of ScriptDebugServer. The WebCore inspector code that
this was added for already does this, at a more appropriate time.

LayoutTests:

• inspector/debugger/source-url-comment-expected.txt:
• inspector/debugger/source-url-comment.html:

Add a test for a sourceURL with a non-relative path. This was causing
an ASSERT, rightfully so, in JSC builds.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/inspector/debugger/source-url-comment-expected.txt (modified) (1 diff)
• LayoutTests/inspector/debugger/source-url-comment.html (modified) (2 diffs)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/bindings/js/ScriptDebugServer.cpp (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2013-02-18  Joseph Pecoraro  <pecoraro@apple.com>
+
+        [JSC]: ASSERT in KURL(ParsedURLStringTag) under sourceMapURLForScript
+        https://bugs.webkit.org/show_bug.cgi?id=109987
+
+        Reviewed by Pavel Feldman.
+
+        * inspector/debugger/source-url-comment-expected.txt:
+        * inspector/debugger/source-url-comment.html:
+        Add a test for a sourceURL with a non-relative path. This was causing
+        an ASSERT, rightfully so, in JSC builds.
+
 2013-02-18  Mike West  <mkwst@chromium.org>
 

trunk/LayoutTests/inspector/debugger/source-url-comment-expected.txt

@@ -12 +12 @@
 function keepAliveInDynamicScript() {}
 //@ sourceURL=dynamicScriptURL.js
+
+Running: testNonRelativeURL
+function relativeURLScript() {}
+//@ sourceURL=/js/nonRelativeURL.js
 Debugger was disabled.
 

trunk/LayoutTests/inspector/debugger/source-url-comment.html

@@ -12 +12 @@
 {
     eval("function keepAlive() {}\n//@ sourceURL=evalURL.js");
+}
+
+function doEvalWithNonRelativeURL()
+{
+    eval("function relativeURLScript() {}\n//@ sourceURL=/js/nonRelativeURL.js");
 }
 
@@ -88 +93 @@
                 next();
             }
+        },
+
+        function testNonRelativeURL(next)
+        {
+            InspectorTest.showScriptSource("nonRelativeURL.js", didShowScriptSource);
+            InspectorTest.evaluateInPage("setTimeout(doEvalWithNonRelativeURL, 0)");
+
+            function didShowScriptSource(sourceFrame)
+            {
+                function checkScriptHasSourceURL(script)
+                {
+                    InspectorTest.assertTrue(script.hasSourceURL, "hasSourceURL flag is not set for eval with a non-relative URL in a sourceURL comment");
+                }
+
+                InspectorTest.addResult(sourceFrame.textEditor.text());
+                forEachScriptMatchingURL("nonRelativeURL.js", checkScriptHasSourceURL);
+                next();
+            }
         }
     ]);

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2013-02-18  Joseph Pecoraro  <pecoraro@apple.com>
+
+        [JSC]: ASSERT in KURL(ParsedURLStringTag) under sourceMapURLForScript
+        https://bugs.webkit.org/show_bug.cgi?id=109987
+
+        Reviewed by Pavel Feldman.
+
+        Improved an existing test to cover this.
+
+        * bindings/js/ScriptDebugServer.cpp:
+        (WebCore::ScriptDebugServer::dispatchDidParseSource):
+        Remove the sourceURL parsing and script.url replacement from the JSC
+        implementation of ScriptDebugServer. The WebCore inspector code that
+        this was added for already does this, at a more appropriate time.
+
 2013-02-18  Mike West  <mkwst@chromium.org>
 

trunk/Source/WebCore/bindings/js/ScriptDebugServer.cpp

@@ -293 +293 @@
     script.isContentScript = isContentScript;
 
-#if ENABLE(INSPECTOR)
-    if (!script.startLine && !script.startColumn) {
-        String sourceURL = ContentSearchUtils::findSourceURL(script.source);
-        if (!sourceURL.isEmpty())
-            script.url = sourceURL;
-    }
-#endif
-
     int sourceLength = script.source.length();
     int lineCount = 1;