Bug 1471415: Fix logic in nsXULPopupManager::ShouldConsumeOnMouseWheelEvent. r=smaug
authorEmilio Cobos Álvarez <emilio@crisal.io>
Thu, 28 Jun 2018 16:52:14 +0000
changeset 479439 6c5c7f763b65c4eab3ec5f61945366308fe5b4ca
parent 479438 803ff4b978c45629e313b4277b575a12c86c75ea
child 479440 cc00d5a02ec20413abeb2f177a66b4b96e2da3be
push id9719
push userffxbld-merge
push dateFri, 24 Aug 2018 17:49:46 +0000
treeherdermozilla-beta@719ec98fba77 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewerssmaug
bugs1471415, 1423990
milestone63.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 1471415: Fix logic in nsXULPopupManager::ShouldConsumeOnMouseWheelEvent. r=smaug It was accidentally toggled in bug 1423990. Differential Revision: https://phabricator.services.mozilla.com/D1863
layout/xul/nsXULPopupManager.cpp
--- a/layout/xul/nsXULPopupManager.cpp
+++ b/layout/xul/nsXULPopupManager.cpp
@@ -381,17 +381,17 @@ bool nsXULPopupManager::ShouldConsumeOnM
   nsMenuChainItem* item = GetTopVisibleMenu();
   if (!item)
     return false;
 
   nsMenuPopupFrame* frame = item->Frame();
   if (frame->PopupType() != ePopupTypePanel)
     return true;
 
-  return frame->GetContent()->AsElement()->AttrValueIs(
+  return !frame->GetContent()->AsElement()->AttrValueIs(
       kNameSpaceID_None, nsGkAtoms::type, nsGkAtoms::arrow, eCaseMatters);
 }
 
 // a menu should not roll up if activated by a mouse activate message (eg. X-mouse)
 bool nsXULPopupManager::ShouldRollupOnMouseActivate()
 {
   return false;
 }