Merge inbound to mozilla-central. a=merge
authorCsoregi Natalia <ncsoregi@mozilla.com>
Wed, 13 Mar 2019 23:43:54 +0200
changeset 521780 85d3d2603b8f
parent 521756 b8c1398f5a90 (current diff)
parent 521779 9d23034770a6 (diff)
child 521781 a8f1fd35587f
child 521832 703a4bccfbe8
push id10867
push userdvarga@mozilla.com
push dateThu, 14 Mar 2019 15:20:45 +0000
treeherdermozilla-beta@abad13547875 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersmerge
milestone67.0a1
first release with
nightly linux32
85d3d2603b8f / 67.0a1 / 20190313215409 / files
nightly linux64
85d3d2603b8f / 67.0a1 / 20190313215409 / files
nightly mac
85d3d2603b8f / 67.0a1 / 20190313215409 / files
nightly win32
85d3d2603b8f / 67.0a1 / 20190313215409 / files
nightly win64
85d3d2603b8f / 67.0a1 / 20190313215409 / files
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
releases
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Merge inbound to mozilla-central. a=merge
--- a/layout/base/nsCSSFrameConstructor.cpp
+++ b/layout/base/nsCSSFrameConstructor.cpp
@@ -4026,16 +4026,23 @@ nsCSSFrameConstructor::FindXULButtonData
                                          ComputedStyle&) {
   static const FrameConstructionData sXULMenuData =
       SIMPLE_XUL_FCDATA(NS_NewMenuFrame);
   if (aElement.AttrValueIs(kNameSpaceID_None, nsGkAtoms::type,
                            nsGkAtoms::menu, eCaseMatters)) {
     return &sXULMenuData;
   }
 
+#  ifdef MOZ_THUNDERBIRD
+  if (aElement.AttrValueIs(kNameSpaceID_None, nsGkAtoms::type,
+                           NS_LITERAL_STRING("menu-button"), eCaseMatters)) {
+    return &sXULMenuData;
+  }
+#  endif
+
   static const FrameConstructionData sXULButtonData =
       SCROLLABLE_XUL_FCDATA(NS_NewButtonBoxFrame);
   return &sXULButtonData;
 }
 
 /* static */
 const nsCSSFrameConstructor::FrameConstructionData*
 nsCSSFrameConstructor::FindXULLabelData(const Element& aElement,