DevTools: migrate sources panel sidebar to views.

third_party/WebKit/Source/devtools/front_end/sources/JavaScriptSourceFrame.js

 /*
  * Copyright (C) 2011 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 42 matching lines @@
     this._breakpointManager.addEventListener(WebInspector.BreakpointManager.Events.BreakpointAdded, this._breakpointAdded, this);
     this._breakpointManager.addEventListener(WebInspector.BreakpointManager.Events.BreakpointRemoved, this._breakpointRemoved, this);
 
     this.uiSourceCode().addEventListener(WebInspector.UISourceCode.Events.SourceMappingChanged, this._onSourceMappingChanged, this);
     this.uiSourceCode().addEventListener(WebInspector.UISourceCode.Events.WorkingCopyChanged, this._workingCopyChanged, this);
     this.uiSourceCode().addEventListener(WebInspector.UISourceCode.Events.WorkingCopyCommitted, this._workingCopyCommitted, this);
     this.uiSourceCode().addEventListener(WebInspector.UISourceCode.Events.TitleChanged, this._showBlackboxInfobarIfNeeded, this);
 
     /** @type {!Map.<!WebInspector.Target, !WebInspector.ResourceScriptFile>}*/
     this._scriptFileForTarget = new Map();
-    this._registerShortcuts();
     var targets = WebInspector.targetManager.targets();
     for (var i = 0; i < targets.length; ++i) {
         var scriptFile = WebInspector.debuggerWorkspaceBinding.scriptFile(uiSourceCode, targets[i]);
         if (scriptFile)
             this._updateScriptFile(targets[i]);
     }
 
     if (this._scriptFileForTarget.size || uiSourceCode.extension() === "js" || uiSourceCode.project().type() === WebInspector.projectTypes.Snippets)
         this._compiler = new WebInspector.JavaScriptCompiler(this);
 
@@ skipping 110 matching lines @@
     },
 
     _hideBlackboxInfobar: function()
     {
         if (!this._blackboxInfobar)
             return;
         this._blackboxInfobar.dispose();
         delete this._blackboxInfobar;
     },
 
