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

yurys at chromium.org yurys at chromium.org
Wed Dec 22 12:04:04 UTC 2010


The following commit has been merged in the debian/experimental branch:
commit d0936bf5b72df2108d64409ce63e32a2f71337db
Author: yurys at chromium.org <yurys at chromium.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Fri Aug 13 12:11:24 2010 +0000

    2010-08-13  Yury Semikhatsky  <yurys at chromium.org>
    
            Reviewed by Pavel Feldman.
    
            Web Inspector: DRT sometimes crashes on debugger tests
            https://bugs.webkit.org/show_bug.cgi?id=43964
            notifyDone() should be called only when debugger already resumed all active DOM objects,
            otherwise we might accidentally call setTimeout in the inspected page and create
            a new active DOM object while their set should remain unchanged when script execution
            is paused.
    
            * inspector/debugger-cyclic-ref.html:
            * inspector/debugger-eval-while-paused.html:
            * inspector/debugger-no-nested-pause.html:
            * inspector/debugger-pause-in-eval-script.html:
            * inspector/debugger-pause-on-debugger-statement.html:
            * inspector/debugger-proto-property.html:
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@65315 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
index d4aa32a..7f6cce8 100644
--- a/LayoutTests/ChangeLog
+++ b/LayoutTests/ChangeLog
@@ -1,3 +1,21 @@
+2010-08-13  Yury Semikhatsky  <yurys at chromium.org>
+
+        Reviewed by Pavel Feldman.
+
+        Web Inspector: DRT sometimes crashes on debugger tests
+        https://bugs.webkit.org/show_bug.cgi?id=43964
+        notifyDone() should be called only when debugger already resumed all active DOM objects,
+        otherwise we might accidentally call setTimeout in the inspected page and create
+        a new active DOM object while their set should remain unchanged when script execution
+        is paused.
+
+        * inspector/debugger-cyclic-ref.html:
+        * inspector/debugger-eval-while-paused.html:
+        * inspector/debugger-no-nested-pause.html:
+        * inspector/debugger-pause-in-eval-script.html:
+        * inspector/debugger-pause-on-debugger-statement.html:
+        * inspector/debugger-proto-property.html:
+
 2010-08-12  Nikolas Zimmermann  <nzimmermann at rim.com>
 
         Reviewed by Dirk Schulze.
diff --git a/LayoutTests/inspector/debugger-cyclic-ref.html b/LayoutTests/inspector/debugger-cyclic-ref.html
index b3fa660..8d51bc4 100755
--- a/LayoutTests/inspector/debugger-cyclic-ref.html
+++ b/LayoutTests/inspector/debugger-cyclic-ref.html
@@ -10,11 +10,12 @@ function testFunction()
 {
     var o = new Object();
     debugger;
+    notifyDone();
 }
 
 function doit()
 {
-    evaluateInWebInspector("frontend_testDebugObjectWithCyclicRef", completeTest);
+    evaluateInWebInspector("frontend_testDebugObjectWithCyclicRef", dumpArray);
 }
 
 function frontend_testDebugObjectWithCyclicRef(testController)
diff --git a/LayoutTests/inspector/debugger-eval-while-paused.html b/LayoutTests/inspector/debugger-eval-while-paused.html
index 23eaad8..15b20a8 100644
--- a/LayoutTests/inspector/debugger-eval-while-paused.html
+++ b/LayoutTests/inspector/debugger-eval-while-paused.html
@@ -9,6 +9,7 @@ var globalVar = { b: 1 };
 function slave(x) {
     var y = 20;
     debugger;
+    notifyDone();
 }
 
 function testFunction() {
@@ -18,7 +19,7 @@ function testFunction() {
 
 function doit()
 {
-    evaluateInWebInspector("frontend_testPauseOnDebuggerStatement", completeTest);
+    evaluateInWebInspector("frontend_testPauseOnDebuggerStatement", dumpArray);
 }
 
 function frontend_testPauseOnDebuggerStatement(testController)
diff --git a/LayoutTests/inspector/debugger-no-nested-pause.html b/LayoutTests/inspector/debugger-no-nested-pause.html
index f183105..df8c5e6 100644
--- a/LayoutTests/inspector/debugger-no-nested-pause.html
+++ b/LayoutTests/inspector/debugger-no-nested-pause.html
@@ -8,12 +8,15 @@ function testFunction()
 {
     testFunction.invocationCount++;
     debugger;
+    if (testFunction.didExitFromNestedCall)
+        notifyDone();
+    testFunction.didExitFromNestedCall = true;
 }
 testFunction.invocationCount = 0;
 
 function doit()
 {
-    evaluateInWebInspector("frontend_testNoNestedPause", completeTest);
+    evaluateInWebInspector("frontend_testNoNestedPause", dumpArray);
 }
 
 function frontend_testNoNestedPause(testController)
diff --git a/LayoutTests/inspector/debugger-pause-in-eval-script.html b/LayoutTests/inspector/debugger-pause-in-eval-script.html
index cae2a94..c655ab6 100644
--- a/LayoutTests/inspector/debugger-pause-in-eval-script.html
+++ b/LayoutTests/inspector/debugger-pause-in-eval-script.html
@@ -6,7 +6,7 @@
 
 function doit()
 {
-    evaluateInWebInspector("frontend_testPauseOnDebuggerStatement", completeTest);
+    evaluateInWebInspector("frontend_testPauseOnDebuggerStatement", dumpArray);
 }
 
 function frontend_testPauseOnDebuggerStatement(testController)
@@ -17,6 +17,7 @@ function frontend_testPauseOnDebuggerStatement(testController)
 
     var scriptToEvaluate = "function testFunction() {\n" +
                            "    debugger;\n" +
+                           "    notifyDone();\n" +
                            "}\n" +
                            "setTimeout(testFunction, 0);\n";
     function debuggerWasEnabledCallback()
diff --git a/LayoutTests/inspector/debugger-pause-on-debugger-statement.html b/LayoutTests/inspector/debugger-pause-on-debugger-statement.html
index 242c287..74196ca 100644
--- a/LayoutTests/inspector/debugger-pause-on-debugger-statement.html
+++ b/LayoutTests/inspector/debugger-pause-on-debugger-statement.html
@@ -6,11 +6,12 @@
 
 function testFunction() {
     debugger;
+    notifyDone();
 }
 
 function doit()
 {
-    evaluateInWebInspector("frontend_testPauseOnDebuggerStatement", completeTest);
+    evaluateInWebInspector("frontend_testPauseOnDebuggerStatement", dumpArray);
 }
 
 function frontend_testPauseOnDebuggerStatement(testController)
diff --git a/LayoutTests/inspector/debugger-proto-property.html b/LayoutTests/inspector/debugger-proto-property.html
index 4d11b00..51a7466 100644
--- a/LayoutTests/inspector/debugger-proto-property.html
+++ b/LayoutTests/inspector/debugger-proto-property.html
@@ -14,11 +14,12 @@ function testFunction() {
     var o = new C();
     var d = document.documentElement;
     debugger;
+    notifyDone();
 }
 
 function doit()
 {
-    evaluateInWebInspector("frontend_testProtoPropertyOnPause", completeTest);
+    evaluateInWebInspector("frontend_testProtoPropertyOnPause", dumpArray);
 }
 
 function frontend_testProtoPropertyOnPause(testController)

-- 
WebKit Debian packaging



More information about the Pkg-webkit-commits mailing list