Skip to content

Commit

Permalink
Revert of [DevTools] Rename entities in js_protocol, remove deprecate…
Browse files Browse the repository at this point in the history 
…d ones. (patchset #1 id:1 of https://codereview.chromium.org/2249743002/ )

Reason for revert:
Compile failed on Linux ChromiumOS GN https://build.chromium.org/p/chromium.chromiumos/builders/Linux%20ChromiumOS%20GN/builds/44080

../../headless/lib/headless_devtools_client_browsertest.cc:177:56: error: no member named 'Run' in 'headless::runtime::ExperimentalDomain'
    devtools_client_->GetRuntime()->GetExperimental()->Run(
    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~  ^
../../headless/lib/headless_devtools_client_browsertest.cc:178:18: error: no member named 'RunParams' in namespace 'headless::runtime'
        runtime::RunParams::Builder().Build());
        ~~~~~~~~~^

Original issue's description:
> [DevTools] Rename entities in js_protocol, remove deprecated ones.
>
> BUG=635947
>
> Committed: https://crrev.com/816474328ff9b737dffbe733c0d7b2c286151ffb
> Cr-Commit-Position: refs/heads/master@{#412043}

[email protected],[email protected]
# Skipping CQ checks because original CL landed less than 1 days ago.
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true
BUG=635947

Review-Url: https://codereview.chromium.org/2249663003
Cr-Commit-Position: refs/heads/master@{#412052}
  • Loading branch information
@bsep-chromium
bsep-chromium authored and Commit bot committed Aug 15, 2016
1 parent da1ed46 commit 2673630
Show file tree
Hide file tree
Showing 7 changed files with 20 additions and 20 deletions.
2 changes: 1 addition & 1 deletion front_end/main/Main.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -303,7 +303,7 @@ WebInspector.Main.prototype = {
InspectorFrontendHost.events.addEventListener(InspectorFrontendHostAPI.Events.ReloadInspectedPage, this._reloadInspectedPage, this);
InspectorFrontendHost.events.addEventListener(InspectorFrontendHostAPI.Events.EvaluateForTestInFrontend, this._evaluateForTestInFrontend, this);

this._mainTarget.runtimeAgent().runIfWaitingForDebugger();
this._mainTarget.runtimeAgent().run();

if (this._mainTarget.hasBrowserCapability())
this._mainTarget.inspectorAgent().enable();
Expand Down
12 changes: 6 additions & 6 deletions front_end/sdk/DebuggerModel.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -611,12 +611,12 @@ WebInspector.DebuggerModel.prototype = {
* @param {string} code
* @param {string} objectGroup
* @param {boolean} includeCommandLineAPI
* @param {boolean} silent
* @param {boolean} doNotPauseOnExceptionsAndMuteConsole
* @param {boolean} returnByValue
* @param {boolean} generatePreview
* @param {function(?WebInspector.RemoteObject, !RuntimeAgent.ExceptionDetails=)} callback
*/
evaluateOnSelectedCallFrame: function(code, objectGroup, includeCommandLineAPI, silent, returnByValue, generatePreview, callback)
evaluateOnSelectedCallFrame: function(code, objectGroup, includeCommandLineAPI, doNotPauseOnExceptionsAndMuteConsole, returnByValue, generatePreview, callback)
{
/**
* @param {?RuntimeAgent.RemoteObject} result
Expand All @@ -631,7 +631,7 @@ WebInspector.DebuggerModel.prototype = {
callback(this.target().runtimeModel.createRemoteObject(result), exceptionDetails);
}

this.selectedCallFrame().evaluate(code, objectGroup, includeCommandLineAPI, silent, returnByValue, generatePreview, didEvaluate.bind(this));
this.selectedCallFrame().evaluate(code, objectGroup, includeCommandLineAPI, doNotPauseOnExceptionsAndMuteConsole, returnByValue, generatePreview, didEvaluate.bind(this));
},

/**
Expand Down Expand Up @@ -1061,12 +1061,12 @@ WebInspector.DebuggerModel.CallFrame.prototype = {
* @param {string} code
* @param {string} objectGroup
* @param {boolean} includeCommandLineAPI
* @param {boolean} silent
* @param {boolean} doNotPauseOnExceptionsAndMuteConsole
* @param {boolean} returnByValue
* @param {boolean} generatePreview
* @param {function(?RuntimeAgent.RemoteObject, !RuntimeAgent.ExceptionDetails=)} callback
*/
evaluate: function(code, objectGroup, includeCommandLineAPI, silent, returnByValue, generatePreview, callback)
evaluate: function(code, objectGroup, includeCommandLineAPI, doNotPauseOnExceptionsAndMuteConsole, returnByValue, generatePreview, callback)
{
/**
* @param {?Protocol.Error} error
Expand All @@ -1082,7 +1082,7 @@ WebInspector.DebuggerModel.CallFrame.prototype = {
}
callback(result, exceptionDetails);
}
this._debuggerAgent.evaluateOnCallFrame(this._payload.callFrameId, code, objectGroup, includeCommandLineAPI, silent, returnByValue, generatePreview, didEvaluateOnCallFrame);
this._debuggerAgent.evaluateOnCallFrame(this._payload.callFrameId, code, objectGroup, includeCommandLineAPI, doNotPauseOnExceptionsAndMuteConsole, returnByValue, generatePreview, didEvaluateOnCallFrame);
},

/**
Expand Down
2 changes: 1 addition & 1 deletion front_end/sdk/RemoteObject.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -656,7 +656,7 @@ WebInspector.RemoteObjectImpl.prototype = {
return;
}

this._runtimeAgent.invoke_evaluate({expression:value, silent:true}, evaluatedCallback.bind(this));
this._runtimeAgent.invoke_evaluate({expression:value, doNotPauseOnExceptionsAndMuteConsole:true}, evaluatedCallback.bind(this));

/**
* @param {?Protocol.Error} error
Expand Down
18 changes: 9 additions & 9 deletions front_end/sdk/RuntimeModel.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -243,16 +243,16 @@ WebInspector.RuntimeModel.prototype = {
* @param {!RuntimeAgent.ScriptId} scriptId
* @param {number} executionContextId
* @param {string=} objectGroup
* @param {boolean=} silent
* @param {boolean=} doNotPauseOnExceptionsAndMuteConsole
* @param {boolean=} includeCommandLineAPI
* @param {boolean=} returnByValue
* @param {boolean=} generatePreview
* @param {boolean=} awaitPromise
* @param {function(?RuntimeAgent.RemoteObject, ?RuntimeAgent.ExceptionDetails=)=} callback
*/
runScript: function(scriptId, executionContextId, objectGroup, silent, includeCommandLineAPI, returnByValue, generatePreview, awaitPromise, callback)
runScript: function(scriptId, executionContextId, objectGroup, doNotPauseOnExceptionsAndMuteConsole, includeCommandLineAPI, returnByValue, generatePreview, awaitPromise, callback)
{
this._agent.runScript(scriptId, executionContextId, objectGroup, silent, includeCommandLineAPI, returnByValue, generatePreview, awaitPromise, innerCallback);
this._agent.runScript(scriptId, executionContextId, objectGroup, doNotPauseOnExceptionsAndMuteConsole, includeCommandLineAPI, returnByValue, generatePreview, awaitPromise, innerCallback);

/**
* @param {?Protocol.Error} error
Expand Down Expand Up @@ -547,17 +547,17 @@ WebInspector.ExecutionContext.prototype = {
* @param {string} expression
* @param {string} objectGroup
* @param {boolean} includeCommandLineAPI
* @param {boolean} silent
* @param {boolean} doNotPauseOnExceptionsAndMuteConsole
* @param {boolean} returnByValue
* @param {boolean} generatePreview
* @param {boolean} userGesture
* @param {function(?WebInspector.RemoteObject, !RuntimeAgent.ExceptionDetails=)} callback
*/
evaluate: function(expression, objectGroup, includeCommandLineAPI, silent, returnByValue, generatePreview, userGesture, callback)
evaluate: function(expression, objectGroup, includeCommandLineAPI, doNotPauseOnExceptionsAndMuteConsole, returnByValue, generatePreview, userGesture, callback)
{
// FIXME: It will be moved to separate ExecutionContext.
if (this.debuggerModel.selectedCallFrame()) {
this.debuggerModel.evaluateOnSelectedCallFrame(expression, objectGroup, includeCommandLineAPI, silent, returnByValue, generatePreview, callback);
this.debuggerModel.evaluateOnSelectedCallFrame(expression, objectGroup, includeCommandLineAPI, doNotPauseOnExceptionsAndMuteConsole, returnByValue, generatePreview, callback);
return;
}
this._evaluateGlobal.apply(this, arguments);
Expand All @@ -577,13 +577,13 @@ WebInspector.ExecutionContext.prototype = {
* @param {string} expression
* @param {string} objectGroup
* @param {boolean} includeCommandLineAPI
* @param {boolean} silent
* @param {boolean} doNotPauseOnExceptionsAndMuteConsole
* @param {boolean} returnByValue
* @param {boolean} generatePreview
* @param {boolean} userGesture
* @param {function(?WebInspector.RemoteObject, !RuntimeAgent.ExceptionDetails=)} callback
*/
_evaluateGlobal: function(expression, objectGroup, includeCommandLineAPI, silent, returnByValue, generatePreview, userGesture, callback)
_evaluateGlobal: function(expression, objectGroup, includeCommandLineAPI, doNotPauseOnExceptionsAndMuteConsole, returnByValue, generatePreview, userGesture, callback)
{
if (!expression) {
// There is no expression, so the completion should happen against global properties.
Expand All @@ -605,7 +605,7 @@ WebInspector.ExecutionContext.prototype = {
}
callback(this.runtimeModel.createRemoteObject(result), exceptionDetails);
}
this.target().runtimeAgent().evaluate(expression, objectGroup, includeCommandLineAPI, silent, this.id, returnByValue, generatePreview, userGesture, false, evalCallback.bind(this));
this.target().runtimeAgent().evaluate(expression, objectGroup, includeCommandLineAPI, doNotPauseOnExceptionsAndMuteConsole, this.id, returnByValue, generatePreview, userGesture, false, evalCallback.bind(this));
},

/**
Expand Down
2 changes: 1 addition & 1 deletion front_end/sdk/ServiceWorkerManager.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -439,7 +439,7 @@ WebInspector.ServiceWorker = function(manager, workerId, url, versionId)
this._target = WebInspector.targetManager.createTarget(this._name, capabilities, this._connection, manager.target());
this._target[WebInspector.ServiceWorker.Symbol] = this;
this._manager.dispatchEventToListeners(WebInspector.ServiceWorkerManager.Events.WorkersUpdated);
this._target.runtimeAgent().runIfWaitingForDebugger();
this._target.runtimeAgent().run();
}

WebInspector.ServiceWorker.Symbol = Symbol("serviceWorker");
Expand Down
2 changes: 1 addition & 1 deletion front_end/sdk/WorkerManager.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -109,7 +109,7 @@ WebInspector.WorkerManager.prototype = {
var mainIsServiceWorker = WebInspector.targetManager.mainTarget().hasWorkerCapability() && !WebInspector.targetManager.mainTarget().hasBrowserCapability();
if (mainIsServiceWorker && waitingForDebugger)
target.debuggerAgent().pause();
target.runtimeAgent().runIfWaitingForDebugger();
target.runtimeAgent().run();
},

/**
Expand Down
2 changes: 1 addition & 1 deletion front_end/snippets/ScriptSnippetModel.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -270,7 +270,7 @@ WebInspector.ScriptSnippetModel.prototype = {
_runScript: function(scriptId, executionContext, sourceURL)
{
var target = executionContext.target();
target.runtimeModel.runScript(scriptId, executionContext.id, "console", /* silent */ false, /* includeCommandLineAPI */ true, /* returnByValue */ false, /* generatePreview */ true, /* awaitPromise */ undefined, runCallback.bind(this, target));
target.runtimeModel.runScript(scriptId, executionContext.id, "console", /* doNotPauseOnExceptionsAndMuteConsole */ false, /* includeCommandLineAPI */ true, /* returnByValue */ false, /* generatePreview */ true, /* awaitPromise */ undefined, runCallback.bind(this, target));

/**
* @param {!WebInspector.Target} target
Expand Down

0 comments on commit 2673630

Please sign in to comment.