Merge mozilla-central to autoland. CLOSED TREE
authorCsoregi Natalia <ncsoregi@mozilla.com>
Wed, 13 Mar 2019 23:47:01 +0200
changeset 521781 a8f1fd35587fa7df233e2fced117f22926b7cabd
parent 521778 a14e6fd4010b2f4e07a3353edf4971926566ce6f (current diff)
parent 521780 85d3d2603b8f8f90e658ae5ef4a728b450c8bb81 (diff)
child 521782 e4718a35d70b174f7acf7528c3de81b567a87b66
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)
milestone67.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
Merge mozilla-central to autoland. CLOSED TREE
--- 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,