[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-9427-gc2be6fc
commit-queue at webkit.org
commit-queue at webkit.org
Wed Dec 22 13:07:03 UTC 2010
The following commit has been merged in the debian/experimental branch:
commit 359f7755430fa52df62f122cd8b62ff35c00a1c6
Author: commit-queue at webkit.org <commit-queue at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Tue Sep 7 12:28:32 2010 +0000
2010-09-07 Pavel Podivilov <podivilov at chromium.org>
Reviewed by Yury Semikhatsky.
Web Inspector: upstream two debugger tests
https://bugs.webkit.org/show_bug.cgi?id=45262
* inspector/debugger-pause-on-breakpoint-expected.txt: Added.
* inspector/debugger-pause-on-breakpoint.html: Added.
* inspector/debugger-pause-on-exception-expected.txt: Added.
* inspector/debugger-pause-on-exception.html: Added.
* platform/chromium/inspector/debugger-pause-on-exception-expected.txt: Added.
2010-09-07 Pavel Podivilov <podivilov at chromium.org>
Reviewed by Yury Semikhatsky.
Web Inspector: upstream two debugger tests
https://bugs.webkit.org/show_bug.cgi?id=45262
* src/js/Tests.js:
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@66877 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
index c18a98b..fb66141 100644
--- a/LayoutTests/ChangeLog
+++ b/LayoutTests/ChangeLog
@@ -1,3 +1,16 @@
+2010-09-07 Pavel Podivilov <podivilov at chromium.org>
+
+ Reviewed by Yury Semikhatsky.
+
+ Web Inspector: upstream two debugger tests
+ https://bugs.webkit.org/show_bug.cgi?id=45262
+
+ * inspector/debugger-pause-on-breakpoint-expected.txt: Added.
+ * inspector/debugger-pause-on-breakpoint.html: Added.
+ * inspector/debugger-pause-on-exception-expected.txt: Added.
+ * inspector/debugger-pause-on-exception.html: Added.
+ * platform/chromium/inspector/debugger-pause-on-exception-expected.txt: Added.
+
2010-09-07 Steve Block <steveblock at google.com>
Reviewed by Jeremy Orlow.
diff --git a/LayoutTests/inspector/debugger-pause-on-breakpoint-expected.txt b/LayoutTests/inspector/debugger-pause-on-breakpoint-expected.txt
new file mode 100644
index 0000000..9b9703c
--- /dev/null
+++ b/LayoutTests/inspector/debugger-pause-on-breakpoint-expected.txt
@@ -0,0 +1,11 @@
+Tests that debugger will stop on breakpoint.
+
+Debugger was enabled.
+Script source was shown.
+Set timer for test function.
+Script execution paused.
+Call stack:
+ 0) testFunction (debugger-pause-on-breakpoint.html:9)
+Script execution resumed.
+Debugger was disabled.
+
diff --git a/LayoutTests/inspector/debugger-pause-on-breakpoint.html b/LayoutTests/inspector/debugger-pause-on-breakpoint.html
new file mode 100644
index 0000000..8398d59
--- /dev/null
+++ b/LayoutTests/inspector/debugger-pause-on-breakpoint.html
@@ -0,0 +1,45 @@
+<html>
+<head>
+<script src="../http/tests/inspector/inspector-test2.js"></script>
+<script src="../http/tests/inspector/debugger-test2.js"></script>
+<script>
+
+function testFunction()
+{
+ var x = Math.sqrt(10);
+ return x;
+}
+
+var test = function()
+{
+ InspectorTest.startDebuggerTest(step1);
+
+ function step1()
+ {
+ InspectorTest.showScriptSource("debugger-pause-on-breakpoint.html", step2);
+ }
+
+ function step2()
+ {
+ InspectorTest.addResult("Script source was shown.");
+ WebInspector.panels.scripts.visibleView._addBreakpoint(9);
+ InspectorTest.runTestFunctionAndWaitUntilPaused(step3);
+ }
+
+ function step3(callFrames)
+ {
+ InspectorTest.captureStackTrace(callFrames);
+ InspectorTest.completeDebuggerTest();
+ }
+}
+
+</script>
+</head>
+
+<body onload="runTest()">
+<p>
+Tests that debugger will stop on breakpoint.
+</p>
+
+</body>
+</html>
diff --git a/LayoutTests/inspector/debugger-pause-on-exception-expected.txt b/LayoutTests/inspector/debugger-pause-on-exception-expected.txt
new file mode 100644
index 0000000..77daa9f
--- /dev/null
+++ b/LayoutTests/inspector/debugger-pause-on-exception-expected.txt
@@ -0,0 +1,12 @@
+CONSOLE MESSAGE: line 9: ReferenceError: Can't find variable: unknown_var
+Tests that pause on exception works.
+
+Debugger was enabled.
+Script source was shown.
+Script execution paused.
+Call stack:
+ 0) throwAnException (debugger-pause-on-exception.html:9)
+ 1) handleClick (debugger-pause-on-exception.html:14)
+Script execution resumed.
+Debugger was disabled.
+
diff --git a/LayoutTests/inspector/debugger-pause-on-exception.html b/LayoutTests/inspector/debugger-pause-on-exception.html
new file mode 100644
index 0000000..bee76a9
--- /dev/null
+++ b/LayoutTests/inspector/debugger-pause-on-exception.html
@@ -0,0 +1,50 @@
+<html>
+<head>
+<script src="../http/tests/inspector/inspector-test2.js"></script>
+<script src="../http/tests/inspector/debugger-test2.js"></script>
+<script>
+
+function throwAnException()
+{
+ return unknown_var;
+}
+
+function handleClick()
+{
+ throwAnException();
+}
+
+var test = function()
+{
+ InspectorTest.startDebuggerTest(step1);
+
+ function step1()
+ {
+ InspectorBackend.setPauseOnExceptionsState(WebInspector.ScriptsPanel.PauseOnExceptionsState.PauseOnUncaughtExceptions);
+ InspectorTest.showScriptSource("debugger-pause-on-exception.html", step2);
+ }
+
+ function step2()
+ {
+ InspectorTest.addResult("Script source was shown.");
+ InspectorTest.evaluateInPage("setTimeout(handleClick, 0)");
+ InspectorTest.waitUntilPaused(step3);
+ }
+
+ function step3(callFrames)
+ {
+ InspectorTest.captureStackTrace(callFrames);
+ InspectorTest.completeDebuggerTest();
+ }
+}
+
+</script>
+</head>
+
+<body onload="runTest()">
+<p>
+Tests that pause on exception works.
+</p>
+
+</body>
+</html>
diff --git a/LayoutTests/platform/chromium/inspector/debugger-pause-on-exception-expected.txt b/LayoutTests/platform/chromium/inspector/debugger-pause-on-exception-expected.txt
new file mode 100644
index 0000000..ee6391d
--- /dev/null
+++ b/LayoutTests/platform/chromium/inspector/debugger-pause-on-exception-expected.txt
@@ -0,0 +1,12 @@
+CONSOLE MESSAGE: line 9: Uncaught ReferenceError: unknown_var is not defined
+Tests that pause on exception works.
+
+Debugger was enabled.
+Script source was shown.
+Script execution paused.
+Call stack:
+ 0) throwAnException (debugger-pause-on-exception.html:9)
+ 1) handleClick (debugger-pause-on-exception.html:14)
+Script execution resumed.
+Debugger was disabled.
+
diff --git a/WebKit/chromium/ChangeLog b/WebKit/chromium/ChangeLog
index c076901..56a253e 100644
--- a/WebKit/chromium/ChangeLog
+++ b/WebKit/chromium/ChangeLog
@@ -1,3 +1,12 @@
+2010-09-07 Pavel Podivilov <podivilov at chromium.org>
+
+ Reviewed by Yury Semikhatsky.
+
+ Web Inspector: upstream two debugger tests
+ https://bugs.webkit.org/show_bug.cgi?id=45262
+
+ * src/js/Tests.js:
+
2010-09-06 Jonathan Dixon <joth at chromium.org>
Reviewed by Jeremy Orlow.
diff --git a/WebKit/chromium/src/js/Tests.js b/WebKit/chromium/src/js/Tests.js
index ba9a76a..8269022 100644
--- a/WebKit/chromium/src/js/Tests.js
+++ b/WebKit/chromium/src/js/Tests.js
@@ -628,71 +628,6 @@ TestSuite.prototype.testNoScriptDuplicatesOnPanelSwitch = function()
};
-/**
- * Tests that a breakpoint can be set.
- */
-TestSuite.prototype.testSetBreakpoint = function()
-{
- var test = this;
- this.showPanel("scripts");
-
- var breakpointLine = 16
-
- this._waitUntilScriptsAreParsed(["debugger_test_page.html"],
- function() {
- test.showMainPageScriptSource_(
- "debugger_test_page.html",
- function(view, url) {
- view._addBreakpoint(breakpointLine);
-
- test.evaluateInConsole_(
- 'setTimeout("calculate()" , 0)',
- function(resultText) {
- test.assertTrue(!isNaN(resultText), "Failed to get timer id: " + resultText);
- });
- });
- });
-
- this._waitForScriptPause(
- {
- functionsOnStack: ["calculate", ""],
- lineNumber: breakpointLine,
- lineText: " result = fib(lastVal++);"
- },
- function() {
- test.releaseControl();
- });
-
- this.takeControl();
-};
-
-
-/**
- * Tests that pause on exception works.
- */
-TestSuite.prototype.testPauseOnException = function()
-{
- this.showPanel("scripts");
- var test = this;
-
- InspectorBackend.setPauseOnExceptionsState(WebInspector.ScriptsPanel.PauseOnExceptionsState.PauseOnUncaughtExceptions);
-
- this._executeCodeWhenScriptsAreParsed("handleClick()", ["pause_on_exception.html"]);
-
- this._waitForScriptPause(
- {
- functionsOnStack: ["throwAnException", "handleClick", ""],
- lineNumber: 6,
- lineText: " return unknown_var;"
- },
- function() {
- test.releaseControl();
- });
-
- this.takeControl();
-};
-
-
// Tests that debugger works correctly if pause event occurs when DevTools
// frontend is being loaded.
TestSuite.prototype.testPauseWhenLoadingDevTools = function()
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list