From 975f9b571eb76ffb672c4bf13d6cc2f50843dd89 Mon Sep 17 00:00:00 2001 From: Marco Bonardo Date: Fri, 9 Dec 2016 14:17:12 -1000 Subject: [PATCH] Bug 1321556 - Remove unused bindings from urlbarbindings.xml. r=dao MozReview-Commit-ID: FfIsoh76ajn --HG-- extra : rebase_source : cfc30eb7a1d9961d108dbad9ca0fb32d5c208043 --- browser/base/content/browser-places.js | 1 - browser/base/content/browser.css | 8 +- browser/base/content/urlbarBindings.xml | 126 +----------------------- dom/base/nsGkAtomList.h | 1 - layout/xul/nsMenuPopupFrame.cpp | 1 - toolkit/themes/linux/global/menu.css | 7 +- toolkit/themes/windows/global/menu.css | 16 +-- 7 files changed, 9 insertions(+), 151 deletions(-) diff --git a/browser/base/content/browser-places.js b/browser/base/content/browser-places.js index b5b5e185dafe..08e326b7e0fe 100644 --- a/browser/base/content/browser-places.js +++ b/browser/base/content/browser-places.js @@ -834,7 +834,6 @@ var BookmarksEventHandler = { if (node.localName == "menupopup") node.hidePopup(); else if (node.localName != "menu" && - node.localName != "splitmenu" && node.localName != "hbox" && node.localName != "vbox" ) break; diff --git a/browser/base/content/browser.css b/browser/base/content/browser.css index b007362fced5..bcdc798e39cf 100644 --- a/browser/base/content/browser.css +++ b/browser/base/content/browser.css @@ -434,13 +434,7 @@ toolbar:not(#TabsToolbar) > #personal-bookmarks { background-position: bottom left; } -.menuitem-tooltip { - -moz-binding: url("chrome://browser/content/urlbarBindings.xml#menuitem-tooltip"); -} - -.menuitem-iconic-tooltip, -.menuitem-tooltip[type="checkbox"], -.menuitem-tooltip[type="radio"] { +.menuitem-iconic-tooltip { -moz-binding: url("chrome://browser/content/urlbarBindings.xml#menuitem-iconic-tooltip"); } diff --git a/browser/base/content/urlbarBindings.xml b/browser/base/content/urlbarBindings.xml index 2cb7538ae155..b49492b85407 100644 --- a/browser/base/content/urlbarBindings.xml +++ b/browser/base/content/urlbarBindings.xml @@ -2528,131 +2528,7 @@ file, You can obtain one at http://mozilla.org/MPL/2.0/. - - - - - - - - - - - - - - - document.getAnonymousElementByAttribute(this, "anonid", "menuitem"); - - - document.getAnonymousElementByAttribute(this, "anonid", "menu"); - - - 600 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + Equals(nsGkAtoms::menu, kNameSpaceID_XUL) || - ni->Equals(nsGkAtoms::splitmenu, kNameSpaceID_XUL) || ni->Equals(nsGkAtoms::popupset, kNameSpaceID_XUL) || ((ni->Equals(nsGkAtoms::button, kNameSpaceID_XUL) || ni->Equals(nsGkAtoms::toolbarbutton, kNameSpaceID_XUL)) && diff --git a/toolkit/themes/linux/global/menu.css b/toolkit/themes/linux/global/menu.css index 06e3b217bddc..386d9116ba8a 100644 --- a/toolkit/themes/linux/global/menu.css +++ b/toolkit/themes/linux/global/menu.css @@ -12,8 +12,7 @@ menu, menuitem, -menucaption, -.splitmenu-menuitem { +menucaption { -moz-appearance: menuitem; -moz-box-align: center; max-width: 42em; @@ -28,15 +27,13 @@ menuitem[default="true"] { } menu[_moz-menuactive="true"], -menuitem[_moz-menuactive="true"], -.splitmenu-menuitem[_moz-menuactive="true"] { +menuitem[_moz-menuactive="true"] { color: -moz-menuhovertext; background-color: -moz-menuhover; } menu[disabled="true"], menuitem[disabled="true"], -.splitmenu-menuitem[disabled="true"], menucaption[disabled="true"] { color: GrayText; } diff --git a/toolkit/themes/windows/global/menu.css b/toolkit/themes/windows/global/menu.css index 2a228251d4b1..aaaa3e1a5798 100644 --- a/toolkit/themes/windows/global/menu.css +++ b/toolkit/themes/windows/global/menu.css @@ -12,8 +12,7 @@ menu, menuitem, -menucaption, -.splitmenu-menuitem { +menucaption { -moz-appearance: menuitem; -moz-box-align: center; color: MenuText; @@ -28,10 +27,8 @@ menuitem[default="true"] { menu[disabled="true"], menuitem[disabled="true"], -.splitmenu-menuitem[disabled="true"], menu[_moz-menuactive="true"][disabled="true"], -menuitem[_moz-menuactive="true"][disabled="true"], -.splitmenu-menuitem[_moz-menuactive="true"][disabled="true"] { +menuitem[_moz-menuactive="true"][disabled="true"] { color: GrayText; text-shadow: none; } @@ -39,8 +36,7 @@ menuitem[_moz-menuactive="true"][disabled="true"], @media (-moz-windows-classic) { menu[disabled="true"], menubar > menu[disabled="true"][_moz-menuactive="true"], - menuitem[disabled="true"], - .splitmenu-menuitem[disabled="true"] { + menuitem[disabled="true"] { color: ThreeDShadow; text-shadow: 1px 1px ThreeDHighlight; } @@ -102,8 +98,7 @@ menucaption > .menu-iconic-text { } menu.menu-iconic > .menu-iconic-left, -menuitem.menuitem-iconic > .menu-iconic-left, -.splitmenu-menuitem[iconic="true"] > .menu-iconic-left { +menuitem.menuitem-iconic > .menu-iconic-left { -moz-appearance: menuimage; padding-top: 2px; } @@ -186,8 +181,7 @@ menupopup > menucaption { } menu[_moz-menuactive="true"], -menuitem[_moz-menuactive="true"], -.splitmenu-menuitem[_moz-menuactive="true"] { +menuitem[_moz-menuactive="true"] { background-color: -moz-menuhover; color: -moz-menuhovertext; }