DevTools: migrate some of the sources panel sidebar panes to view management, allow view toolbars.

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

 /*
  * Copyright (C) 2008 Apple Inc. All Rights Reserved.
  * 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:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
@@ skipping 68 matching lines @@
     this._sourcesView = new WebInspector.SourcesView();
     this._sourcesView.addEventListener(WebInspector.SourcesView.Events.EditorSelected, this._editorSelected.bind(this));
     this._sourcesView.addEventListener(WebInspector.SourcesView.Events.EditorClosed, this._editorClosed.bind(this));
     this._sourcesView.registerShortcuts(this.registerShortcuts.bind(this));
     this.editorView.setMainWidget(this._sourcesView);
 
     this.sidebarPanes = {};
     this.sidebarPanes.threads = null;
     this.sidebarPanes.watchExpressions = new WebInspector.WatchExpressionsSidebarPane();
     this.sidebarPanes.callstack = new WebInspector.CallStackSidebarPane();
-    this.sidebarPanes.callstack.addEventListener(WebInspector.CallStackSidebarPane.Events.CallFrameSelected, this._callFrameSelectedInSidebar.bind(this));
     this.sidebarPanes.callstack.registerShortcuts(this.registerShortcuts.bind(this));
 
     this.sidebarPanes.scopechain = new WebInspector.ScopeChainSidebarPane();
     this.sidebarPanes.jsBreakpoints = new WebInspector.JavaScriptBreakpointsSidebarPane(WebInspector.breakpointManager, this.showUISourceCode.bind(this));
-    this.sidebarPanes.xhrBreakpoints = new WebInspector.XHRBreakpointsSidebarPane();
-    this.sidebarPanes.eventListenerBreakpoints = new WebInspector.EventListenerBreakpointsSidebarPane();
-    this.sidebarPanes.objectEventListeners = new WebInspector.ObjectEventListenersSidebarPane();
 
     this._installDebuggerSidebarController();
 
     WebInspector.moduleSetting("sidebarPosition").addChangeListener(this._updateSidebarPosition.bind(this));
     this._updateSidebarPosition();
 
     this._updateDebuggerButtons();
     this._pauseOnExceptionEnabledChanged();
     WebInspector.moduleSetting("pauseOnExceptionEnabled").addChangeListener(this._pauseOnExceptionEnabledChanged, this);
 
     this._liveLocationPool = new WebInspector.LiveLocationPool();
 
     this._setTarget(WebInspector.context.flavor(WebInspector.Target));
     WebInspector.breakpointManager.addEventListener(WebInspector.BreakpointManager.Events.BreakpointsActiveStateChanged, this._breakpointsActiveStateChanged, this);
     WebInspector.context.addFlavorChangeListener(WebInspector.Target, this._onCurrentTargetChanged, this);
     WebInspector.targetManager.addModelListener(WebInspector.DebuggerModel, WebInspector.DebuggerModel.Events.DebuggerWasEnabled, this._debuggerWasEnabled, this);
     WebInspector.targetManager.addModelListener(WebInspector.DebuggerModel, WebInspector.DebuggerModel.Events.DebuggerPaused, this._debuggerPaused, this);
     WebInspector.targetManager.addModelListener(WebInspector.DebuggerModel, WebInspector.DebuggerModel.Events.DebuggerResumed, this._debuggerResumed, this);
-    WebInspector.targetManager.addModelListener(WebInspector.DebuggerModel, WebInspector.DebuggerModel.Events.CallFrameSelected, this._callFrameSelected, this);
-    WebInspector.targetManager.addModelListener(WebInspector.DebuggerModel, WebInspector.DebuggerModel.Events.ConsoleCommandEvaluatedInSelectedCallFrame, this._consoleCommandEvaluatedInSelectedCallFrame, this);
+    WebInspector.targetManager.addModelListener(WebInspector.DebuggerModel, WebInspector.DebuggerModel.Events.CallFrameSelected, this._callFrameSelectedOnModel, this);
     WebInspector.targetManager.addModelListener(WebInspector.DebuggerModel, WebInspector.DebuggerModel.Events.GlobalObjectCleared, this._debuggerReset, this);
     new WebInspector.WorkspaceMappingTip(this, this._workspace);
     WebInspector.extensionServer.addEventListener(WebInspector.ExtensionServer.Events.SidebarPaneAdded, this._extensionSidebarPaneAdded, this);
     WebInspector.DataSaverInfobar.maybeShowInPanel(this);
     WebInspector.targetManager.observeTargets(this);
 }
 
 WebInspector.SourcesPanel._lastModificationTimeout = 200;
 
 WebInspector.SourcesPanel.minToolbarWidth = 215;
@@ skipping 38 matching lines @@
         if (!target)
             return;
         var debuggerModel = WebInspector.DebuggerModel.fromTarget(target);
         if (!debuggerModel)
             return;
 
         if (debuggerModel.isPaused()) {
             this._showDebuggerPausedDetails(/** @type {!WebInspector.DebuggerPausedDetails} */ (debuggerModel.debuggerPausedDetails()));
             var callFrame = debuggerModel.selectedCallFrame();
             if (callFrame)
