[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-9427-gc2be6fc

Wed Dec 22 13:13:09 UTC 2010

The following commit has been merged in the debian/experimental branch:
commit 6d3b1c25208b3a2bea6bbe2fc43af88a63554f17
Author: yurys at chromium.org <yurys at chromium.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Thu Sep 9 00:03:28 2010 +0000

    2010-09-08  Yury Semikhatsky  <yurys at chromium.org>
    
            Reviewed by Joseph Pecoraro.
    
            Web Inspector: test that debugger won't pause on syntax errors
            https://bugs.webkit.org/show_bug.cgi?id=45388
    
            * inspector/debugger-autocontinue-on-syntax-error-expected.txt: Added.
            * inspector/debugger-autocontinue-on-syntax-error.html: Added.
    2010-09-08  Yury Semikhatsky  <yurys at chromium.org>
    
            Reviewed by Joseph Pecoraro.
    
            Web Inspector: test that debugger won't pause on syntax errors
            https://bugs.webkit.org/show_bug.cgi?id=45388
    
            * src/js/Tests.js: removed testAutoContinueOnSyntaxError which is now covered by
            inspector/debugger-autocontinue-on-syntax-error.html layout test
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@67040 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
index fa74363..516a6a0 100644
--- a/LayoutTests/ChangeLog
+++ b/LayoutTests/ChangeLog
@@ -1,3 +1,13 @@
+2010-09-08  Yury Semikhatsky  <yurys at chromium.org>
+
+        Reviewed by Joseph Pecoraro.
+
+        Web Inspector: test that debugger won't pause on syntax errors
+        https://bugs.webkit.org/show_bug.cgi?id=45388
+
+        * inspector/debugger-autocontinue-on-syntax-error-expected.txt: Added.
+        * inspector/debugger-autocontinue-on-syntax-error.html: Added.
+
 2010-09-08  Brian Weinstein  <bweinstein at apple.com>
 
         Rubber-stamped by Steve Falkenburg.
diff --git a/LayoutTests/inspector/debugger-autocontinue-on-syntax-error-expected.txt b/LayoutTests/inspector/debugger-autocontinue-on-syntax-error-expected.txt
new file mode 100644
index 0000000..4b31b6e
--- /dev/null
+++ b/LayoutTests/inspector/debugger-autocontinue-on-syntax-error-expected.txt
@@ -0,0 +1,8 @@
+CONSOLE MESSAGE: line 1: SyntaxError: Parse error
+CONSOLE MESSAGE: line 1: SyntaxError: Parse error
+Tests that debugger won't stop on syntax errors even if "pause on uncaught exceptions" is on.
+
+Debugger was enabled.
+Page reloaded.
+DONE.
+
diff --git a/LayoutTests/inspector/debugger-autocontinue-on-syntax-error.html b/LayoutTests/inspector/debugger-autocontinue-on-syntax-error.html
new file mode 100644
index 0000000..fd56208
--- /dev/null
+++ b/LayoutTests/inspector/debugger-autocontinue-on-syntax-error.html
@@ -0,0 +1,38 @@
+<html>
+<head>
+<script src="../http/tests/inspector/inspector-test2.js"></script>
+<script src="../http/tests/inspector/debugger-test2.js"></script>
+<script src="resources/syntax-error.js"></script>
+<script>
+
+function test()
+{
+    WebInspector.showPanel("scripts");
+    InspectorTest.startDebuggerTest(startDebuggerTestCallback);
+
+    function startDebuggerTestCallback()
+    {
+        InspectorBackend.setPauseOnExceptionsState(WebInspector.ScriptsPanel.PauseOnExceptionsState.PauseOnUncaughtExceptions);
+        InspectorTest.showScriptSource("debugger-autocontinue-on-syntax-error.html", reloadInspectedPage);
+    }
+
+    function reloadInspectedPage()
+    {
+        InspectorTest.reloadPage(function() {
+            InspectorTest.addResult("DONE.");
+            InspectorTest.completeTest();
+        });
+    }
+
+}
+
+</script>
+</head>
+
+<body onload="runTest()">
+<p>
+Tests that debugger won't stop on syntax errors even if "pause on uncaught exceptions" is on.
+</p>
+
+</body>
+</html>
diff --git a/WebKit/chromium/ChangeLog b/WebKit/chromium/ChangeLog
index 4e8f366..b5e654f 100644
--- a/WebKit/chromium/ChangeLog
+++ b/WebKit/chromium/ChangeLog
@@ -1,3 +1,13 @@
+2010-09-08  Yury Semikhatsky  <yurys at chromium.org>
+
+        Reviewed by Joseph Pecoraro.
+
+        Web Inspector: test that debugger won't pause on syntax errors
+        https://bugs.webkit.org/show_bug.cgi?id=45388
+
+        * src/js/Tests.js: removed testAutoContinueOnSyntaxError which is now covered by 
+        inspector/debugger-autocontinue-on-syntax-error.html layout test
+
 2010-09-08  Peter Kasting  <pkasting at google.com>
 
         Reviewed by David Hyatt.
diff --git a/WebKit/chromium/src/js/Tests.js b/WebKit/chromium/src/js/Tests.js
index f528d2d..40bb130 100644
--- a/WebKit/chromium/src/js/Tests.js
+++ b/WebKit/chromium/src/js/Tests.js
@@ -821,16 +821,6 @@ TestSuite.prototype.testCompletionOnPause = function()
 
 
 /**
- * Tests that inspected page doesn't hang on reload if it contains a syntax
- * error and DevTools window is open.
- */
-TestSuite.prototype.testAutoContinueOnSyntaxError = function()
-{
-    // TODO(yurys): provide an implementation that works with ScriptDebugServer.
-};
-
-
-/**
  * Checks current execution line against expectations.
  * @param {WebInspector.SourceFrame} sourceFrame
  * @param {number} lineNumber Expected line number

-- 
WebKit Debian packaging

