Skip to content

Commit 52c4e3f

Browse files
committed
squash 'resources/unpacked/devtools' changes from 077fee1..da1ed46
REVERT: 077fee1 DevTools: Standardize box shadows REVERT: 2673630 Revert of [DevTools] Rename entities in js_protocol, remove deprecated ones. (patchset #1 id:1 of https://codereview.chromium.org/2249743002/ ) git-subtree-dir: resources/unpacked/devtools git-subtree-split: da1ed46
1 parent a5ead08 commit 52c4e3f

15 files changed

+35
-45
lines changed

front_end/elements/elementsTreeOutline.css

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -174,9 +174,8 @@
174174
}
175175

176176
.CodeMirror {
177-
box-shadow: 0 0 0 1px rgba(0, 0, 0, 0.2),
178-
0 2px 4px rgba(0, 0, 0, 0.2),
179-
0 2px 6px rgba(0, 0, 0, 0.1);
177+
box-shadow: rgba(0, 0, 0, .5) 3px 3px 4px;
178+
outline: 1px solid rgb(66%, 66%, 66%) !important;
180179
background-color: white;
181180
}
182181

@@ -195,9 +194,8 @@ button, input, select {
195194

196195
.editing {
197196
-webkit-user-select: text;
198-
box-shadow: 0 0 0 1px rgba(0, 0, 0, 0.2),
199-
0 2px 4px rgba(0, 0, 0, 0.2),
200-
0 2px 6px rgba(0, 0, 0, 0.1);
197+
box-shadow: rgba(0, 0, 0, .5) 3px 3px 4px;
198+
outline: 1px solid rgb(66%, 66%, 66%) !important;
201199
background-color: white;
202200
-webkit-user-modify: read-write-plaintext-only;
203201
text-overflow: clip !important;

front_end/main/Main.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -303,7 +303,7 @@ WebInspector.Main.prototype = {
303303
InspectorFrontendHost.events.addEventListener(InspectorFrontendHostAPI.Events.ReloadInspectedPage, this._reloadInspectedPage, this);
304304
InspectorFrontendHost.events.addEventListener(InspectorFrontendHostAPI.Events.EvaluateForTestInFrontend, this._evaluateForTestInFrontend, this);
305305

306-
this._mainTarget.runtimeAgent().run();
306+
this._mainTarget.runtimeAgent().runIfWaitingForDebugger();
307307

308308
if (this._mainTarget.hasBrowserCapability())
309309
this._mainTarget.inspectorAgent().enable();

front_end/sdk/DebuggerModel.js

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -611,12 +611,12 @@ WebInspector.DebuggerModel.prototype = {
611611
* @param {string} code
612612
* @param {string} objectGroup
613613
* @param {boolean} includeCommandLineAPI
614-
* @param {boolean} doNotPauseOnExceptionsAndMuteConsole
614+
* @param {boolean} silent
615615
* @param {boolean} returnByValue
616616
* @param {boolean} generatePreview
617617
* @param {function(?WebInspector.RemoteObject, !RuntimeAgent.ExceptionDetails=)} callback
618618
*/
619-
evaluateOnSelectedCallFrame: function(code, objectGroup, includeCommandLineAPI, doNotPauseOnExceptionsAndMuteConsole, returnByValue, generatePreview, callback)
619+
evaluateOnSelectedCallFrame: function(code, objectGroup, includeCommandLineAPI, silent, returnByValue, generatePreview, callback)
620620
{
621621
/**
622622
* @param {?RuntimeAgent.RemoteObject} result
@@ -631,7 +631,7 @@ WebInspector.DebuggerModel.prototype = {
631631
callback(this.target().runtimeModel.createRemoteObject(result), exceptionDetails);
632632
}
633633

634-
this.selectedCallFrame().evaluate(code, objectGroup, includeCommandLineAPI, doNotPauseOnExceptionsAndMuteConsole, returnByValue, generatePreview, didEvaluate.bind(this));
634+
this.selectedCallFrame().evaluate(code, objectGroup, includeCommandLineAPI, silent, returnByValue, generatePreview, didEvaluate.bind(this));
635635
},
636636

637637
/**
@@ -1061,12 +1061,12 @@ WebInspector.DebuggerModel.CallFrame.prototype = {
10611061
* @param {string} code
10621062
* @param {string} objectGroup
10631063
* @param {boolean} includeCommandLineAPI
1064-
* @param {boolean} doNotPauseOnExceptionsAndMuteConsole
1064+
* @param {boolean} silent
10651065
* @param {boolean} returnByValue
10661066
* @param {boolean} generatePreview
10671067
* @param {function(?RuntimeAgent.RemoteObject, !RuntimeAgent.ExceptionDetails=)} callback
10681068
*/
1069-
evaluate: function(code, objectGroup, includeCommandLineAPI, doNotPauseOnExceptionsAndMuteConsole, returnByValue, generatePreview, callback)
1069+
evaluate: function(code, objectGroup, includeCommandLineAPI, silent, returnByValue, generatePreview, callback)
10701070
{
10711071
/**
10721072
* @param {?Protocol.Error} error
@@ -1082,7 +1082,7 @@ WebInspector.DebuggerModel.CallFrame.prototype = {
10821082
}
10831083
callback(result, exceptionDetails);
10841084
}
1085-
this._debuggerAgent.evaluateOnCallFrame(this._payload.callFrameId, code, objectGroup, includeCommandLineAPI, doNotPauseOnExceptionsAndMuteConsole, returnByValue, generatePreview, didEvaluateOnCallFrame);
1085+
this._debuggerAgent.evaluateOnCallFrame(this._payload.callFrameId, code, objectGroup, includeCommandLineAPI, silent, returnByValue, generatePreview, didEvaluateOnCallFrame);
10861086
},
10871087

10881088
/**

front_end/sdk/RemoteObject.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -656,7 +656,7 @@ WebInspector.RemoteObjectImpl.prototype = {
656656
return;
657657
}
658658

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

661661
/**
662662
* @param {?Protocol.Error} error

front_end/sdk/RuntimeModel.js

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -243,16 +243,16 @@ WebInspector.RuntimeModel.prototype = {
243243
* @param {!RuntimeAgent.ScriptId} scriptId
244244
* @param {number} executionContextId
245245
* @param {string=} objectGroup
246-
* @param {boolean=} doNotPauseOnExceptionsAndMuteConsole
246+
* @param {boolean=} silent
247247
* @param {boolean=} includeCommandLineAPI
248248
* @param {boolean=} returnByValue
249249
* @param {boolean=} generatePreview
250250
* @param {boolean=} awaitPromise
251251
* @param {function(?RuntimeAgent.RemoteObject, ?RuntimeAgent.ExceptionDetails=)=} callback
252252
*/
253-
runScript: function(scriptId, executionContextId, objectGroup, doNotPauseOnExceptionsAndMuteConsole, includeCommandLineAPI, returnByValue, generatePreview, awaitPromise, callback)
253+
runScript: function(scriptId, executionContextId, objectGroup, silent, includeCommandLineAPI, returnByValue, generatePreview, awaitPromise, callback)
254254
{
255-
this._agent.runScript(scriptId, executionContextId, objectGroup, doNotPauseOnExceptionsAndMuteConsole, includeCommandLineAPI, returnByValue, generatePreview, awaitPromise, innerCallback);
255+
this._agent.runScript(scriptId, executionContextId, objectGroup, silent, includeCommandLineAPI, returnByValue, generatePreview, awaitPromise, innerCallback);
256256

257257
/**
258258
* @param {?Protocol.Error} error
@@ -547,17 +547,17 @@ WebInspector.ExecutionContext.prototype = {
547547
* @param {string} expression
548548
* @param {string} objectGroup
549549
* @param {boolean} includeCommandLineAPI
550-
* @param {boolean} doNotPauseOnExceptionsAndMuteConsole
550+
* @param {boolean} silent
551551
* @param {boolean} returnByValue
552552
* @param {boolean} generatePreview
553553
* @param {boolean} userGesture
554554
* @param {function(?WebInspector.RemoteObject, !RuntimeAgent.ExceptionDetails=)} callback
555555
*/
556-
evaluate: function(expression, objectGroup, includeCommandLineAPI, doNotPauseOnExceptionsAndMuteConsole, returnByValue, generatePreview, userGesture, callback)
556+
evaluate: function(expression, objectGroup, includeCommandLineAPI, silent, returnByValue, generatePreview, userGesture, callback)
557557
{
558558
// FIXME: It will be moved to separate ExecutionContext.
559559
if (this.debuggerModel.selectedCallFrame()) {
560-
this.debuggerModel.evaluateOnSelectedCallFrame(expression, objectGroup, includeCommandLineAPI, doNotPauseOnExceptionsAndMuteConsole, returnByValue, generatePreview, callback);
560+
this.debuggerModel.evaluateOnSelectedCallFrame(expression, objectGroup, includeCommandLineAPI, silent, returnByValue, generatePreview, callback);
561561
return;
562562
}
563563
this._evaluateGlobal.apply(this, arguments);
@@ -577,13 +577,13 @@ WebInspector.ExecutionContext.prototype = {
577577
* @param {string} expression
578578
* @param {string} objectGroup
579579
* @param {boolean} includeCommandLineAPI
580-
* @param {boolean} doNotPauseOnExceptionsAndMuteConsole
580+
* @param {boolean} silent
581581
* @param {boolean} returnByValue
582582
* @param {boolean} generatePreview
583583
* @param {boolean} userGesture
584584
* @param {function(?WebInspector.RemoteObject, !RuntimeAgent.ExceptionDetails=)} callback
585585
*/
586-
_evaluateGlobal: function(expression, objectGroup, includeCommandLineAPI, doNotPauseOnExceptionsAndMuteConsole, returnByValue, generatePreview, userGesture, callback)
586+
_evaluateGlobal: function(expression, objectGroup, includeCommandLineAPI, silent, returnByValue, generatePreview, userGesture, callback)
587587
{
588588
if (!expression) {
589589
// There is no expression, so the completion should happen against global properties.
@@ -605,7 +605,7 @@ WebInspector.ExecutionContext.prototype = {
605605
}
606606
callback(this.runtimeModel.createRemoteObject(result), exceptionDetails);
607607
}
608-
this.target().runtimeAgent().evaluate(expression, objectGroup, includeCommandLineAPI, doNotPauseOnExceptionsAndMuteConsole, this.id, returnByValue, generatePreview, userGesture, false, evalCallback.bind(this));
608+
this.target().runtimeAgent().evaluate(expression, objectGroup, includeCommandLineAPI, silent, this.id, returnByValue, generatePreview, userGesture, false, evalCallback.bind(this));
609609
},
610610

611611
/**

front_end/sdk/ServiceWorkerManager.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -439,7 +439,7 @@ WebInspector.ServiceWorker = function(manager, workerId, url, versionId)
439439
this._target = WebInspector.targetManager.createTarget(this._name, capabilities, this._connection, manager.target());
440440
this._target[WebInspector.ServiceWorker.Symbol] = this;
441441
this._manager.dispatchEventToListeners(WebInspector.ServiceWorkerManager.Events.WorkersUpdated);
442-
this._target.runtimeAgent().run();
442+
this._target.runtimeAgent().runIfWaitingForDebugger();
443443
}
444444

445445
WebInspector.ServiceWorker.Symbol = Symbol("serviceWorker");

front_end/sdk/WorkerManager.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -109,7 +109,7 @@ WebInspector.WorkerManager.prototype = {
109109
var mainIsServiceWorker = WebInspector.targetManager.mainTarget().hasWorkerCapability() && !WebInspector.targetManager.mainTarget().hasBrowserCapability();
110110
if (mainIsServiceWorker && waitingForDebugger)
111111
target.debuggerAgent().pause();
112-
target.runtimeAgent().run();
112+
target.runtimeAgent().runIfWaitingForDebugger();
113113
},
114114

115115
/**

front_end/snippets/ScriptSnippetModel.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -270,7 +270,7 @@ WebInspector.ScriptSnippetModel.prototype = {
270270
_runScript: function(scriptId, executionContext, sourceURL)
271271
{
272272
var target = executionContext.target();
273-
target.runtimeModel.runScript(scriptId, executionContext.id, "console", /* doNotPauseOnExceptionsAndMuteConsole */ false, /* includeCommandLineAPI */ true, /* returnByValue */ false, /* generatePreview */ true, /* awaitPromise */ undefined, runCallback.bind(this, target));
273+
target.runtimeModel.runScript(scriptId, executionContext.id, "console", /* silent */ false, /* includeCommandLineAPI */ true, /* returnByValue */ false, /* generatePreview */ true, /* awaitPromise */ undefined, runCallback.bind(this, target));
274274

275275
/**
276276
* @param {!WebInspector.Target} target

front_end/timeline/timelineStatusDialog.css

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,8 @@
1010
padding: 12px 16px;
1111
align-self: center;
1212
background-color: white;
13-
box-shadow: 0 0 0 1px rgba(0, 0, 0, 0.2),
14-
0 2px 4px rgba(0, 0, 0, 0.2),
15-
0 2px 6px rgba(0, 0, 0, 0.1);
13+
border: 1px solid lightgrey;
14+
box-shadow: grey 0 0 14px;
1615
margin-top: -1px;
1716
}
1817

front_end/ui/dialog.css

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,8 @@
66

77
:host {
88
position: absolute;
9-
box-shadow: 0 0 0 1px rgba(0, 0, 0, 0.2),
10-
0 2px 4px rgba(0, 0, 0, 0.2),
11-
0 2px 6px rgba(0, 0, 0, 0.1);
9+
border: 1px solid rgb(204, 204, 204);
10+
box-shadow: rgb(140, 140, 140) 0 3px 14px;
1211
background: white;
1312
justify-content: flex-start;
1413
align-items: stretch;

0 commit comments

Comments
 (0)