[DevTools] Rework some focus code.

third_party/WebKit/Source/devtools/front_end/ui/InplaceEditor.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
  */
 WebInspector.InplaceEditor = function()
 {
 }
@@ skipping 50 matching lines @@
     },
 
     setUpEditor: function(editingContext)
     {
         var element = editingContext.element;
         element.classList.add("editing");
 
         var oldTabIndex = element.getAttribute("tabIndex");
         if (typeof oldTabIndex !== "number" || oldTabIndex < 0)
             element.tabIndex = 0;
-        WebInspector.setCurrentFocusElement(element);
+        this._focusRestorer = new WebInspector.ElementFocusRestorer(element);
         editingContext.oldTabIndex = oldTabIndex;
     },
 
     closeEditor: function(editingContext)
     {
         var element = editingContext.element;
         element.classList.remove("editing");
 
         if (typeof editingContext.oldTabIndex !== "number")
             element.removeAttribute("tabIndex");
@@ skipping 60 matching lines @@
 
         function cleanUpAfterEditing()
         {
             WebInspector.markBeingEdited(element, false);
 
             element.removeEventListener("blur", blurEventListener, isMultiline);
             element.removeEventListener("keydown", keyDownEventListener, true);
             if (pasteCallback)
                 element.removeEventListener("paste", pasteEventListener, true);
 
-            WebInspector.restoreFocusFromElement(element);
+            if (self._focusRestorer)
+                self._focusRestorer.restore();
             self.closeEditor(editingContext);
         }
 
         /** @this {Element} */
         function editingCancelled()
         {
             self.cancelEditing(editingContext);
             cleanUpAfterEditing();
             cancelledCallback(this, context);
         }
@@ skipping 129 matching lines @@
     },
 
     /**
      * @param {function(!Event):string} postKeydownFinishHandler
      */
     setPostKeydownFinishHandler: function(postKeydownFinishHandler)
     {
         this.postKeydownFinishHandler = postKeydownFinishHandler;
     }
 }