-    _registerShortcuts: function()
-    {
-        var shortcutKeys = WebInspector.ShortcutsScreen.SourcesPanelShortcuts;
-        for (var i = 0; i < shortcutKeys.EvaluateSelectionInConsole.length; ++i) {
-            var keyDescriptor = shortcutKeys.EvaluateSelectionInConsole[i];
-            this.addShortcut(keyDescriptor.key, this._evaluateSelectionInConsole.bind(this));
-        }
-        for (var i = 0; i < shortcutKeys.AddSelectionToWatch.length; ++i) {
-            var keyDescriptor = shortcutKeys.AddSelectionToWatch[i];
-            this.addShortcut(keyDescriptor.key, this._addCurrentSelectionToWatch.bind(this));
-        }
-    },
-
-    _addCurrentSelectionToWatch: function()
-    {
-        var textSelection = this.textEditor.selection();
-        if (textSelection && !textSelection.isEmpty())
-            this._innerAddToWatch(this.textEditor.copyRange(textSelection));
-        return true;
-    },
-
-    /**
-     * @param {string} expression
-     */
-    _innerAddToWatch: function(expression)
-    {
-        this._scriptsPanel.addToWatch(expression);
-    },
-
-    /**
-     * @return {boolean}
-     */
-    _evaluateSelectionInConsole: function()
-    {
-        var selection = this.textEditor.selection();
-        if (!selection || selection.isEmpty())
-            return true;
-        this._evaluateInConsole(this.textEditor.copyRange(selection));
-        return true;
-    },
-
-    /**
-     * @param {string} expression
-     */
-    _evaluateInConsole: function(expression)
-    {
-        var currentExecutionContext = WebInspector.context.flavor(WebInspector.ExecutionContext);
-        if (currentExecutionContext)
-            WebInspector.ConsoleModel.evaluateCommandInConsole(currentExecutionContext, expression);
-    },
-
     /**
      * @override
      */
     wasShown: function()
     {
         WebInspector.UISourceCodeFrame.prototype.wasShown.call(this);
         if (this._executionLocation && this.loaded) {
             // We need CodeMirrorTextEditor to be initialized prior to this call. @see crbug.com/499889
             setImmediate(this._generateValuesInSource.bind(this));
         }
@@ skipping 54 matching lines @@
         }
         return new Promise(populate.bind(this));
     },
 
     /**
      * @override
      * @return {!Promise}
      */
     populateTextAreaContextMenu: function(contextMenu, lineNumber, columnNumber)
     {
-        var textSelection = this.textEditor.selection();
-        if (textSelection && !textSelection.isEmpty()) {
-            var selection = this.textEditor.copyRange(textSelection);
-            var addToWatchLabel = WebInspector.UIString.capitalize("Add to ^watch");
-            contextMenu.appendItem(addToWatchLabel, this._innerAddToWatch.bind(this, selection));
-            var evaluateLabel = WebInspector.UIString.capitalize("Evaluate in ^console");
-            contextMenu.appendItem(evaluateLabel, this._evaluateInConsole.bind(this, selection));
-            contextMenu.appendSeparator();
-        }
-
         /**
          * @param {!WebInspector.ResourceScriptFile} scriptFile
          */
         function addSourceMapURL(scriptFile)
         {
             WebInspector.AddSourceMapURLDialog.show(addSourceMapURLDialogCallback.bind(null, scriptFile));
         }
 
         /**
          * @param {!WebInspector.ResourceScriptFile} scriptFile
@@ skipping 202 matching lines @@
             startColumn: token.startColumn,
             endColumn: token.endColumn - 1
         };
 
         return anchorBox;
     },
 
     _resolveObjectForPopover: function(anchorBox, showCallback, objectGroupName)
     {
         var target = WebInspector.context.flavor(WebInspector.Target);
-        var debuggerModel = WebInspector.DebuggerModel.fromTarget(target);
-        if (!debuggerModel || !debuggerModel.isPaused()) {
+        var selectedCallFrame = WebInspector.context.flavor(WebInspector.DebuggerModel.CallFrame);
+        if (!selectedCallFrame) {
             this._popoverHelper.hidePopover();
             return;
         }
         var lineNumber = anchorBox.highlight.lineNumber;
         var startHighlight = anchorBox.highlight.startColumn;
         var endHighlight = anchorBox.highlight.endColumn;
         var line = this.textEditor.line(lineNumber);
         if (!anchorBox.forSelection) {
             while (startHighlight > 1 && line.charAt(startHighlight - 1) === ".") {
                 var token = this.textEditor.tokenAtTextPosition(lineNumber, startHighlight - 2);
                 if (!token || !token.type) {
                     this._popoverHelper.hidePopover();
                     return;
                 }
                 startHighlight = token.startColumn;
             }
         }
         var evaluationText = line.substring(startHighlight, endHighlight + 1);
-        var selectedCallFrame = /** @type {!WebInspector.DebuggerModel.CallFrame}*/ (debuggerModel.selectedCallFrame());
-
         WebInspector.SourceMapNamesResolver.resolveExpression(selectedCallFrame, evaluationText, this.uiSourceCode(), lineNumber, startHighlight, endHighlight).then(onResolve.bind(this));
 
         /**
          * @param {?string=} text
          * @this {WebInspector.JavaScriptSourceFrame}
          */
         function onResolve(text)
         {
             selectedCallFrame.evaluate(text || evaluationText, objectGroupName, false, true, false, false, showObjectPopover.bind(this));
         }
 
         /**
          * @param {?RuntimeAgent.RemoteObject} result
          * @param {!RuntimeAgent.ExceptionDetails=} exceptionDetails
          * @this {WebInspector.JavaScriptSourceFrame}
          */
         function showObjectPopover(result, exceptionDetails)
         {
             var target = WebInspector.context.flavor(WebInspector.Target);
-            if (selectedCallFrame.target() !== target || !debuggerModel.isPaused() || !result) {
+            var potentiallyUpdatedCallFrame = WebInspector.context.flavor(WebInspector.DebuggerModel.CallFrame);
+            if (selectedCallFrame !== potentiallyUpdatedCallFrame || !result) {
                 this._popoverHelper.hidePopover();
                 return;
             }
             this._popoverAnchorBox = anchorBox;
             showCallback(target.runtimeModel.createRemoteObject(result), !!exceptionDetails, this._popoverAnchorBox);
             // Popover may have been removed by showCallback().
             if (this._popoverAnchorBox) {
                 var highlightRange = new WebInspector.TextRange(lineNumber, startHighlight, lineNumber, endHighlight);
                 this._popoverAnchorBox._highlightDescriptor = this.textEditor.highlightRange(highlightRange, "source-frame-eval-expression");
             }
@@ skipping 110 matching lines @@
         }
     },
 
     _generateValuesInSource: function()
     {
         if (!WebInspector.moduleSetting("inlineVariableValues").get())
             return;
         var executionContext = WebInspector.context.flavor(WebInspector.ExecutionContext);
         if (!executionContext)
             return;
-        var callFrame = executionContext.debuggerModel.selectedCallFrame();
+        var callFrame = WebInspector.context.flavor(WebInspector.DebuggerModel.CallFrame);
         if (!callFrame)
             return;
 
         var localScope = callFrame.localScope();
         var functionLocation = callFrame.functionLocation();
         if (localScope && functionLocation)
             WebInspector.SourceMapNamesResolver.resolveScopeInObject(localScope).getAllProperties(false, this._prepareScopeVariables.bind(this, callFrame));
 
         if (this._clearValueWidgetsTimer) {
             clearTimeout(this._clearValueWidgetsTimer);
@@ skipping 396 matching lines @@
         this.uiSourceCode().removeEventListener(WebInspector.UISourceCode.Events.WorkingCopyChanged, this._workingCopyChanged, this);
         this.uiSourceCode().removeEventListener(WebInspector.UISourceCode.Events.WorkingCopyCommitted, this._workingCopyCommitted, this);
         this.uiSourceCode().removeEventListener(WebInspector.UISourceCode.Events.TitleChanged, this._showBlackboxInfobarIfNeeded, this);
         WebInspector.moduleSetting("skipStackFramesPattern").removeChangeListener(this._showBlackboxInfobarIfNeeded, this);
         WebInspector.moduleSetting("skipContentScripts").removeChangeListener(this._showBlackboxInfobarIfNeeded, this);
         WebInspector.UISourceCodeFrame.prototype.dispose.call(this);
     },
 
     __proto__: WebInspector.UISourceCodeFrame.prototype
 }