[DevTools] Improve context and target naming.

third_party/WebKit/Source/devtools/front_end/console/ConsoleContextSelector.js

 // Copyright 2015 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.
 /**
  * @implements {SDK.TargetManager.Observer}
  * @unrestricted
  */
 Console.ConsoleContextSelector = class {
   /**
    * @param {!Element} selectElement
@@ skipping 15 matching lines @@
 
     this._selectElement.addEventListener('change', this._executionContextChanged.bind(this), false);
     UI.context.addFlavorChangeListener(SDK.ExecutionContext, this._executionContextChangedExternally, this);
   }
 
   /**
    * @param {!SDK.ExecutionContext} executionContext
    * @return {string}
    */
   _titleFor(executionContext) {
-    var result;
-    if (executionContext.isDefault) {
-      if (executionContext.frameId) {
-        var resourceTreeModel = SDK.ResourceTreeModel.fromTarget(executionContext.target());
-        var frame = resourceTreeModel && resourceTreeModel.frameForId(executionContext.frameId);
-        result = frame ? frame.displayName() : executionContext.label();
-      } else {
-        result = executionContext.target().decorateLabel(executionContext.label());
+    var target = executionContext.target();

[pfeldman, 2017/01/21 02:21:24]

According to the new guidelines, you should use const here.

[pfeldman, 2017/01/21 02:22:49]

My bad, it should be let.

+    var depth = 0;
+    var label = executionContext.label() ? target.decorateLabel(executionContext.label()) : '';
+    if (!executionContext.isDefault)
+      depth++;
+    if (executionContext.frameId) {
+      var resourceTreeModel = SDK.ResourceTreeModel.fromTarget(target);
+      var frame = resourceTreeModel && resourceTreeModel.frameForId(executionContext.frameId);
+      if (frame) {
+        label = label || frame.displayName();
+        while (frame.parentFrame) {
+          depth++;
+          frame = frame.parentFrame;
+        }
       }
-    } else {
-      result = '\u00a0\u00a0\u00a0\u00a0' + (executionContext.label() || executionContext.origin);
+    }
+    label = label || executionContext.origin;
+    while (target.parentTarget()) {
+      if (target.parentTarget().hasJSCapability())

[pfeldman, 2017/01/21 02:27:31]

Special case service workers?

[dgozman, 2017/01/23 19:20:35]

Done.

+        depth++;
+      target = target.parentTarget();
     }
 
+    var prefix = new Array(4 * depth + 1).join('\u00a0');
     var maxLength = 50;
-    return result.trimMiddle(maxLength);
+    return (prefix + label).trimMiddle(maxLength);
   }
 
   /**
    * @param {!SDK.ExecutionContext} executionContext
    */
   _executionContextCreated(executionContext) {
     // FIXME(413886): We never want to show execution context for the main thread of shadow page in service/shared worker frontend.
     // This check could be removed once we do not send this context to frontend.
     if (!executionContext.target().hasJSCapability())
       return;
@@ skipping 140 matching lines @@
 
   /**
    * @return {?Element}
    */
   _selectedOption() {
     if (this._selectElement.selectedIndex >= 0)
       return this._selectElement[this._selectElement.selectedIndex];
     return null;
   }
 };