[DevTools] Rework some focus code.

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

Index: third_party/WebKit/Source/devtools/front_end/ui/SwatchPopoverHelper.js
diff --git a/third_party/WebKit/Source/devtools/front_end/ui/SwatchPopoverHelper.js b/third_party/WebKit/Source/devtools/front_end/ui/SwatchPopoverHelper.js
index ae761d33eb43aafdce5afd60f4bff4e324ece546..bf08ab9da5278ddaf5aa62bfe352a38f167e29a8 100644
--- a/third_party/WebKit/Source/devtools/front_end/ui/SwatchPopoverHelper.js
+++ b/third_party/WebKit/Source/devtools/front_end/ui/SwatchPopoverHelper.js
@@ -67,13 +67,12 @@ WebInspector.SwatchPopoverHelper.prototype = {
 
     reposition: function()
     {
-        if (!this._previousFocusElement)
-            this._previousFocusElement = WebInspector.currentFocusElement();
         // Unbind "blur" listener to avoid reenterability: |popover.showView| will hide the popover and trigger it synchronously.
         this._view.contentElement.removeEventListener("focusout", this._boundFocusOut, false);
         this._popover.showView(this._view, this._anchorElement);
         this._view.contentElement.addEventListener("focusout", this._boundFocusOut, false);
-        WebInspector.setCurrentFocusElement(this._view.contentElement);
+        if (!this._savedFocus)
+            this._savedFocus = WebInspector.saveFocusedElement(this._view.contentElement);
     },
 
     /**
@@ -93,8 +92,7 @@ WebInspector.SwatchPopoverHelper.prototype = {
         if (this._hiddenCallback)
             this._hiddenCallback.call(null, !!commitEdit);
 
-        WebInspector.setCurrentFocusElement(this._previousFocusElement);
-        delete this._previousFocusElement;
+        this._savedFocus = WebInspector.restoreFocusedElement(this._view.contentElement, this._savedFocus);
         delete this._anchorElement;
         if (this._view) {
             this._view.detach();