LayoutTests/http/tests/inspector/debugger-test.js - Issue 396993003: DevTools: get rid of WebInspector.cssModel, use target models instead

Unified Diff: LayoutTests/http/tests/inspector/debugger-test.js

Issue 396993003: DevTools: get rid of WebInspector.cssModel, use target models instead (Closed) Base URL: svn://svn.chromium.org/blink/trunk

Patch Set: Created 6 years, 5 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View side-by-side diff with in-line comments

Download patch

« no previous file with comments | « LayoutTests/http/tests/inspector-enabled/console-log-before-frame-navigation.html ('k') | LayoutTests/http/tests/inspector/elements/styles/update-locations-on-filesystem-scss-load.html » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: LayoutTests/http/tests/inspector/debugger-test.js

diff --git a/LayoutTests/http/tests/inspector/debugger-test.js b/LayoutTests/http/tests/inspector/debugger-test.js

index 7f4356ee2ac1b4af0b70263fe226d098770ec4f8..6a55c6c9e10677adaa1f4e72029981cc6fc1f59f 100644

--- a/LayoutTests/http/tests/inspector/debugger-test.js

+++ b/LayoutTests/http/tests/inspector/debugger-test.js

@@ -200,7 +200,7 @@ InspectorTest.captureStackTraceIntoString = function(callFrames, asyncStackTrace

while (asyncStackTrace) {

results.push(" [" + (asyncStackTrace.description || "Async Call") + "]");

- var printed = printCallFrames(WebInspector.DebuggerModel.CallFrame.fromPayloadArray(WebInspector.targetManager.activeTarget(), asyncStackTrace.callFrames));

+ var printed = printCallFrames(WebInspector.DebuggerModel.CallFrame.fromPayloadArray(WebInspector.targetManager.mainTarget(), asyncStackTrace.callFrames));

if (!printed)

results.pop();

if (asyncStackTrace.callFrames.peekLast().functionName === "testFunction")

@@ -223,7 +223,7 @@ InspectorTest._pausedScript = function(callFrames, reason, auxData, breakpointId

{

if (!InspectorTest._quiet)

InspectorTest.addResult("Script execution paused.");

- InspectorTest._pausedScriptArguments = [WebInspector.DebuggerModel.CallFrame.fromPayloadArray(WebInspector.targetManager.activeTarget(), callFrames), reason, breakpointIds, asyncStackTrace, auxData];

+ InspectorTest._pausedScriptArguments = [WebInspector.DebuggerModel.CallFrame.fromPayloadArray(WebInspector.targetManager.mainTarget(), callFrames), reason, breakpointIds, asyncStackTrace, auxData];

if (InspectorTest._waitUntilPausedCallback) {

var callback = InspectorTest._waitUntilPausedCallback;

delete InspectorTest._waitUntilPausedCallback;

@@ -378,7 +378,7 @@ InspectorTest.createScriptMock = function(url, startLine, startColumn, isContent

var endLine = startLine + lineCount - 1;

var endColumn = lineCount === 1 ? startColumn + source.length : source.length - source.lineEndings()[lineCount - 2];

var hasSourceURL = !!source.match(/\/\/#\ssourceURL=\s*(\S*?)\s*$/m) || !!source.match(/\/\/@\ssourceURL=\s*(\S*?)\s*$/m);

- var script = new WebInspector.Script(WebInspector.targetManager.activeTarget(), scriptId, url, startLine, startColumn, endLine, endColumn, isContentScript, null, hasSourceURL);

+ var script = new WebInspector.Script(WebInspector.targetManager.mainTarget(), scriptId, url, startLine, startColumn, endLine, endColumn, isContentScript, null, hasSourceURL);

script.requestContent = function(callback)

{

var trimmedSource = WebInspector.Script._trimSourceURLComment(source);