Merge inbound to mozilla-central. a=merge
authorCsoregi Natalia <ncsoregi@mozilla.com>
Wed, 13 Mar 2019 23:43:54 +0200
changeset 463867 85d3d2603b8f8f90e658ae5ef4a728b450c8bb81
parent 463866 b8c1398f5a9074d3741997199d3eb2fa568c5469 (current diff)
parent 463810 9d23034770a6f4c1649f54d6928ba22a7767074c (diff)
child 463868 703a4bccfbe81ae850a59c2c34c16e59754be1f7
child 463896 a8f1fd35587fa7df233e2fced117f22926b7cabd
push id112416
push userncsoregi@mozilla.com
push dateWed, 13 Mar 2019 21:58:09 +0000
treeherdermozilla-inbound@703a4bccfbe8 [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,