third_party/WebKit/Source/devtools/front_end/sources/JavaScriptSourceFrame.js - Issue 1564113003: DevTools: merge uisourcecode's url-alike members.

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/Source/devtools/front_end/sources/JavaScriptSourceFrame.js

Issue 1564113003: DevTools: merge uisourcecode's url-alike members. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: review comments addressed Created 4 years, 11 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/Source/devtools/front_end/sources/JavaScriptBreakpointsSidebarPane.js ('k') | third_party/WebKit/Source/devtools/front_end/sources/NavigatorView.js » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: third_party/WebKit/Source/devtools/front_end/sources/JavaScriptSourceFrame.js

diff --git a/third_party/WebKit/Source/devtools/front_end/sources/JavaScriptSourceFrame.js b/third_party/WebKit/Source/devtools/front_end/sources/JavaScriptSourceFrame.js

index 959448a31e5cd1f60dff47a09f1df03a3b8c8d6c..a2d2e54955959321d2e7bf1000e4121626b910e5 100644

--- a/third_party/WebKit/Source/devtools/front_end/sources/JavaScriptSourceFrame.js

+++ b/third_party/WebKit/Source/devtools/front_end/sources/JavaScriptSourceFrame.js

@@ -112,7 +112,7 @@ WebInspector.JavaScriptSourceFrame.prototype = {

var infobar = new WebInspector.UISourceCodeFrame.Infobar(WebInspector.Infobar.Type.Warning, WebInspector.UIString("Workspace mapping mismatch"));

this._divergedInfobar = infobar;

- var fileURL = this.uiSourceCode().originURL();

+ var fileURL = this.uiSourceCode().url();

infobar.createDetailsRowMessage(WebInspector.UIString("The content of this file on the file system:\u00a0")).appendChild(

WebInspector.linkifyURLAsNode(fileURL, fileURL, "source-frame-infobar-details-url", true));

@@ -148,7 +148,7 @@ WebInspector.JavaScriptSourceFrame.prototype = {

if (projectType === WebInspector.projectTypes.Snippets)

return;

var networkURL = WebInspector.networkMapping.networkURL(this.uiSourceCode());

- var url = projectType === WebInspector.projectTypes.Formatter ? this.uiSourceCode().originURL() : networkURL;

+ var url = projectType === WebInspector.projectTypes.Formatter ? this.uiSourceCode().url() : networkURL;

var isContentScript = projectType === WebInspector.projectTypes.ContentScripts;

if (!WebInspector.BlackboxSupport.isBlackboxed(url, isContentScript)) {

this._hideBlackboxInfobar();