third_party/WebKit/LayoutTests/http/tests/inspector/workspace-test.js - Issue 2136763002: DevTools: Sort execution contexts in nested frames

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: third_party/WebKit/LayoutTests/http/tests/inspector/workspace-test.js

Issue 2136763002: DevTools: Sort execution contexts in nested frames (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Fix merge conflict Created 4 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 | « third_party/WebKit/LayoutTests/http/tests/inspector/console-show-all-messages.html ('k') | third_party/WebKit/LayoutTests/inspector/sources/debugger-ui/execution-context-sorted.html » ('j') | third_party/WebKit/Source/devtools/front_end/sdk/TargetManager.js » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: third_party/WebKit/LayoutTests/http/tests/inspector/workspace-test.js

diff --git a/third_party/WebKit/LayoutTests/http/tests/inspector/workspace-test.js b/third_party/WebKit/LayoutTests/http/tests/inspector/workspace-test.js

index 58c70a5544f2f9ae7c61bdf43c778ad8a61c5809..8007349cc40189af9c57bcee3364c704660efb17 100644

--- a/third_party/WebKit/LayoutTests/http/tests/inspector/workspace-test.js

+++ b/third_party/WebKit/LayoutTests/http/tests/inspector/workspace-test.js

@@ -43,11 +43,11 @@ InspectorTest.createMockTarget = function(id, debuggerModelConstructor, targetTy

WebInspector.Target.call(this, InspectorTest.testTargetManager, name, type, connection, null, callback);

this.consoleModel = new WebInspector.ConsoleModel(this);

this.networkManager = new WebInspector.NetworkManager(this);

+ this.runtimeModel = new WebInspector.RuntimeModel(this);

this.resourceTreeModel = new WebInspector.ResourceTreeModel(this);

this.resourceTreeModel._inspectedPageURL = InspectorTest.resourceTreeModel._inspectedPageURL;

this.resourceTreeModel._cachedResourcesProcessed = true;

this.resourceTreeModel._frameAttached("42", 0);

- this.runtimeModel = new WebInspector.RuntimeModel(this);

this.debuggerModel = debuggerModelConstructor ? new debuggerModelConstructor(this) : new WebInspector.DebuggerModel(this);

this._modelByConstructor.set(WebInspector.DebuggerModel, this.debuggerModel);

this.domModel = new WebInspector.DOMModel(this);