Changeset 54138 in webkit

Timestamp:

Feb 1, 2010 10:35:32 AM (14 years ago)

Author:

benm@google.com

Message:

ScriptCallFrame's do not get line numbers/source id's if the caller is unkown.
​https://bugs.webkit.org/show_bug.cgi?id=34335

Reviewed by Darin Adler.

WebCore:

• bindings/js/ScriptCallStack.cpp:

(WebCore::ScriptCallStack::ScriptCallStack): If the caller is unknown, the line number and source information is still availble so pass it to the ScriptCallFrame being constructed.

LayoutTests:

Update layout tests that did not have source and line number information for their console messages, as this information is now available to the ScriptCallFrame and thus can be passed to the inspector, for example.

• fast/js/console-non-string-values-expected.txt: Add console line number/source.
• userscripts/script-not-run-for-fragments-expected.txt: ditto.
• userscripts/script-run-at-start-expected.txt: ditto.
• platform/gtk/inspector/console-log-before-inspector-open-expected.txt: Removed as platform workarounds no longer necessary.
• platform/mac/inspector/console-log-before-inspector-open-expected.txt: ditto.
• platform/win/inspector/console-log-before-inspector-open-expected.txt: ditto.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/fast/js/console-non-string-values-expected.txt (modified) (1 diff)
• LayoutTests/platform/gtk/inspector/console-log-before-inspector-open-expected.txt (deleted)
• LayoutTests/platform/mac/inspector/console-log-before-inspector-open-expected.txt (deleted)
• LayoutTests/platform/win/inspector/console-log-before-inspector-open-expected.txt (deleted)
• LayoutTests/userscripts/script-not-run-for-fragments-expected.txt (modified) (1 diff)
• LayoutTests/userscripts/script-run-at-start-expected.txt (modified) (1 diff)
• WebCore/ChangeLog (modified) (1 diff)
• WebCore/bindings/js/ScriptCallStack.cpp (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2010-02-01  Ben Murdoch  <benm@google.com>
+
+        Reviewed by Darin Adler.
+
+        ScriptCallFrame's do not get line numbers/source id's if the caller is unkown.
+        https://bugs.webkit.org/show_bug.cgi?id=34335
+
+        Update layout tests that did not have source and line number information for their console messages, as this information is now available to the ScriptCallFrame and thus can be passed to the inspector, for example.
+
+        * fast/js/console-non-string-values-expected.txt: Add console line number/source.
+        * userscripts/script-not-run-for-fragments-expected.txt: ditto.
+        * userscripts/script-run-at-start-expected.txt: ditto.
+        * platform/gtk/inspector/console-log-before-inspector-open-expected.txt: Removed as platform workarounds no longer necessary.
+        * platform/mac/inspector/console-log-before-inspector-open-expected.txt: ditto.
+        * platform/win/inspector/console-log-before-inspector-open-expected.txt: ditto.
+ 
+
 2010-02-01  Csaba Osztrogonác  <ossy@webkit.org>
 

trunk/LayoutTests/fast/js/console-non-string-values-expected.txt

@@ -1 @@
-CONSOLE MESSAGE: line 0: I am a string
-CONSOLE MESSAGE: line 0: 42
+CONSOLE MESSAGE: line 12: I am a string
+CONSOLE MESSAGE: line 13: 42
 Should see two console messages, the first a string, and the second a number.
 PASS successfullyParsed is true

trunk/LayoutTests/userscripts/script-not-run-for-fragments-expected.txt

@@ -1 @@
-CONSOLE MESSAGE: line 0: injected
-CONSOLE MESSAGE: line 0: injected
+CONSOLE MESSAGE: line 1: injected
+CONSOLE MESSAGE: line 1: injected
 This test should not infinitely inject user scripts. 

trunk/LayoutTests/userscripts/script-run-at-start-expected.txt

@@ -1 @@
-CONSOLE MESSAGE: line 0: SUCCESS
-CONSOLE MESSAGE: line 0: SUCCESS
+CONSOLE MESSAGE: line 1: SUCCESS
+CONSOLE MESSAGE: line 1: SUCCESS
 This test should log a console message on success. 

trunk/WebCore/ChangeLog

@@ +1 @@
+2010-02-01  Ben Murdoch  <benm@google.com>
+
+        Reviewed by Darin Adler.
+
+        ScriptCallFrame's do not get line numbers/source id's if the caller is unkown.
+        https://bugs.webkit.org/show_bug.cgi?id=34335
+
+        * bindings/js/ScriptCallStack.cpp:
+        (WebCore::ScriptCallStack::ScriptCallStack): If the caller is unknown, the line number and source information is still availble so pass it to the ScriptCallFrame being constructed.
+
 2010-02-01  Dirk Schulze  <krit@webkit.org>
 

trunk/WebCore/bindings/js/ScriptCallStack.cpp

@@ -55 +55 @@
     exec->interpreter()->retrieveLastCaller(exec, signedLineNumber, sourceID, urlString, function);
 
+    unsigned lineNumber = signedLineNumber >= 0 ? signedLineNumber : 0;
+
     if (function) {
         m_caller = asInternalFunction(function);
-        unsigned lineNumber = signedLineNumber >= 0 ? signedLineNumber : 0;
         m_frames.append(ScriptCallFrame(m_caller->name(m_exec), urlString, lineNumber, args, skipArgumentCount));
     } else {
         // Caller is unknown, but we should still add the frame, because
         // something called us, and gave us arguments.
-        m_frames.append(ScriptCallFrame(UString(), UString(), 0, args, skipArgumentCount));
+        m_frames.append(ScriptCallFrame(UString(), urlString, lineNumber, args, skipArgumentCount));
     }
 }