[DevTools] Migrate usages of Target to RuntimeModel where makes sense

third_party/WebKit/Source/devtools/front_end/snippets/ScriptSnippetModel.js

 /*
  * Copyright (C) 2012 Google Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are
  * met:
  *
  *     * Redistributions of source code must retain the above copyright
  * notice, this list of conditions and the following disclaimer.
  *     * Redistributions in binary form must reproduce the above
@@ skipping 180 matching lines @@
   /**
    * @param {!SDK.ExecutionContext} executionContext
    * @param {!Workspace.UISourceCode} uiSourceCode
    */
   evaluateScriptSnippet(executionContext, uiSourceCode) {
     console.assert(uiSourceCode.project().type() === Workspace.projectTypes.Snippets);
     var breakpointLocations = this._removeBreakpoints(uiSourceCode);
     this._releaseSnippetScript(uiSourceCode);
     this._restoreBreakpoints(uiSourceCode, breakpointLocations);
 
-    var target = executionContext.target();
-    var runtimeModel = target.runtimeModel;
-    var debuggerModel = /** @type {!SDK.DebuggerModel} */ (SDK.DebuggerModel.fromTarget(target));
+    var runtimeModel = executionContext.runtimeModel;
+    var debuggerModel = executionContext.debuggerModel;
     var evaluationIndex = this._nextEvaluationIndex();
     var mapping = this._mappingForDebuggerModel.get(debuggerModel);
     mapping._setEvaluationIndex(evaluationIndex, uiSourceCode);
     var evaluationUrl = mapping._evaluationSourceURL(uiSourceCode);
     uiSourceCode.requestContent().then(compileSnippet.bind(this));
 
     /**
      * @this {Snippets.ScriptSnippetModel}
      */
     function compileSnippet() {
       var expression = uiSourceCode.workingCopy();
       Common.console.show();
       runtimeModel.compileScript(expression, '', true, executionContext.id, compileCallback.bind(this));
     }
 
     /**
      * @param {!Protocol.Runtime.ScriptId=} scriptId
      * @param {?Protocol.Runtime.ExceptionDetails=} exceptionDetails
      * @this {Snippets.ScriptSnippetModel}
      */
     function compileCallback(scriptId, exceptionDetails) {
       var mapping = this._mappingForDebuggerModel.get(debuggerModel);

[caseq, 2017/03/17 18:30:44]

nuke this, use one in closure?

[dgozman, 2017/03/17 21:43:46]

Done.

       if (mapping.evaluationIndex(uiSourceCode) !== evaluationIndex)
         return;
 
       var script = /** @type {!SDK.Script} */ (
           executionContext.debuggerModel.scriptForId(/** @type {string} */ (scriptId || exceptionDetails.scriptId)));

[caseq, 2017/03/17 18:30:44]

just debuggerModel

[dgozman, 2017/03/17 21:43:46]

Done.

       mapping._addScript(script, uiSourceCode);
       if (!scriptId) {
         this._printRunOrCompileScriptResultFailure(
-            target, /** @type {!Protocol.Runtime.ExceptionDetails} */ (exceptionDetails), evaluationUrl);
+            runtimeModel, /** @type {!Protocol.Runtime.ExceptionDetails} */ (exceptionDetails), evaluationUrl);
         return;
       }
 
       var breakpointLocations = this._removeBreakpoints(uiSourceCode);
       this._restoreBreakpoints(uiSourceCode, breakpointLocations);
 
       this._runScript(scriptId, executionContext, evaluationUrl);
     }
   }
 
   /**
    * @param {!Protocol.Runtime.ScriptId} scriptId
    * @param {!SDK.ExecutionContext} executionContext
    * @param {?string=} sourceURL
    */
   _runScript(scriptId, executionContext, sourceURL) {
-    var target = executionContext.target();
-    target.runtimeModel.runScript(
+    var runtimeModel = executionContext.runtimeModel;
+    runtimeModel.runScript(
         scriptId, executionContext.id, 'console', /* silent */ false, /* includeCommandLineAPI */ true,
-        /* returnByValue */ false, /* generatePreview */ true, /* awaitPromise */ undefined,
-        runCallback.bind(this, target));
+        /* returnByValue */ false, /* generatePreview */ true, /* awaitPromise */ undefined, runCallback.bind(this));
 
     /**
-     * @param {!SDK.Target} target
      * @param {?Protocol.Runtime.RemoteObject} result
      * @param {?Protocol.Runtime.ExceptionDetails=} exceptionDetails
      * @this {Snippets.ScriptSnippetModel}
      */
-    function runCallback(target, result, exceptionDetails) {
+    function runCallback(result, exceptionDetails) {
       if (!exceptionDetails)
-        this._printRunScriptResult(target, result, scriptId, sourceURL);
+        this._printRunScriptResult(runtimeModel, result, scriptId, sourceURL);
       else
-        this._printRunOrCompileScriptResultFailure(target, exceptionDetails, sourceURL);
+        this._printRunOrCompileScriptResultFailure(runtimeModel, exceptionDetails, sourceURL);
     }
   }
 
   /**
-   * @param {!SDK.Target} target
+   * @param {!SDK.RuntimeModel} runtimeModel
    * @param {?Protocol.Runtime.RemoteObject} result
    * @param {!Protocol.Runtime.ScriptId} scriptId
    * @param {?string=} sourceURL
    */
-  _printRunScriptResult(target, result, scriptId, sourceURL) {
+  _printRunScriptResult(runtimeModel, result, scriptId, sourceURL) {
     var consoleMessage = new ConsoleModel.ConsoleMessage(
-        target, ConsoleModel.ConsoleMessage.MessageSource.JS, ConsoleModel.ConsoleMessage.MessageLevel.Info, '',
-        undefined, sourceURL, undefined, undefined, undefined, [result], undefined, undefined, undefined, scriptId);
+        runtimeModel.target(), ConsoleModel.ConsoleMessage.MessageSource.JS,
+        ConsoleModel.ConsoleMessage.MessageLevel.Info, '', undefined, sourceURL, undefined, undefined, undefined,
+        [result], undefined, undefined, undefined, scriptId);
     ConsoleModel.consoleModel.addMessage(consoleMessage);
   }
 
   /**
-   * @param {!SDK.Target} target
+   * @param {!SDK.RuntimeModel} runtimeModel
    * @param {!Protocol.Runtime.ExceptionDetails} exceptionDetails
    * @param {?string=} sourceURL
    */
-  _printRunOrCompileScriptResultFailure(target, exceptionDetails, sourceURL) {
+  _printRunOrCompileScriptResultFailure(runtimeModel, exceptionDetails, sourceURL) {
     ConsoleModel.consoleModel.addMessage(ConsoleModel.ConsoleMessage.fromException(
-        target, exceptionDetails, undefined, undefined, sourceURL || undefined));
+        runtimeModel, exceptionDetails, undefined, undefined, sourceURL || undefined));
   }
 
   /**
    * @param {!Workspace.UISourceCode} uiSourceCode
    * @return {!Array.<!{breakpoint: !Bindings.BreakpointManager.Breakpoint, uiLocation: !Workspace.UILocation}>}
    */
   _removeBreakpoints(uiSourceCode) {
     var breakpointLocations = Bindings.breakpointManager.breakpointLocationsForUISourceCode(uiSourceCode);
     for (var i = 0; i < breakpointLocations.length; ++i)
       breakpointLocations[i].breakpoint.remove();
@@ skipping 311 matching lines @@
    */
   deleteFile(uiSourceCode) {
     this._model.deleteScriptSnippet(uiSourceCode);
   }
 };
 
 /**
  * @type {!Snippets.ScriptSnippetModel}
  */
 Snippets.scriptSnippetModel = new Snippets.ScriptSnippetModel(Workspace.workspace);