[DevTools] Make resource tree model optional

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
  */
@@ skipping 83 matching lines @@
         var executionContexts = newTarget.runtimeModel.executionContexts();
         if (!executionContexts.length)
             return;
 
         var newContext = null;
         for (var i = 0; i < executionContexts.length && !newContext; ++i) {
             if (this._shouldSwitchToContext(executionContexts[i]))
                 newContext = executionContexts[i];
         }
         for (var i = 0; i < executionContexts.length && !newContext; ++i) {
-            if (this._isMainFrameContext(executionContexts[i]))
+            if (this._isDefaultContext(executionContexts[i]))
                 newContext = executionContexts[i];
         }
         this._ignoreContextChanged = true;
         this._context.setFlavor(WebInspector.ExecutionContext, newContext || executionContexts[0]);
         this._ignoreContextChanged = false;
     },
 
     /**
      * @param {!WebInspector.ExecutionContext} executionContext
      * @return {boolean}
      */
     _shouldSwitchToContext: function(executionContext)
     {
         if (this._lastSelectedContextId && this._lastSelectedContextId === this._contextPersistentId(executionContext))
             return true;
-        if (!this._lastSelectedContextId && this._isMainFrameContext(executionContext))
+        if (!this._lastSelectedContextId && this._isDefaultContext(executionContext))
             return true;
         return false;
     },
 
     /**
      * @param {!WebInspector.ExecutionContext} executionContext
      * @return {boolean}
      */
-    _isMainFrameContext: function(executionContext)
+    _isDefaultContext: function(executionContext)
     {
-        if (!executionContext.isDefault)
+        if (!executionContext.isDefault || !executionContext.frameId)
             return false;
-        var frame = executionContext.target().resourceTreeModel.frameForId(executionContext.frameId);
+        if (executionContext.target().parentTarget())
+            return false;
+        var resourceTreeModel = WebInspector.ResourceTreeModel.fromTarget(executionContext.target());

[pfeldman, 2016/07/13 23:55:57]

This will not compile once we split sdk into js_sdk and browser_sdk.

[eostroukhov-old, 2016/07/20 23:46:15]

I believe Joel is looking into it. I am not sure what solution (injection?) he
will implement.

+        if (!resourceTreeModel)
+            return false;
+        var frame = resourceTreeModel.frameForId(executionContext.frameId);
         if (frame && frame.isMainFrame())
             return true;
         return false;
     },
 
     /**
      * @param {!WebInspector.Event} event
      */
     _onExecutionContextCreated: function(event)
     {
@@ skipping 15 matching lines @@
             this._currentExecutionContextGone();
     },
 
     _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)) {
+                if (this._isDefaultContext(executionContext)) {
                     newContext = executionContext;
                     break;
                 }
             }
         }
         if (!newContext) {
             for (var i = 0; i < targets.length && !newContext; ++i) {
                 var executionContexts = targets[i].runtimeModel.executionContexts();
                 if (executionContexts.length) {
                     newContext = executionContexts[0];
@@ skipping 28 matching lines @@
     var expressionString = expressionRange.toString();
 
     // The "[" is also a stop character, except when it's the last character of the expression.
     var pos = expressionString.lastIndexOf("[", expressionString.length - 2);
     if (pos !== -1)
         expressionString = expressionString.substr(pos + 1);
 
     var prefix = wordRange.toString();
     executionContext.completionsForExpression(expressionString, text, cursorOffset, prefix, force, completionsReadyCallback);
 }