DevTools: Use FocusRestorer in SoftContextMenu

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

 /*
  * 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
  *    notice, this list of conditions and the following disclaimer in the
@@ skipping 51 matching lines @@
     this._contextMenuElement.addEventListener('mouseup', e => e.consume(), false);
     this._contextMenuElement.addEventListener('keydown', this._menuKeyDown.bind(this), false);
 
     for (var i = 0; i < this._items.length; ++i)
       this._contextMenuElement.appendChild(this._createMenuItem(this._items[i]));
 
     this._glassPane.show(document);
     this._focus();
 
     if (!this._parentMenu) {
-      this._onBodyMouseDown = event => this._discardMenu(true, event);
+      this._onBodyMouseDown = event => {
+        this.discard();
+        event.consume(true);
+      };
       this._document.body.addEventListener('mousedown', this._onBodyMouseDown, false);
     }
   }
 
   discard() {
-    this._discardMenu(true);
+    if (this._subMenu)
+      this._subMenu._discardSubMenus();

[dgozman, 2017/04/18 18:40:20]

You removed this method.

[einbinder, 2017/04/18 23:47:02]

Fixed

+    if (this._focusRestorer)
+      this._focusRestorer.restore();
+    if (this._glassPane) {
+      this._glassPane.hide();
+      delete this._glassPane;
+      if (this._onBodyMouseDown) {
+        this._document.body.removeEventListener('mousedown', this._onBodyMouseDown, false);
+        delete this._onBodyMouseDown;
+      }
+    }
+    if (this._parentMenu)
+      delete this._parentMenu._subMenu;
   }
 
   _createMenuItem(item) {
     if (item.type === 'separator')
       return this._createSeparator();
 
     if (item.type === 'subMenu')
       return this._createSubMenu(item);
 
     var menuItemElement = createElementWithClass('div', 'soft-context-menu-item');
@@ skipping 60 matching lines @@
   _menuItemMouseDown(event) {
     // Do not let separator's mouse down hit menu's handler - we need to receive mouse up!
     event.consume(true);
   }
 
   _menuItemMouseUp(event) {
     this._triggerAction(event.target, event);
     event.consume();
   }
 
+  /**
+   * @return {!UI.SoftContextMenu}
+   */
+  _root() {
+    var root = this;
+    while (root._parentMenu)
+      root = root._parentMenu;
+    return root;
+  }
+
   _focus() {

[dgozman, 2017/04/18 18:40:20]

Does anyone call this? Inline into show?

[einbinder, 2017/04/18 23:47:02]

Inlined.

-    this._contextMenuElement.focus();
+    this._focusRestorer = new UI.ElementFocusRestorer(this._contextMenuElement);
   }
 
   _triggerAction(menuItemElement, event) {
     if (!menuItemElement._subItems) {
-      this._discardMenu(true, event);
+      this._root().discard();
+      event.consume(true);
       if (typeof menuItemElement._actionId !== 'undefined') {
         this._itemSelectedCallback(menuItemElement._actionId);
         delete menuItemElement._actionId;
       }
       return;
     }
 
     this._showSubMenu(menuItemElement);
     event.consume();
   }
 
   _showSubMenu(menuItemElement) {
     if (menuItemElement._subMenuTimer) {
       clearTimeout(menuItemElement._subMenuTimer);
       delete menuItemElement._subMenuTimer;
     }
     if (this._subMenu)
       return;
 
     this._subMenu = new UI.SoftContextMenu(menuItemElement._subItems, this._itemSelectedCallback, this);
     var anchorBox = menuItemElement.boxInWindow();
     // Adjust for padding.
     anchorBox.y -= 5;
     anchorBox.x += 3;
     anchorBox.width -= 6;
     anchorBox.height += 10;
     this._subMenu.show(this._document, anchorBox);
   }
 
-  _hideSubMenu() {
-    if (!this._subMenu)
-      return;
-    this._subMenu._discardSubMenus();
-    this._focus();
-  }
-
   _menuItemMouseOver(event) {
     this._highlightMenuItem(event.target, true);
   }
 
   _menuItemMouseLeave(event) {
     if (!this._subMenu || !event.relatedTarget) {
       this._highlightMenuItem(null, true);
       return;
     }
 
     var relatedTarget = event.relatedTarget;
     if (relatedTarget === this._contextMenuElement)
       this._highlightMenuItem(null, true);
   }
 
   /**
    * @param {?Element} menuItemElement
    * @param {boolean} scheduleSubMenu
    */
   _highlightMenuItem(menuItemElement, scheduleSubMenu) {
     if (this._highlightedMenuItemElement === menuItemElement)
       return;
 
-    this._hideSubMenu();
+    if (this._subMenu)
+      this._subMenu.discard();
     if (this._highlightedMenuItemElement) {
       this._highlightedMenuItemElement.classList.remove('force-white-icons');
       this._highlightedMenuItemElement.classList.remove('soft-context-menu-item-mouse-over');
       if (this._highlightedMenuItemElement._subItems && this._highlightedMenuItemElement._subMenuTimer) {
         clearTimeout(this._highlightedMenuItemElement._subMenuTimer);
         delete this._highlightedMenuItemElement._subMenuTimer;
       }
     }
     this._highlightedMenuItemElement = menuItemElement;
     if (this._highlightedMenuItemElement) {
@@ skipping 30 matching lines @@
     switch (event.key) {
       case 'ArrowUp':
         this._highlightPrevious();
         break;
       case 'ArrowDown':
         this._highlightNext();
         break;
       case 'ArrowLeft':
         if (this._parentMenu) {
           this._highlightMenuItem(null, false);
-          this._parentMenu._hideSubMenu();
+          this.discard();
         }
         break;
       case 'ArrowRight':
         if (!this._highlightedMenuItemElement)
           break;
         if (this._highlightedMenuItemElement._subItems) {
           this._showSubMenu(this._highlightedMenuItemElement);
-          this._subMenu._focus();
           this._subMenu._highlightNext();
         }
         break;
       case 'Escape':
-        this._discardMenu(false, event);
+        this.discard();
         break;
       case 'Enter':
         if (!isEnterKey(event))
           break;
       // Fall through
       case ' ':  // Space
         if (this._highlightedMenuItemElement)
           this._triggerAction(this._highlightedMenuItemElement, event);
         if (this._highlightedMenuItemElement._subItems) {
           this._subMenu._focus();

[dgozman, 2017/04/18 18:40:20]

Let's double-check this.

           this._subMenu._highlightNext();
         }
         break;
     }
     event.consume(true);
   }
-
-  /**
-   * @param {boolean} closeParentMenus
-   * @param {!Event=} event
-   */
-  _discardMenu(closeParentMenus, event) {
-    if (this._subMenu && !closeParentMenus)
-      return;
-
-    this._discardSubMenus();
-
-    if (this._parentMenu) {
-      if (closeParentMenus)
-        this._parentMenu._discardMenu(closeParentMenus, event);
-      else
-        this._parentMenu._focus();
-    }
-
-    if (event)
-      event.consume(true);
-  }
-
-  _discardSubMenus() {
-    if (this._subMenu)
-      this._subMenu._discardSubMenus();
-    if (this._glassPane) {
-      this._glassPane.hide();
-      delete this._glassPane;
-      if (this._onBodyMouseDown) {
-        this._document.body.removeEventListener('mousedown', this._onBodyMouseDown, false);
-        delete this._onBodyMouseDown;
-      }
-    }
-    if (this._parentMenu)
-      delete this._parentMenu._subMenu;
-  }
 };