[DevTools] Rework some focus code.

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

 /*
  * Copyright (C) 2008 Apple Inc. All Rights Reserved.
  * Copyright (C) 2011 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:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
@@ skipping 419 matching lines @@
         lines.push(prefix + "[" + this.element.className + "]" + (this._children.length ? " {" : ""));
 
         for (var i = 0; i < this._children.length; ++i)
             this._children[i]._collectWidgetHierarchy(prefix + "    ", lines);
 
         if (this._children.length)
             lines.push(prefix + "}");
     },
 
     /**
-     * @param {!Element} element
+     * @param {?Element} element
      */
     setDefaultFocusedElement: function(element)
     {
         this._defaultFocusedElement = element;
     },
 
     /**
      * @param {!WebInspector.Widget} child
      */
     setDefaultFocusedChild: function(child)
     {
         WebInspector.Widget.__assert(child._parentWidget === this, "Attempt to set non-child widget as default focused.");
         this._defaultFocusedChild = child;
     },
 
     focus: function()
     {
+        if (!this.isShowing())
+            return;
+
         var element = this._defaultFocusedElement;
-        if (element && !element.isAncestor(this.element.ownerDocument.activeElement)) {
-            WebInspector.setCurrentFocusElement(element);
+        if (element) {
+            if (!element.hasFocus())
+                element.focus();
             return;
         }
 
         if (this._defaultFocusedChild && this._defaultFocusedChild._visible) {
             this._defaultFocusedChild.focus();
         } else {
             for (var child of this._children) {
                 if (child._visible) {
                     child.focus();
                     break;
                 }
             }
         }
 
     },
 
     /**
      * @return {boolean}
      */
     hasFocus: function()
     {
-        var activeElement = this.element.ownerDocument.activeElement;
-        return activeElement && activeElement.isSelfOrDescendant(this.element);
+        return this.element.hasFocus();
     },
 
     /**
      * @return {!Size}
      */
     measurePreferredSize: function()
     {
         var document = this.element.ownerDocument;
         var oldParent = this.element.parentElement;
         var oldNextSibling = this.element.nextSibling;
@@ skipping 245 matching lines @@
 WebInspector.VBoxWithResizeCallback.prototype = {
     onResize: function()
     {
         this._resizeCallback();
     },
 
     __proto__: WebInspector.VBox.prototype
 }
 
 /**
+ * @param {!WebInspector.Widget} widget
+ * @constructor
+ */
+WebInspector.WidgetFocusRestorer = function(widget)
+{
+    this._widget = widget;
+    this._previous = widget.element.ownerDocument.deepActiveElement();
+    widget.focus();
+}
+
+WebInspector.WidgetFocusRestorer.prototype = {
+    restore: function()
+    {
+        if (!this._widget)
+            return;
+        if (this._widget.hasFocus() && this._previous)
+            this._previous.focus();
+        this._previous = null;
+        this._widget = null;
+    }
+}
+
+/**
  * @override
  * @param {?Node} child
  * @return {?Node}
  * @suppress {duplicate}
  */
 Element.prototype.appendChild = function(child)
 {
     WebInspector.Widget.__assert(!child.__widget || child.parentElement === this, "Attempt to add widget via regular DOM operation.");
     return WebInspector.Widget._originalAppendChild.call(this, child);
 }
@@ skipping 21 matching lines @@
 {
     WebInspector.Widget.__assert(!child.__widgetCounter && !child.__widget, "Attempt to remove element containing widget via regular DOM operation");
     return WebInspector.Widget._originalRemoveChild.call(this, child);
 }
 
 Element.prototype.removeChildren = function()
 {
     WebInspector.Widget.__assert(!this.__widgetCounter, "Attempt to remove element containing widget via regular DOM operation");
     WebInspector.Widget._originalRemoveChildren.call(this);
 }