Title: [97245] trunk/Source/WebKit/chromium
- Revision
- 97245
- Author
- [email protected]
- Date
- 2011-10-12 02:07:40 -0700 (Wed, 12 Oct 2011)
Log Message
[Chromium] Web Inspector: repair interactive tests for debugger pause
https://bugs.webkit.org/show_bug.cgi?id=69912
Listen to DebuggerModel event instead of overriding private methods on it.
Reviewed by Pavel Feldman.
* src/js/Tests.js:
(.TestSuite.prototype._waitForScriptPause):
Modified Paths
Diff
Modified: trunk/Source/WebKit/chromium/ChangeLog (97244 => 97245)
--- trunk/Source/WebKit/chromium/ChangeLog 2011-10-12 09:07:05 UTC (rev 97244)
+++ trunk/Source/WebKit/chromium/ChangeLog 2011-10-12 09:07:40 UTC (rev 97245)
@@ -1,3 +1,15 @@
+2011-10-12 Yury Semikhatsky <[email protected]>
+
+ [Chromium] Web Inspector: repair interactive tests for debugger pause
+ https://bugs.webkit.org/show_bug.cgi?id=69912
+
+ Listen to DebuggerModel event instead of overriding private methods on it.
+
+ Reviewed by Pavel Feldman.
+
+ * src/js/Tests.js:
+ (.TestSuite.prototype._waitForScriptPause):
+
2011-10-11 Steve VanDeBogart <[email protected]>
[chromium] Add accessor for plugin request to not scale print output.
Modified: trunk/Source/WebKit/chromium/src/js/Tests.js (97244 => 97245)
--- trunk/Source/WebKit/chromium/src/js/Tests.js 2011-10-12 09:07:05 UTC (rev 97244)
+++ trunk/Source/WebKit/chromium/src/js/Tests.js 2011-10-12 09:07:40 UTC (rev 97245)
@@ -715,23 +715,21 @@
*/
TestSuite.prototype._waitForScriptPause = function(expectations, callback)
{
- var test = this;
- // Wait until script is paused.
- test.addSniffer(
- WebInspector.debuggerModel,
- "_pausedScript",
- function(details) {
- var callFrames = details.callFrames;
- var functionsOnStack = [];
- for (var i = 0; i < callFrames.length; i++)
- functionsOnStack.push(callFrames[i].functionName);
+ function pauseListener(event) {
+ var callFrames = event.data.callFrames;
+ var functionsOnStack = [];
+ for (var i = 0; i < callFrames.length; i++)
+ functionsOnStack.push(callFrames[i].functionName);
- test.assertEquals(expectations.functionsOnStack.join(","), functionsOnStack.join(","), "Unexpected stack.");
+ this.assertEquals(expectations.functionsOnStack.join(","), functionsOnStack.join(","), "Unexpected stack.");
- // Check that execution line where the script is paused is
- // expected one.
- test._checkSourceFrameWhenLoaded(expectations, callback);
- });
+ // Check that execution line where the script is paused is
+ // expected one.
+ this._checkSourceFrameWhenLoaded(expectations, callback);
+
+ WebInspector.debuggerModel.removeEventListener(WebInspector.DebuggerModel.Events.DebuggerPaused, pauseListener, this);
+ }
+ WebInspector.debuggerModel.addEventListener(WebInspector.DebuggerModel.Events.DebuggerPaused, pauseListener, this);
};
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
