[SCM] WebKit Debian packaging branch, webkit-1.2, updated. upstream/1.1.90-6072-g9a69373
benm at google.com
benm at google.com
Thu Apr 8 01:33:17 UTC 2010
The following commit has been merged in the webkit-1.2 branch:
commit b705a057db94b4bd8ab79b61dd54595da2f5464f
Author: benm at google.com <benm at google.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Mon Feb 1 18:35:32 2010 +0000
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.
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@54138 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
index 12d021c..a639c83 100644
--- a/LayoutTests/ChangeLog
+++ b/LayoutTests/ChangeLog
@@ -1,3 +1,20 @@
+2010-02-01 Ben Murdoch <benm at 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 at webkit.org>
Rubber-stamped by Kenneth Rohde Christiansen.
diff --git a/LayoutTests/fast/js/console-non-string-values-expected.txt b/LayoutTests/fast/js/console-non-string-values-expected.txt
index ffd0fe8..3ff7efb 100644
--- a/LayoutTests/fast/js/console-non-string-values-expected.txt
+++ b/LayoutTests/fast/js/console-non-string-values-expected.txt
@@ -1,5 +1,5 @@
-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
diff --git a/LayoutTests/platform/gtk/inspector/console-log-before-inspector-open-expected.txt b/LayoutTests/platform/gtk/inspector/console-log-before-inspector-open-expected.txt
deleted file mode 100644
index 963e6e6..0000000
--- a/LayoutTests/platform/gtk/inspector/console-log-before-inspector-open-expected.txt
+++ /dev/null
@@ -1,13 +0,0 @@
-CONSOLE MESSAGE: line 0: log
-CONSOLE MESSAGE: line 0: debug
-CONSOLE MESSAGE: line 0: info
-CONSOLE MESSAGE: line 0: warn
-CONSOLE MESSAGE: line 0: error
-Tests that Web Inspector won't crash if some console have been logged by the time it's opening.
-
-log
-debug
-info
-warn
-error
-
diff --git a/LayoutTests/platform/mac/inspector/console-log-before-inspector-open-expected.txt b/LayoutTests/platform/mac/inspector/console-log-before-inspector-open-expected.txt
deleted file mode 100644
index 963e6e6..0000000
--- a/LayoutTests/platform/mac/inspector/console-log-before-inspector-open-expected.txt
+++ /dev/null
@@ -1,13 +0,0 @@
-CONSOLE MESSAGE: line 0: log
-CONSOLE MESSAGE: line 0: debug
-CONSOLE MESSAGE: line 0: info
-CONSOLE MESSAGE: line 0: warn
-CONSOLE MESSAGE: line 0: error
-Tests that Web Inspector won't crash if some console have been logged by the time it's opening.
-
-log
-debug
-info
-warn
-error
-
diff --git a/LayoutTests/platform/win/inspector/console-log-before-inspector-open-expected.txt b/LayoutTests/platform/win/inspector/console-log-before-inspector-open-expected.txt
deleted file mode 100644
index 963e6e6..0000000
--- a/LayoutTests/platform/win/inspector/console-log-before-inspector-open-expected.txt
+++ /dev/null
@@ -1,13 +0,0 @@
-CONSOLE MESSAGE: line 0: log
-CONSOLE MESSAGE: line 0: debug
-CONSOLE MESSAGE: line 0: info
-CONSOLE MESSAGE: line 0: warn
-CONSOLE MESSAGE: line 0: error
-Tests that Web Inspector won't crash if some console have been logged by the time it's opening.
-
-log
-debug
-info
-warn
-error
-
diff --git a/LayoutTests/userscripts/script-not-run-for-fragments-expected.txt b/LayoutTests/userscripts/script-not-run-for-fragments-expected.txt
index e952594..0863d2a 100644
--- a/LayoutTests/userscripts/script-not-run-for-fragments-expected.txt
+++ b/LayoutTests/userscripts/script-not-run-for-fragments-expected.txt
@@ -1,3 +1,3 @@
-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.
diff --git a/LayoutTests/userscripts/script-run-at-start-expected.txt b/LayoutTests/userscripts/script-run-at-start-expected.txt
index 04155d0..b73913c 100644
--- a/LayoutTests/userscripts/script-run-at-start-expected.txt
+++ b/LayoutTests/userscripts/script-run-at-start-expected.txt
@@ -1,3 +1,3 @@
-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.
diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 3b321b8..c8d4a15 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,13 @@
+2010-02-01 Ben Murdoch <benm at 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 at webkit.org>
Reviewed by Simon Fraser.
diff --git a/WebCore/bindings/js/ScriptCallStack.cpp b/WebCore/bindings/js/ScriptCallStack.cpp
index 824a07b..a435588 100644
--- a/WebCore/bindings/js/ScriptCallStack.cpp
+++ b/WebCore/bindings/js/ScriptCallStack.cpp
@@ -54,14 +54,15 @@ ScriptCallStack::ScriptCallStack(ExecState* exec, const ArgList& args, unsigned
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));
}
}
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list