DevTools: Repick execution context when frames are loaded

third_party/WebKit/Source/devtools/front_end/components/ExecutionContextSelector.js

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 /**
  * @constructor
  * @implements {WebInspector.TargetManager.Observer}
  * @param {!WebInspector.TargetManager} targetManager
  * @param {!WebInspector.Context} context
  */
 WebInspector.ExecutionContextSelector = function(targetManager, context)
 {
     targetManager.observeTargets(this, WebInspector.Target.Capability.JS);
     context.addFlavorChangeListener(WebInspector.ExecutionContext, this._executionContextChanged, this);
     context.addFlavorChangeListener(WebInspector.Target, this._targetChanged, this);
 
     targetManager.addModelListener(WebInspector.RuntimeModel, WebInspector.RuntimeModel.Events.ExecutionContextCreated, this._onExecutionContextCreated, this);
     targetManager.addModelListener(WebInspector.RuntimeModel, WebInspector.RuntimeModel.Events.ExecutionContextDestroyed, this._onExecutionContextDestroyed, this);
+    targetManager.addModelListener(WebInspector.RuntimeModel, WebInspector.RuntimeModel.Events.ResortExecutionContexts, this._onResortExecutionContexts, this);

[pfeldman, 2016/08/16 16:28:28]

ExecutionContextOrderChanged.

[einbinder, 2016/08/16 17:36:09]

Done.

     this._targetManager = targetManager;
     this._context = context;
 }
 
 WebInspector.ExecutionContextSelector.prototype = {
 
     /**
      * @override
      * @param {!WebInspector.Target} target
      */
@@ skipping 123 matching lines @@
     /**
      * @param {!WebInspector.Event} event
      */
     _onExecutionContextDestroyed: function(event)
     {
         var executionContext = /** @type {!WebInspector.ExecutionContext}*/ (event.data);
         if (this._context.flavor(WebInspector.ExecutionContext) === executionContext)
             this._currentExecutionContextGone();
     },
 
+    /**
+     * @param {!WebInspector.Event} event
+     */
+    _onResortExecutionContexts: function(event)
+    {
+        var runtimeModel = /** @type {!WebInspector.RuntimeModel} */ (event.data);
+        var executionContexts = runtimeModel.executionContexts();
+        for (var i = 0; i < executionContexts.length; i++) {
+            var executionContext = executionContexts[i];
+            if (this._shouldSwitchToContext(executionContext)) {

[pfeldman, 2016/08/16 16:28:28]

_onExecutionContextCreated has similar semantics. Please extract.

[einbinder, 2016/08/16 17:36:09]

Done.

+                this._ignoreContextChanged = true;
+                this._context.setFlavor(WebInspector.ExecutionContext, executionContext);
+                this._ignoreContextChanged = false;
+                break;
+            }
+        }
+    },
+
     _currentExecutionContextGone: function()
     {
         var targets = this._targetManager.targets(WebInspector.Target.Capability.JS);
         var newContext = null;
         for (var i = 0; i < targets.length && !newContext; ++i) {
             var executionContexts = targets[i].runtimeModel.executionContexts();
             for (var executionContext of executionContexts) {
                 if (this._isMainFrameContext(executionContext)) {
                     newContext = executionContext;
                     break;
@@ skipping 61 matching lines @@
             bracketCount--;
             if (bracketCount < 0)
                 break;
         }
         index--;
     }
     clippedExpression = clippedExpression.substring(index + 1);
 
     executionContext.completionsForExpression(clippedExpression, completionsPrefix, force, completionsReadyCallback);
 }