[DevTools] Rework some focus code.

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

Index: third_party/WebKit/Source/devtools/front_end/ui/InplaceEditor.js
diff --git a/third_party/WebKit/Source/devtools/front_end/ui/InplaceEditor.js b/third_party/WebKit/Source/devtools/front_end/ui/InplaceEditor.js
index 4e5edea77088178d21ba36e5c5e2c267efc34d6e..ed4e6cc1d1a0bb668115deb1d3405ad18bf63a97 100644
--- a/third_party/WebKit/Source/devtools/front_end/ui/InplaceEditor.js
+++ b/third_party/WebKit/Source/devtools/front_end/ui/InplaceEditor.js
@@ -68,7 +68,7 @@ WebInspector.InplaceEditor.prototype = {
         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;
     },
 
@@ -149,7 +149,8 @@ WebInspector.InplaceEditor.prototype = {
             if (pasteCallback)
                 element.removeEventListener("paste", pasteEventListener, true);
 
-            WebInspector.restoreFocusFromElement(element);
+            if (self._focusRestorer)
+                self._focusRestorer.restore();
             self.closeEditor(editingContext);
         }