Changeset 62769 in webkit
- Timestamp:
- Jul 8, 2010 1:40:17 AM (14 years ago)
- Location:
- trunk
- Files:
-
- 1 added
- 10 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/LayoutTests/ChangeLog
r62753 r62769 1 2010-07-08 Yury Semikhatsky <yurys@chromium.org> 2 3 Reviewed by Pavel Feldman. 4 5 Web Inspector: factor out common part of debugger tests. Also explicitely disable debugger when test is complete. 6 https://bugs.webkit.org/show_bug.cgi?id=41836 7 8 * http/tests/inspector/debugger-test.js: Added. 9 (frontend_ensureDebuggerEnabled): 10 (frontend_ensureDebuggerDisabled): 11 (frontend_completeDebuggerTest): 12 * http/tests/inspector/inspector-test.js: 13 (completeTest): 14 * inspector/debugger-pause-in-eval-script-expected.txt: 15 * inspector/debugger-pause-in-eval-script.html: 16 * inspector/debugger-pause-on-debugger-statement-expected.txt: 17 * inspector/debugger-pause-on-debugger-statement.html: 18 * inspector/debugger-proto-property-expected.txt: 19 * inspector/debugger-proto-property.html: 20 1 21 2010-07-07 Nicolas Weber <thakis@chromium.org> 2 22 -
trunk/LayoutTests/http/tests/inspector/inspector-test.js
r62630 r62769 68 68 } else 69 69 output(result); 70 } 71 72 function completeTest(result) 73 { 74 dumpArray(result); 75 notifyDone(); 70 76 } 71 77 -
trunk/LayoutTests/inspector/debugger-pause-in-eval-script-expected.txt
r61859 r62769 7 7 Execution line text: debugger; 8 8 Resumed script execution. 9 Disabled debugger. 9 10 -
trunk/LayoutTests/inspector/debugger-pause-in-eval-script.html
r61859 r62769 2 2 <head> 3 3 <script src="../http/tests/inspector/inspector-test.js"></script> 4 <script src="../http/tests/inspector/debugger-test.js"></script> 4 5 <script> 5 6 6 7 function doit() 7 8 { 8 function callback(result) 9 { 10 if (result instanceof Array) { 11 for (var i = 0; i < result.length; i++) 12 output(result[i]); 13 } else 14 output(result); 15 notifyDone(); 16 } 17 evaluateInWebInspector("frontend_testPauseOnDebuggerStatement", callback); 9 evaluateInWebInspector("frontend_testPauseOnDebuggerStatement", completeTest); 18 10 } 19 11 … … 44 36 { 45 37 testController.results.push("Script execution paused."); 46 frontend_checkExecutionLineWhenSourceFrameIsLoaded(testController, completeTest);38 frontend_checkExecutionLineWhenSourceFrameIsLoaded(testController, frontend_completeDebuggerTest.bind(null, testController)); 47 39 }); 48 49 function completeTest()50 {51 if (WebInspector.panels.scripts.paused)52 WebInspector.panels.scripts._togglePause();53 testController.results.push("Resumed script execution.");54 testController.notifyDone();55 }56 }57 58 function frontend_ensureDebuggerEnabled(callback)59 {60 if (WebInspector.panels.scripts._debuggerEnabled) {61 callback();62 return;63 }64 65 frontend_addSniffer(WebInspector, "debuggerWasEnabled", callback);66 WebInspector.panels.scripts._toggleDebugging(false);67 40 } 68 41 … … 75 48 callback(); 76 49 } else { 77 setTimeout(function() {50 frontend_addSniffer(sourceFrame, "setContent", function() { 78 51 frontend_checkExecutionLineWhenSourceFrameIsLoaded(testController, callback); 79 } , 100);52 }); 80 53 } 81 54 } -
trunk/LayoutTests/inspector/debugger-pause-on-debugger-statement-expected.txt
r61749 r62769 5 5 Script execution paused. 6 6 Resumed script execution. 7 Disabled debugger. 7 8 -
trunk/LayoutTests/inspector/debugger-pause-on-debugger-statement.html
r61749 r62769 2 2 <head> 3 3 <script src="../http/tests/inspector/inspector-test.js"></script> 4 <script src="../http/tests/inspector/debugger-test.js"></script> 4 5 <script> 5 6 … … 10 11 function doit() 11 12 { 12 function callback(result) 13 { 14 if (result instanceof Array) { 15 for (var i = 0; i < result.length; i++) 16 output(result[i]); 17 } else 18 output(result); 19 notifyDone(); 20 } 21 evaluateInWebInspector("frontend_testPauseOnDebuggerStatement", callback); 13 evaluateInWebInspector("frontend_testPauseOnDebuggerStatement", completeTest); 22 14 } 23 15 … … 41 33 { 42 34 testController.results.push("Script execution paused."); 43 if (WebInspector.panels.scripts.paused) 44 WebInspector.panels.scripts._togglePause(); 45 testController.results.push("Resumed script execution."); 46 testController.notifyDone(); 35 frontend_completeDebuggerTest(testController); 47 36 }); 48 }49 50 function frontend_ensureDebuggerEnabled(callback)51 {52 if (WebInspector.panels.scripts._debuggerEnabled) {53 callback();54 return;55 }56 57 frontend_addSniffer(WebInspector, "debuggerWasEnabled", callback);58 WebInspector.panels.scripts._toggleDebugging(false);59 37 } 60 38 -
trunk/LayoutTests/inspector/debugger-proto-property-expected.txt
r61997 r62769 7 7 Expanded property: d.__proto__.__proto__.__proto__.__proto__.__proto__ 8 8 Resumed script execution. 9 Disabled debugger. 9 10 -
trunk/LayoutTests/inspector/debugger-proto-property.html
r61997 r62769 2 2 <head> 3 3 <script src="../http/tests/inspector/inspector-test.js"></script> 4 <script src="../http/tests/inspector/debugger-test.js"></script> 4 5 <script> 5 6 … … 18 19 function doit() 19 20 { 20 function callback(result) 21 { 22 if (result instanceof Array) { 23 for (var i = 0; i < result.length; i++) 24 output(result[i]); 25 } else 26 output(result); 27 notifyDone(); 28 } 29 evaluateInWebInspector("frontend_testProtoPropertyOnPause", callback); 21 evaluateInWebInspector("frontend_testProtoPropertyOnPause", completeTest); 30 22 } 31 23 … … 55 47 localScope, ["d", "__proto__", "__proto__", "__proto__", "__proto__", "__proto__"] 56 48 ]; 57 frontend_expandProperties(testController, properties, completeTest);49 frontend_expandProperties(testController, properties, frontend_completeDebuggerTest.bind(null, testController)); 58 50 }); 59 60 function completeTest()61 {62 if (WebInspector.panels.scripts.paused)63 WebInspector.panels.scripts._togglePause();64 testController.results.push("Resumed script execution.");65 testController.notifyDone();66 }67 51 } 68 52 … … 115 99 } 116 100 117 function frontend_ensureDebuggerEnabled(callback)118 {119 if (WebInspector.panels.scripts._debuggerEnabled) {120 callback();121 return;122 }123 124 frontend_addSniffer(WebInspector, "debuggerWasEnabled", callback);125 WebInspector.panels.scripts._toggleDebugging(false);126 }127 128 101 </script> 129 102 </head> -
trunk/WebCore/ChangeLog
r62767 r62769 1 2010-07-08 Yury Semikhatsky <yurys@chromium.org> 2 3 Reviewed by Pavel Feldman. 4 5 Web Inspector: factor out common part of debugger tests 6 https://bugs.webkit.org/show_bug.cgi?id=41836 7 8 * bindings/js/ScriptDebugServer.cpp: 9 (WebCore::ScriptDebugServer::recompileAllJSFunctions): postpone script recompilation if JS stack is not empty. 10 1 11 2010-07-08 Patrick Gansterer <paroga@paroga.com> 2 12 -
trunk/WebCore/bindings/js/ScriptDebugServer.cpp
r62095 r62769 569 569 { 570 570 JSLock lock(SilenceAssertionsOnly); 571 Debugger::recompileAllJSFunctions(JSDOMWindow::commonJSGlobalData()); 571 // If JavaScript stack is not empty postpone recompilation. 572 if (JSDOMWindow::commonJSGlobalData()->dynamicGlobalObject) 573 recompileAllJSFunctionsSoon(); 574 else 575 Debugger::recompileAllJSFunctions(JSDOMWindow::commonJSGlobalData()); 572 576 } 573 577
Note: See TracChangeset
for help on using the changeset viewer.