third_party/WebKit/Source/devtools/front_end/main/FrontendWebSocketAPI.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/main/FrontendWebSocketAPI.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/extensions/ExtensionServer.js ('k') | third_party/WebKit/Source/devtools/front_end/snippets/ScriptSnippetModel.js » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: third_party/WebKit/Source/devtools/front_end/main/FrontendWebSocketAPI.js

diff --git a/third_party/WebKit/Source/devtools/front_end/main/FrontendWebSocketAPI.js b/third_party/WebKit/Source/devtools/front_end/main/FrontendWebSocketAPI.js

index 322da62e74f7b888cf900afcc105e26c16e12622..e67bcf237c0a981899d57e6ac4bb47185e0544a3 100644

--- a/third_party/WebKit/Source/devtools/front_end/main/FrontendWebSocketAPI.js

+++ b/third_party/WebKit/Source/devtools/front_end/main/FrontendWebSocketAPI.js

@@ -38,7 +38,7 @@ WebInspector.FrontendWebSocketAPI.prototype = {

{

var uiSourceCode = WebInspector.networkMapping.uiSourceCodeForURLForAnyTarget(url);

if (uiSourceCode)

- url = uiSourceCode.originURL();

+ url = uiSourceCode.url();

if (url.startsWith("file://")) {

var file = url.substring(7);

this._issueFrontendAPINotification("Frontend.revealLocation", { file: file, line: lineNumber });

@@ -69,7 +69,7 @@ WebInspector.FrontendWebSocketAPI.prototype = {

var file = params["file"];

var buffer = params["buffer"];

var saved = params["saved"];

- var uiSourceCode = WebInspector.workspace.filesystemUISourceCode("file://" + file);

+ var uiSourceCode = WebInspector.workspace.uiSourceCodeForURL("file://" + file);

if (uiSourceCode) {

if (buffer !== uiSourceCode.workingCopy())

uiSourceCode.setWorkingCopy(buffer);

@@ -93,7 +93,7 @@ WebInspector.FrontendWebSocketAPI.prototype = {

if (this._dispatchingFrontendMessage)

return;

var uiSourceCode = /** @type {!WebInspector.UISourceCode} */ (event.data["uiSourceCode"]);

- var url = uiSourceCode.originURL();

+ var url = uiSourceCode.url();

if (url.startsWith("file://"))

url = url.substring(7);

var params = { file: url, buffer: uiSourceCode.workingCopy() };