-                this._selectCallFrame(callFrame);
+                this._selectCallFrameInUI(callFrame);
         } else {
             this._paused = false;
             this._clearInterface();
             this._toggleDebuggerSidebarButton.disabled = false;
         }
     },
 
     /**
      * @param {!WebInspector.Event} event
      */
@@ skipping 64 matching lines @@
 
     /**
      * @override
      * @return {!WebInspector.SearchableView}
      */
     searchableView: function()
     {
         return this._sourcesView.searchableView();
     },
 
-    _consoleCommandEvaluatedInSelectedCallFrame: function(event)
-    {
-        var debuggerModel =  /** @type {!WebInspector.DebuggerModel} */  (event.target);
-        var target = debuggerModel.target();
-        if (WebInspector.context.flavor(WebInspector.Target) !== target)
-            return;
-        this.sidebarPanes.scopechain.update(debuggerModel.selectedCallFrame());

[dgozman, 2016/08/11 01:42:16]

Let's also fix the watches.

-    },
-
     /**
      * @param {!WebInspector.Event} event
      */
     _debuggerPaused: function(event)
     {
         var details = /** @type {!WebInspector.DebuggerPausedDetails} */ (event.data);
         if (!this._paused)
             WebInspector.inspectorView.setCurrentPanel(this);
 
         if (WebInspector.context.flavor(WebInspector.Target) === details.target())
             this._showDebuggerPausedDetails(details);
         else if (!this._paused)
             WebInspector.context.setFlavor(WebInspector.Target, details.target());
     },
 
     /**
      * @param {!WebInspector.DebuggerPausedDetails} details
      */
     _showDebuggerPausedDetails: function(details)
     {
         this._paused = true;
         this._updateDebuggerButtons();
 
-        this.sidebarPanes.callstack.update(details);
-
         /**
          * @param {!WebInspector.LiveLocation} liveLocation
          * @this {WebInspector.SourcesPanel}
          */
         function didGetUILocation(liveLocation)
         {
             var uiLocation = liveLocation.uiLocation();
             if (!uiLocation)
                 return;
             var breakpoint = WebInspector.breakpointManager.findBreakpointOnLine(uiLocation.uiSourceCode, uiLocation.lineNumber);
             if (!breakpoint)
                 return;
             this.sidebarPanes.jsBreakpoints.highlightBreakpoint(breakpoint);
             this.sidebarPanes.callstack.setStatus(WebInspector.UIString("Paused on a JavaScript breakpoint."));
         }
 
         if (details.reason === WebInspector.DebuggerModel.BreakReason.DOM) {
-            WebInspector.domBreakpointsSidebarPane.highlightBreakpoint(details.auxData);
             this.sidebarPanes.callstack.setStatus(WebInspector.domBreakpointsSidebarPane.createBreakpointHitStatusMessage(details));
         } else if (details.reason === WebInspector.DebuggerModel.BreakReason.EventListener) {
             var eventName = details.auxData["eventName"];
-            var targetName = details.auxData["targetName"];
-            this.sidebarPanes.eventListenerBreakpoints.highlightBreakpoint(eventName, targetName);
             var eventNameForUI = WebInspector.EventListenerBreakpointsSidebarPane.eventNameForUI(eventName, details.auxData);
             this.sidebarPanes.callstack.setStatus(WebInspector.UIString("Paused on a \"%s\" Event Listener.", eventNameForUI));
         } else if (details.reason === WebInspector.DebuggerModel.BreakReason.XHR) {
-            this.sidebarPanes.xhrBreakpoints.highlightBreakpoint(details.auxData["breakpointURL"]);
             this.sidebarPanes.callstack.setStatus(WebInspector.UIString("Paused on a XMLHttpRequest."));
         } else if (details.reason === WebInspector.DebuggerModel.BreakReason.Exception) {
             var description = details.auxData["description"] || "";
             this.sidebarPanes.callstack.setStatus(WebInspector.UIString("Paused on exception: '%s'.", description.split("\n", 1)[0]));
         } else if (details.reason === WebInspector.DebuggerModel.BreakReason.PromiseRejection) {
             var description = details.auxData["description"] || "";
             this.sidebarPanes.callstack.setStatus(WebInspector.UIString("Paused on promise rejection: '%s'.", description.split("\n", 1)[0]));
         } else if (details.reason === WebInspector.DebuggerModel.BreakReason.Assert) {
             this.sidebarPanes.callstack.setStatus(WebInspector.UIString("Paused on assertion."));
         } else if (details.reason === WebInspector.DebuggerModel.BreakReason.DebugCommand) {
@@ skipping 156 matching lines @@
     },
 
     _updateLastModificationTimeForTest: function()
     {
         WebInspector.SourcesPanel._lastModificationTimeout = Number.MAX_VALUE;
     },
 
     /**
      * @param {!WebInspector.Event} event
      */
-    _callFrameSelected: function(event)
+    _callFrameSelectedOnModel: function(event)
     {
         var callFrame = /** @type {?WebInspector.DebuggerModel.CallFrame} */ (event.data);
-
         if (!callFrame || callFrame.target() !== WebInspector.context.flavor(WebInspector.Target))
             return;
-
-        this._selectCallFrame(callFrame);
+        this._selectCallFrameInUI(callFrame);
     },
 
     /**
      * @param {!WebInspector.DebuggerModel.CallFrame}  callFrame
      */
-    _selectCallFrame: function(callFrame)
+    _selectCallFrameInUI: function(callFrame)
     {
-        this.sidebarPanes.scopechain.update(callFrame);
-        this.sidebarPanes.watchExpressions.refreshExpressions();
-        this.sidebarPanes.callstack.setSelectedCallFrame(callFrame);
+        WebInspector.context.setFlavor(WebInspector.DebuggerModel.CallFrame, callFrame);
         WebInspector.debuggerWorkspaceBinding.createCallFrameLiveLocation(callFrame.location(), this._executionLineChanged.bind(this), this._liveLocationPool);
     },
 
     _pauseOnExceptionEnabledChanged: function()
     {
         var enabled = WebInspector.moduleSetting("pauseOnExceptionEnabled").get();
         this._pauseOnExceptionButton.setToggled(enabled);
         this._pauseOnExceptionButton.setTitle(WebInspector.UIString(enabled ? "Don't pause on exceptions" : "Pause on exceptions"));
         this._debugToolbarDrawer.classList.toggle("expanded", enabled);
     },
@@ skipping 17 matching lines @@
             this._togglePauseAction.setToggled(false);
             this._togglePauseAction.setEnabled(!currentDebuggerModel.isPausing());
             this._stepOverAction.setEnabled(false);
             this._stepIntoAction.setEnabled(false);
             this._stepOutAction.setEnabled(false);
         }
     },
 
     _clearInterface: function()
     {
-        this.sidebarPanes.callstack.update(null);
-        this.sidebarPanes.scopechain.update(null);
         this.sidebarPanes.jsBreakpoints.clearBreakpointHighlight();
-        WebInspector.domBreakpointsSidebarPane.clearBreakpointHighlight();
-        this.sidebarPanes.eventListenerBreakpoints.clearBreakpointHighlight();
-        this.sidebarPanes.xhrBreakpoints.clearBreakpointHighlight();
         if (this.sidebarPanes.asyncOperationBreakpoints)

[dgozman, 2016/08/11 01:42:16]

Remove.

             this.sidebarPanes.asyncOperationBreakpoints.clearBreakpointHighlight();
 
         this._sourcesView.clearCurrentExecutionLine();
         this._updateDebuggerButtons();
 
         if (this._switchToPausedTargetTimeout)
             clearTimeout(this._switchToPausedTargetTimeout);
         this._liveLocationPool.disposeAll();
     },
 
