third_party/WebKit/Source/devtools/front_end/sdk/DebuggerModel.js - Issue 2215153002: [DevTools] Eliminate frameId and isContentScript from js protocol.

Unified Diff: third_party/WebKit/Source/devtools/front_end/sdk/DebuggerModel.js

Issue 2215153002: [DevTools] Eliminate frameId and isContentScript from js protocol. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: navigation tracker Created 4 years, 4 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/core/inspector/WorkerThreadDebugger.cpp ('k') | third_party/WebKit/Source/devtools/front_end/sdk/RuntimeModel.js » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: third_party/WebKit/Source/devtools/front_end/sdk/DebuggerModel.js

diff --git a/third_party/WebKit/Source/devtools/front_end/sdk/DebuggerModel.js b/third_party/WebKit/Source/devtools/front_end/sdk/DebuggerModel.js

index af7b5aa8059ba4279563bebc5ec1aa5a701248b8..a5e5bb25a9716e15e493a249d5b29f9e76eccf1c 100644

--- a/third_party/WebKit/Source/devtools/front_end/sdk/DebuggerModel.js

+++ b/third_party/WebKit/Source/devtools/front_end/sdk/DebuggerModel.js

@@ -462,7 +462,7 @@ WebInspector.DebuggerModel.prototype = {

* @param {number} endColumn

* @param {!RuntimeAgent.ExecutionContextId} executionContextId

* @param {string} hash

- * @param {boolean} isContentScript

+ * @param {*|undefined} executionContextAuxData

* @param {boolean} isInternalScript

* @param {boolean} isLiveEdit

* @param {string=} sourceMapURL

@@ -471,8 +471,11 @@ WebInspector.DebuggerModel.prototype = {

* @param {boolean=} hasSyntaxError

* @return {!WebInspector.Script}

- _parsedScriptSource: function(scriptId, sourceURL, startLine, startColumn, endLine, endColumn, executionContextId, hash, isContentScript, isInternalScript, isLiveEdit, sourceMapURL, hasSourceURL, deprecatedCommentWasUsed, hasSyntaxError)

+ _parsedScriptSource: function(scriptId, sourceURL, startLine, startColumn, endLine, endColumn, executionContextId, hash, executionContextAuxData, isInternalScript, isLiveEdit, sourceMapURL, hasSourceURL, deprecatedCommentWasUsed, hasSyntaxError)

{

+ var isContentScript = false;

+ if (executionContextAuxData && ("isDefault" in executionContextAuxData))

+ isContentScript = !executionContextAuxData["isDefault"];

var script = new WebInspector.Script(this, scriptId, sourceURL, startLine, startColumn, endLine, endColumn, executionContextId, hash, isContentScript, isInternalScript, isLiveEdit, sourceMapURL, hasSourceURL);

this._registerScript(script);

if (!hasSyntaxError)

@@ -852,16 +855,16 @@ WebInspector.DebuggerDispatcher.prototype = {

* @param {number} endColumn

* @param {!RuntimeAgent.ExecutionContextId} executionContextId

* @param {string} hash

- * @param {boolean=} isContentScript

+ * @param {*=} executionContextAuxData

* @param {boolean=} isInternalScript

* @param {boolean=} isLiveEdit

* @param {string=} sourceMapURL

* @param {boolean=} hasSourceURL

* @param {boolean=} deprecatedCommentWasUsed

- scriptParsed: function(scriptId, sourceURL, startLine, startColumn, endLine, endColumn, executionContextId, hash, isContentScript, isInternalScript, isLiveEdit, sourceMapURL, hasSourceURL, deprecatedCommentWasUsed)

+ scriptParsed: function(scriptId, sourceURL, startLine, startColumn, endLine, endColumn, executionContextId, hash, executionContextAuxData, isInternalScript, isLiveEdit, sourceMapURL, hasSourceURL, deprecatedCommentWasUsed)

{

- this._debuggerModel._parsedScriptSource(scriptId, sourceURL, startLine, startColumn, endLine, endColumn, executionContextId, hash, !!isContentScript, !!isInternalScript, !!isLiveEdit, sourceMapURL, hasSourceURL, deprecatedCommentWasUsed, false);

+ this._debuggerModel._parsedScriptSource(scriptId, sourceURL, startLine, startColumn, endLine, endColumn, executionContextId, hash, executionContextAuxData, !!isInternalScript, !!isLiveEdit, sourceMapURL, hasSourceURL, deprecatedCommentWasUsed, false);

/**

@@ -874,15 +877,15 @@ WebInspector.DebuggerDispatcher.prototype = {

* @param {number} endColumn

* @param {!RuntimeAgent.ExecutionContextId} executionContextId

* @param {string} hash

- * @param {boolean=} isContentScript

+ * @param {*=} executionContextAuxData

* @param {boolean=} isInternalScript

* @param {string=} sourceMapURL

* @param {boolean=} hasSourceURL

* @param {boolean=} deprecatedCommentWasUsed

- scriptFailedToParse: function(scriptId, sourceURL, startLine, startColumn, endLine, endColumn, executionContextId, hash, isContentScript, isInternalScript, sourceMapURL, hasSourceURL, deprecatedCommentWasUsed)

+ scriptFailedToParse: function(scriptId, sourceURL, startLine, startColumn, endLine, endColumn, executionContextId, hash, executionContextAuxData, isInternalScript, sourceMapURL, hasSourceURL, deprecatedCommentWasUsed)

{

- this._debuggerModel._parsedScriptSource(scriptId, sourceURL, startLine, startColumn, endLine, endColumn, executionContextId, hash, !!isContentScript, !!isInternalScript, false, sourceMapURL, hasSourceURL, deprecatedCommentWasUsed, true);

+ this._debuggerModel._parsedScriptSource(scriptId, sourceURL, startLine, startColumn, endLine, endColumn, executionContextId, hash, executionContextAuxData, !!isInternalScript, false, sourceMapURL, hasSourceURL, deprecatedCommentWasUsed, true);

/**