DevTools: fix focus restoration from command menu

third_party/WebKit/Source/devtools/front_end/ui/Dialog.js

 /*
  * Copyright (C) 2012 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 55 matching lines @@
     {
         if (WebInspector.Dialog._instance)
             WebInspector.Dialog._instance.detach();
         WebInspector.Dialog._instance = this;
 
         var document = /** @type {!Document} */ (WebInspector.Dialog._modalHostView.element.ownerDocument);
         this._disableTabIndexOnElements(document);
 
         this._glassPane = new WebInspector.GlassPane(document, this._dimmed);
         this._glassPane.element.addEventListener("click", this._onGlassPaneClick.bind(this), false);
-        WebInspector.GlassPane.DefaultFocusedViewStack.push(this);
+        WebInspector.GlassPane.DefaultFocusedViewStack.push(WebInspector.currentFocusElement() || WebInspector.inspectorView);

[dgozman, 2016/04/28 01:28:29]

This makes me think whether we should unify DefaultFocusedViewStack and
currentFocusElement? Looks like there is no need to have them both.

 
         WebInspector.Widget.prototype.show.call(this, this._glassPane.element);
 
         this._position();
         this.focus();
     },
 
     /**
      * @override
      */
     detach: function()
     {
         WebInspector.Widget.prototype.detach.call(this);
-
+        this._glassPane.dispose();
         WebInspector.GlassPane.DefaultFocusedViewStack.pop();
-        this._glassPane.dispose();
         delete this._glassPane;
 
         this._restoreTabIndexOnElements();
 
         delete WebInspector.Dialog._instance;
     },
 
     addCloseButton: function()
     {
         var closeButton = this.contentElement.createChild("div", "dialog-close-button", "dt-close-button");
@@ skipping 148 matching lines @@
 {
     return WebInspector.Dialog._modalHostView;
 };
 
 WebInspector.Dialog.modalHostRepositioned = function()
 {
     if (WebInspector.Dialog._instance)
         WebInspector.Dialog._instance._position();
 };