@@ skipping 153 matching lines @@
     {
         var debuggerModel = this._prepareToResume();
         if (!debuggerModel)
             return true;
 
         debuggerModel.stepOut();
         return true;
     },
 
     /**
-     * @param {!WebInspector.Event} event
-     */
-    _callFrameSelectedInSidebar: function(event)
-    {
-        var callFrame = /** @type {!WebInspector.DebuggerModel.CallFrame} */ (event.data);
-        callFrame.debuggerModel.setSelectedCallFrame(callFrame);
-    },
-
-    /**
      * @param {!WebInspector.UILocation} uiLocation
      */
     _continueToLocation: function(uiLocation)
     {
         var executionContext = WebInspector.context.flavor(WebInspector.ExecutionContext);
         if (!executionContext)
             return;
 
         // Always use 0 column.
         var rawLocation = WebInspector.debuggerWorkspaceBinding.uiLocationToRawLocation(executionContext.target(), uiLocation.uiSourceCode, uiLocation.lineNumber, 0);
@@ skipping 407 matching lines @@
                     this._sidebarPaneStack.appendView(this.sidebarPanes[pane]);
             }
             this._extensionSidebarPanesContainer = this._sidebarPaneStack;
             this.sidebarPaneView = vbox;
         } else {
             var splitWidget = new WebInspector.SplitWidget(true, true, "sourcesPanelDebuggerSidebarSplitViewState", 0.5);
             splitWidget.setMainWidget(vbox);
 
             // Populate the left stack.
             this._sidebarPaneStack.showView(this.sidebarPanes.jsBreakpoints);
-            this._sidebarPaneStack.appendView(this.sidebarPanes.xhrBreakpoints);
-            this._sidebarPaneStack.appendView(this.sidebarPanes.eventListenerBreakpoints);
-            this._sidebarPaneStack.appendView(this.sidebarPanes.objectEventListeners);
 
             var tabbedLocation = WebInspector.viewManager.createTabbedLocation(this._setAsCurrentPanel.bind(this));
             splitWidget.setSidebarWidget(tabbedLocation.tabbedPane());
             tabbedLocation.appendView(this.sidebarPanes.scopechain);
             tabbedLocation.appendView(this.sidebarPanes.watchExpressions);
             this._extensionSidebarPanesContainer = tabbedLocation;
             this.sidebarPaneView = splitWidget;
         }
 
         this._sidebarPaneStack.appendApplicableItems("sources-sidebar");
@@ skipping 297 matching lines @@
     __proto__: WebInspector.VBox.prototype
 }
 
 /**
  * @return {boolean}
  */
 WebInspector.SourcesPanel.WrapperView.isShowing = function()
 {
     return !!WebInspector.SourcesPanel.WrapperView._instance && WebInspector.SourcesPanel.WrapperView._instance.isShowing();
 }