DevTools: fix deepActiveElement and focus on Dialog when document blurs

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 23 matching lines @@
  */
 WebInspector.Dialog = function()
 {
     WebInspector.Widget.call(this, true);
     this.markAsRoot();
     this.registerRequiredCSS("ui/dialog.css");
 
     this.contentElement.createChild("content");
     this.contentElement.tabIndex = 0;
     this.contentElement.addEventListener("focus", this._onFocus.bind(this), false);
-    this.contentElement.addEventListener("keydown", this._onKeyDown.bind(this), false);
+    this._keyDownBound = this._onKeyDown.bind(this);
 
     this._wrapsContent = false;
     this._dimmed = false;
     /** @type {!Map<!HTMLElement, number>} */
     this._tabIndexMap = new Map();
 }
 
 /**
- * TODO(dgozman): remove this method (it's only used for shortcuts handling).
  * @return {boolean}
  */
 WebInspector.Dialog.hasInstance = function()
 {
     return !!WebInspector.Dialog._instance;
 }
 
+WebInspector.Dialog.focus = function()

[dgozman, 2016/06/30 17:06:55]

Unused.

[luoe, 2016/06/30 17:48:05]

Done.

+{
+    if (WebInspector.Dialog._instance)
+        WebInspector.Dialog._instance.focus();
+}
+
 WebInspector.Dialog.prototype = {
     /**
      * @override
      */
     show: function()
     {
         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);
+        this.element.ownerDocument.body.addEventListener("keydown", this._keyDownBound, false);
 
         // When a dialog closes, focus should be restored to the previous focused element when
         // possible, otherwise the default inspector view element.
         WebInspector.Dialog._previousFocusedElement = WebInspector.currentFocusElement() || WebInspector.Dialog._modalHostView.defaultFocusedElement();
 
         WebInspector.Widget.prototype.show.call(this, this._glassPane.element);
 
         this._position();
         this.focus();
     },
 
     /**
      * @override
      */
     detach: function()
     {
+        this.element.ownerDocument.body.removeEventListener("keydown", this._keyDownBound, false);
         WebInspector.Widget.prototype.detach.call(this);
 
         this._glassPane.dispose();
         delete this._glassPane;
 
         if (WebInspector.Dialog._previousFocusedElement)
             WebInspector.Dialog._previousFocusedElement.focus();
         delete WebInspector.Dialog._previousFocusedElement;
 
         this._restoreTabIndexOnElements();
@@ skipping 178 matching lines @@
 {
     return WebInspector.Dialog._modalHostView;
 };
 
 WebInspector.Dialog.modalHostRepositioned = function()
 {
     if (WebInspector.Dialog._instance)
         WebInspector.Dialog._instance._position();
 };