← Back to branch summary

~mozillateam/firefox/firefox-beta.precise

« back to all changes in this revision

Viewing changes to debian/patches/unity-menubar.patch

  • Committer: Rico Tzschichholz
  • Date: 2017-01-25 10:42:42 UTC
  • Revision ID: ricotz@ubuntu.com-20170125104242-fx5b8kjnb4o1qebv
* New upstream release from the beta channel (FIREFOX_52_0b1_BUILD2)
* Refresh patches
  - update debian/patches/unity-menubar.patch
  - update debian/patches/revert-upstream-search-engine-changes.patch
  - update debian/patches/ubuntu-bookmarks.patch
* Drop */browser/components from firefox.install.in, browsercomps was merged
  into xul - https://hg.mozilla.org/mozilla-central/rev/4006b190b344

Show diffs side-by-side

added added

removed removed

Lines of Context:
debian/patches/unity-menubar.patch
1
 
Index: firefox-trunk-51.0~a1~hg20160830r311818/browser/base/content/browser-menubar.inc
 
1
Index: firefox-trunk-52.0~a1~hg20161001r316143/browser/base/content/browser-menubar.inc
2
2
===================================================================
3
 
--- firefox-trunk-51.0~a1~hg20160830r311818.orig/browser/base/content/browser-menubar.inc
4
 
+++ firefox-trunk-51.0~a1~hg20160830r311818/browser/base/content/browser-menubar.inc
 
3
--- firefox-trunk-52.0~a1~hg20161001r316143.orig/browser/base/content/browser-menubar.inc
 
4
+++ firefox-trunk-52.0~a1~hg20161001r316143/browser/base/content/browser-menubar.inc
5
5
@@ -5,7 +5,11 @@
6
6
 
7
7
        <menubar id="main-menubar"
14
14
                                   this.setAttribute('openedwithkey',
15
15
                                                     event.target.parentNode.openedWithKey);"
16
16
                 style="border:0px;padding:0px;margin:0px;-moz-appearance:none">
17
 
Index: firefox-trunk-51.0~a1~hg20160830r311818/browser/components/places/content/places.xul
 
17
Index: firefox-trunk-52.0~a1~hg20161001r316143/browser/components/places/content/places.xul
18
18
===================================================================
19
 
--- firefox-trunk-51.0~a1~hg20160830r311818.orig/browser/components/places/content/places.xul
20
 
+++ firefox-trunk-51.0~a1~hg20160830r311818/browser/components/places/content/places.xul
 
19
--- firefox-trunk-52.0~a1~hg20161001r316143.orig/browser/components/places/content/places.xul
 
20
+++ firefox-trunk-52.0~a1~hg20161001r316143/browser/components/places/content/places.xul
21
21
@@ -157,7 +157,7 @@
22
22
         <toolbarbutton type="menu" class="tabbable"
23
23
               onpopupshowing="document.getElementById('placeContent').focus()"
27
27
         <menu accesskey="&organize.accesskey;" class="menu-iconic"
28
28
 #endif
29
29
               id="organizeButton" label="&organize.label;"
30
 
Index: firefox-trunk-51.0~a1~hg20160830r311818/toolkit/content/widgets/popup.xml
 
30
Index: firefox-trunk-52.0~a1~hg20161001r316143/toolkit/content/widgets/popup.xml
31
31
===================================================================
32
 
--- firefox-trunk-51.0~a1~hg20160830r311818.orig/toolkit/content/widgets/popup.xml
33
 
+++ firefox-trunk-51.0~a1~hg20160830r311818/toolkit/content/widgets/popup.xml
 
32
--- firefox-trunk-52.0~a1~hg20161001r316143.orig/toolkit/content/widgets/popup.xml
 
33
+++ firefox-trunk-52.0~a1~hg20161001r316143/toolkit/content/widgets/popup.xml
34
34
@@ -25,8 +25,14 @@
35
35
         </getter>
36
36
       </property>
48
48
 
49
49
       <property name="triggerNode" readonly="true"
50
50
                 onget="return this.popupBoxObject.triggerNode"/>
51
 
Index: firefox-trunk-51.0~a1~hg20160830r311818/toolkit/content/xul.css
 
51
Index: firefox-trunk-52.0~a1~hg20161001r316143/toolkit/content/xul.css
52
52
===================================================================
53
 
--- firefox-trunk-51.0~a1~hg20160830r311818.orig/toolkit/content/xul.css
54
 
+++ firefox-trunk-51.0~a1~hg20160830r311818/toolkit/content/xul.css
55
 
@@ -315,6 +315,18 @@ toolbar[type="menubar"][autohide="true"]
 
53
--- firefox-trunk-52.0~a1~hg20161001r316143.orig/toolkit/content/xul.css
 
54
+++ firefox-trunk-52.0~a1~hg20161001r316143/toolkit/content/xul.css
 
55
@@ -307,6 +307,18 @@ toolbar[type="menubar"][autohide="true"]
56
56
 }
57
57
 %endif
58
58
 
71
71
 toolbarseparator {
72
72
   -moz-binding: url("chrome://global/content/bindings/toolbar.xml#toolbardecoration");
73
73
 }
74
 
Index: firefox-trunk-51.0~a1~hg20160830r311818/widget/gtk/nsDbusmenu.cpp
 
74
Index: firefox-trunk-52.0~a1~hg20161001r316143/widget/gtk/nsDbusmenu.cpp
75
75
===================================================================
76
76
--- /dev/null
77
 
+++ firefox-trunk-51.0~a1~hg20160830r311818/widget/gtk/nsDbusmenu.cpp
 
77
+++ firefox-trunk-52.0~a1~hg20161001r316143/widget/gtk/nsDbusmenu.cpp
78
78
@@ -0,0 +1,63 @@
79
79
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
80
80
+/* vim:expandtab:shiftwidth=4:tabstop=4:
139
139
+
140
140
+    return NS_OK;
141
141
+}
142
 
Index: firefox-trunk-51.0~a1~hg20160830r311818/widget/gtk/nsDbusmenu.h
 
142
Index: firefox-trunk-52.0~a1~hg20161001r316143/widget/gtk/nsDbusmenu.h
143
143
===================================================================
144
144
--- /dev/null
145
 
+++ firefox-trunk-51.0~a1~hg20160830r311818/widget/gtk/nsDbusmenu.h
 
145
+++ firefox-trunk-52.0~a1~hg20161001r316143/widget/gtk/nsDbusmenu.h
146
146
@@ -0,0 +1,99 @@
147
147
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
148
148
+/* vim:expandtab:shiftwidth=4:tabstop=4:
243
243
+#define dbusmenu_menuitem_property_set_shortcut nsDbusmenuFunctions::s_dbusmenu_menuitem_property_set_shortcut
244
244
+
245
245
+#endif /* __nsDbusmenu_h__ */
246
 
Index: firefox-trunk-51.0~a1~hg20160830r311818/widget/gtk/nsMenu.cpp
 
246
Index: firefox-trunk-52.0~a1~hg20161001r316143/widget/gtk/nsMenu.cpp
247
247
===================================================================
248
248
--- /dev/null
249
 
+++ firefox-trunk-51.0~a1~hg20160830r311818/widget/gtk/nsMenu.cpp
 
249
+++ firefox-trunk-52.0~a1~hg20161001r316143/widget/gtk/nsMenu.cpp
250
250
@@ -0,0 +1,868 @@
251
251
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
252
252
+/* vim:expandtab:shiftwidth=4:tabstop=4:
1116
1116
+
1117
1117
+    MaybeAddPlaceholderItem();
1118
1118
+}
1119
 
Index: firefox-trunk-51.0~a1~hg20160830r311818/widget/gtk/nsMenu.h
 
1119
Index: firefox-trunk-52.0~a1~hg20161001r316143/widget/gtk/nsMenu.h
1120
1120
===================================================================
1121
1121
--- /dev/null
1122
 
+++ firefox-trunk-51.0~a1~hg20160830r311818/widget/gtk/nsMenu.h
 
1122
+++ firefox-trunk-52.0~a1~hg20161001r316143/widget/gtk/nsMenu.h
1123
1123
@@ -0,0 +1,166 @@
1124
1124
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
1125
1125
+/* vim:expandtab:shiftwidth=4:tabstop=4:
1287
1287
+};
1288
1288
+
1289
1289
+#endif /* __nsMenu_h__ */
1290
 
Index: firefox-trunk-51.0~a1~hg20160830r311818/widget/gtk/nsMenuBar.cpp
 
1290
Index: firefox-trunk-52.0~a1~hg20161001r316143/widget/gtk/nsMenuBar.cpp
1291
1291
===================================================================
1292
1292
--- /dev/null
1293
 
+++ firefox-trunk-51.0~a1~hg20160830r311818/widget/gtk/nsMenuBar.cpp
 
1293
+++ firefox-trunk-52.0~a1~hg20161001r316143/widget/gtk/nsMenuBar.cpp
1294
1294
@@ -0,0 +1,545 @@
1295
1295
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
1296
1296
+/* vim:expandtab:shiftwidth=4:tabstop=4:
1837
1837
+    DebugOnly<nsresult> rv = RemoveChild(aChild);
1838
1838
+    NS_ASSERTION(NS_SUCCEEDED(rv), "Failed to remove item from menubar");
1839
1839
+}
1840
 
Index: firefox-trunk-51.0~a1~hg20160830r311818/widget/gtk/nsMenuBar.h
 
1840
Index: firefox-trunk-52.0~a1~hg20161001r316143/widget/gtk/nsMenuBar.h
1841
1841
===================================================================
1842
1842
--- /dev/null
1843
 
+++ firefox-trunk-51.0~a1~hg20160830r311818/widget/gtk/nsMenuBar.h
 
1843
+++ firefox-trunk-52.0~a1~hg20161001r316143/widget/gtk/nsMenuBar.h
1844
1844
@@ -0,0 +1,112 @@
1845
1845
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
1846
1846
+/* vim:expandtab:shiftwidth=4:tabstop=4:
1954
1954
+};
1955
1955
+
1956
1956
+#endif /* __nsMenuBar_h__ */
1957
 
Index: firefox-trunk-51.0~a1~hg20160830r311818/widget/gtk/nsMenuContainer.cpp
 
1957
Index: firefox-trunk-52.0~a1~hg20161001r316143/widget/gtk/nsMenuContainer.cpp
1958
1958
===================================================================
1959
1959
--- /dev/null
1960
 
+++ firefox-trunk-51.0~a1~hg20160830r311818/widget/gtk/nsMenuContainer.cpp
 
1960
+++ firefox-trunk-52.0~a1~hg20161001r316143/widget/gtk/nsMenuContainer.cpp
1961
1961
@@ -0,0 +1,174 @@
1962
1962
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
1963
1963
+/* vim:expandtab:shiftwidth=4:tabstop=4:
2133
2133
+
2134
2134
+    return aContent;
2135
2135
+}
2136
 
Index: firefox-trunk-51.0~a1~hg20160830r311818/widget/gtk/nsMenuContainer.h
 
2136
Index: firefox-trunk-52.0~a1~hg20161001r316143/widget/gtk/nsMenuContainer.h
2137
2137
===================================================================
2138
2138
--- /dev/null
2139
 
+++ firefox-trunk-51.0~a1~hg20160830r311818/widget/gtk/nsMenuContainer.h
 
2139
+++ firefox-trunk-52.0~a1~hg20161001r316143/widget/gtk/nsMenuContainer.h
2140
2140
@@ -0,0 +1,66 @@
2141
2141
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
2142
2142
+/* vim:expandtab:shiftwidth=4:tabstop=4:
2204
2204
+};
2205
2205
+
2206
2206
+#endif /* __nsMenuContainer_h__ */
2207
 
Index: firefox-trunk-51.0~a1~hg20160830r311818/widget/gtk/nsMenuItem.cpp
 
2207
Index: firefox-trunk-52.0~a1~hg20161001r316143/widget/gtk/nsMenuItem.cpp
2208
2208
===================================================================
2209
2209
--- /dev/null
2210
 
+++ firefox-trunk-51.0~a1~hg20160830r311818/widget/gtk/nsMenuItem.cpp
2211
 
@@ -0,0 +1,742 @@
 
2210
+++ firefox-trunk-52.0~a1~hg20161001r316143/widget/gtk/nsMenuItem.cpp
 
2211
@@ -0,0 +1,743 @@
2212
2212
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
2213
2213
+/* vim:expandtab:shiftwidth=4:tabstop=4:
2214
2214
+ */
2264
2264
+
2265
2265
+static struct KeyCodeData gKeyCodes[] = {
2266
2266
+#define NS_DEFINE_VK(aDOMKeyName, aDOMKeyCode) \
2267
 
+  { #aDOMKeyName, sizeof(#aDOMKeyName) - 1, aDOMKeyCode }
 
2267
+  { #aDOMKeyName, sizeof(#aDOMKeyName) - 1, aDOMKeyCode },
2268
2268
+#include "mozilla/VirtualKeyCodeList.h"
2269
2269
+#undef NS_DEFINE_VK
 
2270
+  { nullptr, 0, 0 }
2270
2271
+};
2271
2272
+
2272
2273
+struct KeyPair {
2951
2952
+        UpdateIcon(sc);
2952
2953
+    }
2953
2954
+}
2954
 
Index: firefox-trunk-51.0~a1~hg20160830r311818/widget/gtk/nsMenuItem.h
 
2955
Index: firefox-trunk-52.0~a1~hg20161001r316143/widget/gtk/nsMenuItem.h
2955
2956
===================================================================
2956
2957
--- /dev/null
2957
 
+++ firefox-trunk-51.0~a1~hg20160830r311818/widget/gtk/nsMenuItem.h
 
2958
+++ firefox-trunk-52.0~a1~hg20161001r316143/widget/gtk/nsMenuItem.h
2958
2959
@@ -0,0 +1,107 @@
2959
2960
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
2960
2961
+/* vim:expandtab:shiftwidth=4:tabstop=4:
3063
3064
+};
3064
3065
+
3065
3066
+#endif /* __nsMenuItem_h__ */
3066
 
Index: firefox-trunk-51.0~a1~hg20160830r311818/widget/gtk/nsMenuObject.cpp
 
3067
Index: firefox-trunk-52.0~a1~hg20161001r316143/widget/gtk/nsMenuObject.cpp
3067
3068
===================================================================
3068
3069
--- /dev/null
3069
 
+++ firefox-trunk-51.0~a1~hg20160830r311818/widget/gtk/nsMenuObject.cpp
3070
 
@@ -0,0 +1,709 @@
 
3070
+++ firefox-trunk-52.0~a1~hg20161001r316143/widget/gtk/nsMenuObject.cpp
 
3071
@@ -0,0 +1,694 @@
3071
3072
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
3072
3073
+/* vim:expandtab:shiftwidth=4:tabstop=4:
3073
3074
+ */
3082
3083
+#include "imgRequestProxy.h"
3083
3084
+#include "mozilla/ArrayUtils.h"
3084
3085
+#include "mozilla/dom/Element.h"
3085
 
+#include "mozilla/LookAndFeel.h"
3086
3086
+#include "mozilla/Preferences.h"
3087
3087
+#include "nsAttrValue.h"
3088
3088
+#include "nsComputedDOMStyle.h"
3427
3427
+bool
3428
3428
+nsMenuObject::ShouldShowIcon() const
3429
3429
+{
3430
 
+    static bool known = false;
3431
 
+    static bool showImagesInMenus = false;
3432
 
+
3433
3430
+    // Ideally we want to know the visibility of the anonymous XUL image in
3434
3431
+    // our menuitem, but this isn't created because we don't have a frame.
3435
3432
+    // The following works by default (because xul.css hides images in menuitems
3436
 
+    // that don't have the "menuitem-with-favicon" class, when eIntID_ImagesInMenus
3437
 
+    // is false). It's possible a third party theme could override this, but,
3438
 
+    // oh well...
3439
 
+    if (!known) {
3440
 
+        showImagesInMenus =
3441
 
+            LookAndFeel::GetInt(LookAndFeel::eIntID_ImagesInMenus);
3442
 
+        known = true;
3443
 
+    }
3444
 
+
3445
 
+    if (showImagesInMenus) {
3446
 
+        return true;
3447
 
+    }
3448
 
+
 
3433
+    // that don't have the "menuitem-with-favicon" class). It's possible a third
 
3434
+    // party theme could override this, but, oh well...
3449
3435
+    const nsAttrValue *classes = mContent->GetClasses();
3450
3436
+    if (!classes) {
3451
3437
+        return false;
3777
3763
+        weak = weak->GetPrevious();
3778
3764
+    }
3779
3765
+}
3780
 
Index: firefox-trunk-51.0~a1~hg20160830r311818/widget/gtk/nsMenuObject.h
 
3766
Index: firefox-trunk-52.0~a1~hg20161001r316143/widget/gtk/nsMenuObject.h
3781
3767
===================================================================
3782
3768
--- /dev/null
3783
 
+++ firefox-trunk-51.0~a1~hg20160830r311818/widget/gtk/nsMenuObject.h
 
3769
+++ firefox-trunk-52.0~a1~hg20161001r316143/widget/gtk/nsMenuObject.h
3784
3770
@@ -0,0 +1,242 @@
3785
3771
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
3786
3772
+/* vim:expandtab:shiftwidth=4:tabstop=4:
4024
4010
+};
4025
4011
+
4026
4012
+#endif /* __nsMenuObject_h__ */
4027
 
Index: firefox-trunk-51.0~a1~hg20160830r311818/widget/gtk/nsMenuSeparator.cpp
 
4013
Index: firefox-trunk-52.0~a1~hg20161001r316143/widget/gtk/nsMenuSeparator.cpp
4028
4014
===================================================================
4029
4015
--- /dev/null
4030
 
+++ firefox-trunk-51.0~a1~hg20160830r311818/widget/gtk/nsMenuSeparator.cpp
 
4016
+++ firefox-trunk-52.0~a1~hg20161001r316143/widget/gtk/nsMenuSeparator.cpp
4031
4017
@@ -0,0 +1,90 @@
4032
4018
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
4033
4019
+/* vim:expandtab:shiftwidth=4:tabstop=4:
4119
4105
+        UpdateVisibility(sc);
4120
4106
+    }
4121
4107
+}
4122
 
Index: firefox-trunk-51.0~a1~hg20160830r311818/widget/gtk/nsMenuSeparator.h
 
4108
Index: firefox-trunk-52.0~a1~hg20161001r316143/widget/gtk/nsMenuSeparator.h
4123
4109
===================================================================
4124
4110
--- /dev/null
4125
 
+++ firefox-trunk-51.0~a1~hg20160830r311818/widget/gtk/nsMenuSeparator.h
 
4111
+++ firefox-trunk-52.0~a1~hg20161001r316143/widget/gtk/nsMenuSeparator.h
4126
4112
@@ -0,0 +1,41 @@
4127
4113
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
4128
4114
+/* vim:expandtab:shiftwidth=4:tabstop=4:
4165
4151
+};
4166
4152
+
4167
4153
+#endif /* __nsMenuSeparator_h__ */
4168
 
Index: firefox-trunk-51.0~a1~hg20160830r311818/widget/gtk/nsNativeMenuAtomList.h
 
4154
Index: firefox-trunk-52.0~a1~hg20161001r316143/widget/gtk/nsNativeMenuAtomList.h
4169
4155
===================================================================
4170
4156
--- /dev/null
4171
 
+++ firefox-trunk-51.0~a1~hg20160830r311818/widget/gtk/nsNativeMenuAtomList.h
 
4157
+++ firefox-trunk-52.0~a1~hg20161001r316143/widget/gtk/nsNativeMenuAtomList.h
4172
4158
@@ -0,0 +1,11 @@
4173
4159
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
4174
4160
+/* vim:expandtab:shiftwidth=4:tabstop=4:
4181
4167
+WIDGET_ATOM2(_moz_menupopupstate, "_moz-menupopupstate")
4182
4168
+WIDGET_ATOM(openedwithkey)
4183
4169
+WIDGET_ATOM(shellshowingmenubar)
4184
 
Index: firefox-trunk-51.0~a1~hg20160830r311818/widget/gtk/nsNativeMenuAtoms.cpp
 
4170
Index: firefox-trunk-52.0~a1~hg20161001r316143/widget/gtk/nsNativeMenuAtoms.cpp
4185
4171
===================================================================
4186
4172
--- /dev/null
4187
 
+++ firefox-trunk-51.0~a1~hg20160830r311818/widget/gtk/nsNativeMenuAtoms.cpp
 
4173
+++ firefox-trunk-52.0~a1~hg20161001r316143/widget/gtk/nsNativeMenuAtoms.cpp
4188
4174
@@ -0,0 +1,39 @@
4189
4175
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
4190
4176
+/* vim:expandtab:shiftwidth=4:tabstop=4:
4225
4211
+{
4226
4212
+    NS_RegisterStaticAtoms(gAtoms);
4227
4213
+}
4228
 
Index: firefox-trunk-51.0~a1~hg20160830r311818/widget/gtk/nsNativeMenuAtoms.h
 
4214
Index: firefox-trunk-52.0~a1~hg20161001r316143/widget/gtk/nsNativeMenuAtoms.h
4229
4215
===================================================================
4230
4216
--- /dev/null
4231
 
+++ firefox-trunk-51.0~a1~hg20160830r311818/widget/gtk/nsNativeMenuAtoms.h
 
4217
+++ firefox-trunk-52.0~a1~hg20161001r316143/widget/gtk/nsNativeMenuAtoms.h
4232
4218
@@ -0,0 +1,25 @@
4233
4219
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
4234
4220
+/* vim:expandtab:shiftwidth=4:tabstop=4:
4255
4241
+};
4256
4242
+
4257
4243
+#endif /* __nsNativeMenuAtoms_h__ */
4258
 
Index: firefox-trunk-51.0~a1~hg20160830r311818/widget/gtk/nsNativeMenuDocListener.cpp
 
4244
Index: firefox-trunk-52.0~a1~hg20161001r316143/widget/gtk/nsNativeMenuDocListener.cpp
4259
4245
===================================================================
4260
4246
--- /dev/null
4261
 
+++ firefox-trunk-51.0~a1~hg20160830r311818/widget/gtk/nsNativeMenuDocListener.cpp
 
4247
+++ firefox-trunk-52.0~a1~hg20161001r316143/widget/gtk/nsNativeMenuDocListener.cpp
4262
4248
@@ -0,0 +1,370 @@
4263
4249
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
4264
4250
+/* vim:expandtab:shiftwidth=4:tabstop=4:
4630
4616
+    CancelFlush(this);
4631
4617
+    mPendingMutations.Clear();
4632
4618
+}
4633
 
Index: firefox-trunk-51.0~a1~hg20160830r311818/widget/gtk/nsNativeMenuDocListener.h
 
4619
Index: firefox-trunk-52.0~a1~hg20161001r316143/widget/gtk/nsNativeMenuDocListener.h
4634
4620
===================================================================
4635
4621
--- /dev/null
4636
 
+++ firefox-trunk-51.0~a1~hg20160830r311818/widget/gtk/nsNativeMenuDocListener.h
 
4622
+++ firefox-trunk-52.0~a1~hg20161001r316143/widget/gtk/nsNativeMenuDocListener.h
4637
4623
@@ -0,0 +1,153 @@
4638
4624
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
4639
4625
+/* vim:expandtab:shiftwidth=4:tabstop=4:
4788
4774
+};
4789
4775
+
4790
4776
+#endif /* __nsNativeMenuDocListener_h__ */
4791
 
Index: firefox-trunk-51.0~a1~hg20160830r311818/widget/gtk/nsNativeMenuService.cpp
 
4777
Index: firefox-trunk-52.0~a1~hg20161001r316143/widget/gtk/nsNativeMenuService.cpp
4792
4778
===================================================================
4793
4779
--- /dev/null
4794
 
+++ firefox-trunk-51.0~a1~hg20160830r311818/widget/gtk/nsNativeMenuService.cpp
 
4780
+++ firefox-trunk-52.0~a1~hg20161001r316143/widget/gtk/nsNativeMenuService.cpp
4795
4781
@@ -0,0 +1,506 @@
4796
4782
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
4797
4783
+/* vim:expandtab:shiftwidth=4:tabstop=4:
5299
5285
+
5300
5286
+    return NS_OK;
5301
5287
+}
5302
 
Index: firefox-trunk-51.0~a1~hg20160830r311818/widget/gtk/nsNativeMenuService.h
 
5288
Index: firefox-trunk-52.0~a1~hg20161001r316143/widget/gtk/nsNativeMenuService.h
5303
5289
===================================================================
5304
5290
--- /dev/null
5305
 
+++ firefox-trunk-51.0~a1~hg20160830r311818/widget/gtk/nsNativeMenuService.h
 
5291
+++ firefox-trunk-52.0~a1~hg20161001r316143/widget/gtk/nsNativeMenuService.h
5306
5292
@@ -0,0 +1,88 @@
5307
5293
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
5308
5294
+/* vim:expandtab:shiftwidth=4:tabstop=4:
5392
5378
+};
5393
5379
+
5394
5380
+#endif /* __nsNativeMenuService_h__ */
5395
 
Index: firefox-trunk-51.0~a1~hg20160830r311818/widget/gtk/nsNativeMenuUtils.h
 
5381
Index: firefox-trunk-52.0~a1~hg20161001r316143/widget/gtk/nsNativeMenuUtils.h
5396
5382
===================================================================
5397
5383
--- /dev/null
5398
 
+++ firefox-trunk-51.0~a1~hg20160830r311818/widget/gtk/nsNativeMenuUtils.h
 
5384
+++ firefox-trunk-52.0~a1~hg20161001r316143/widget/gtk/nsNativeMenuUtils.h
5399
5385
@@ -0,0 +1,59 @@
5400
5386
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
5401
5387
+/* vim:expandtab:shiftwidth=4:tabstop=4:
5456
5442
+};
5457
5443
+
5458
5444
+#endif /* __nsNativeMenuUtils_h__ */
5459
 
Index: firefox-trunk-51.0~a1~hg20160830r311818/widget/gtk/nsWidgetFactory.cpp
 
5445
Index: firefox-trunk-52.0~a1~hg20161001r316143/widget/gtk/nsWidgetFactory.cpp
5460
5446
===================================================================
5461
 
--- firefox-trunk-51.0~a1~hg20160830r311818.orig/widget/gtk/nsWidgetFactory.cpp
5462
 
+++ firefox-trunk-51.0~a1~hg20160830r311818/widget/gtk/nsWidgetFactory.cpp
 
5447
--- firefox-trunk-52.0~a1~hg20161001r316143.orig/widget/gtk/nsWidgetFactory.cpp
 
5448
+++ firefox-trunk-52.0~a1~hg20161001r316143/widget/gtk/nsWidgetFactory.cpp
5463
5449
@@ -49,6 +49,9 @@
5464
5450
 #include "GfxInfoX11.h"
5465
5451
 #endif
5525
5511
     nsWidgetGtk2ModuleDtor,
5526
5512
     Module::ALLOW_IN_GPU_PROCESS
5527
5513
 };
5528
 
Index: firefox-trunk-51.0~a1~hg20160830r311818/widget/gtk/nsWindow.cpp
 
5514
Index: firefox-trunk-52.0~a1~hg20161001r316143/widget/gtk/nsWindow.cpp
5529
5515
===================================================================
5530
 
--- firefox-trunk-51.0~a1~hg20160830r311818.orig/widget/gtk/nsWindow.cpp
5531
 
+++ firefox-trunk-51.0~a1~hg20160830r311818/widget/gtk/nsWindow.cpp
5532
 
@@ -5129,6 +5129,11 @@ nsWindow::HideWindowChrome(bool aShouldH
 
5516
--- firefox-trunk-52.0~a1~hg20161001r316143.orig/widget/gtk/nsWindow.cpp
 
5517
+++ firefox-trunk-52.0~a1~hg20161001r316143/widget/gtk/nsWindow.cpp
 
5518
@@ -5157,6 +5157,11 @@ nsWindow::HideWindowChrome(bool aShouldH
5533
5519
     return NS_OK;
5534
5520
 }
5535
5521
 
5541
5527
 bool
5542
5528
 nsWindow::CheckForRollup(gdouble aMouseX, gdouble aMouseY,
5543
5529
                          bool aIsWheel, bool aAlwaysRollup)
5544
 
Index: firefox-trunk-51.0~a1~hg20160830r311818/widget/gtk/nsWindow.h
 
5530
Index: firefox-trunk-52.0~a1~hg20161001r316143/widget/gtk/nsWindow.h
5545
5531
===================================================================
5546
 
--- firefox-trunk-51.0~a1~hg20160830r311818.orig/widget/gtk/nsWindow.h
5547
 
+++ firefox-trunk-51.0~a1~hg20160830r311818/widget/gtk/nsWindow.h
5548
 
@@ -34,6 +34,8 @@
 
5532
--- firefox-trunk-52.0~a1~hg20161001r316143.orig/widget/gtk/nsWindow.h
 
5533
+++ firefox-trunk-52.0~a1~hg20161001r316143/widget/gtk/nsWindow.h
 
5534
@@ -35,6 +35,8 @@
5549
5535
 
5550
5536
 #include "IMContextWrapper.h"
5551
5537
 
5554
5540
 #undef LOG
5555
5541
 #ifdef MOZ_LOGGING
5556
5542
 
5557
 
@@ -161,6 +163,8 @@ public:
 
5543
@@ -162,6 +164,8 @@ public:
5558
5544
                                       nsIScreen* aTargetScreen = nullptr) override;
5559
5545
     NS_IMETHOD         HideWindowChrome(bool aShouldHide) override;
5560
5546
 
5572
5558
 };
5573
5559
 
5574
5560
 class nsChildWindow : public nsWindow {
5575
 
Index: firefox-trunk-51.0~a1~hg20160830r311818/xpfe/appshell/nsWebShellWindow.cpp
 
5561
Index: firefox-trunk-52.0~a1~hg20161001r316143/xpfe/appshell/nsWebShellWindow.cpp
5576
5562
===================================================================
5577
 
--- firefox-trunk-51.0~a1~hg20160830r311818.orig/xpfe/appshell/nsWebShellWindow.cpp
5578
 
+++ firefox-trunk-51.0~a1~hg20160830r311818/xpfe/appshell/nsWebShellWindow.cpp
 
5563
--- firefox-trunk-52.0~a1~hg20161001r316143.orig/xpfe/appshell/nsWebShellWindow.cpp
 
5564
+++ firefox-trunk-52.0~a1~hg20161001r316143/xpfe/appshell/nsWebShellWindow.cpp
5579
5565
@@ -58,6 +58,7 @@
5580
5566
 #include "nsIScreen.h"
5581
5567
 
5593
5579
 #include "nsINativeMenuService.h"
5594
5580
 #define USE_NATIVE_MENUS
5595
5581
 #endif
5596
 
@@ -484,6 +485,11 @@ static void LoadNativeMenus(nsIDOMDocume
 
5582
@@ -491,6 +492,11 @@ static void LoadNativeMenus(nsIDOMDocume
5597
5583
 
5598
5584
   if (menubarNode) {
5599
5585
     nsCOMPtr<nsIContent> menubarContent(do_QueryInterface(menubarNode));
5605
5591
     nms->CreateNativeMenuBar(aParentWindow, menubarContent);
5606
5592
   } else {
5607
5593
     nms->CreateNativeMenuBar(aParentWindow, nullptr);
5608
 
Index: firefox-trunk-51.0~a1~hg20160830r311818/widget/gtk/moz.build
 
5594
Index: firefox-trunk-52.0~a1~hg20161001r316143/widget/gtk/moz.build
5609
5595
===================================================================
5610
 
--- firefox-trunk-51.0~a1~hg20160830r311818.orig/widget/gtk/moz.build
5611
 
+++ firefox-trunk-51.0~a1~hg20160830r311818/widget/gtk/moz.build
 
5596
--- firefox-trunk-52.0~a1~hg20161001r316143.orig/widget/gtk/moz.build
 
5597
+++ firefox-trunk-52.0~a1~hg20161001r316143/widget/gtk/moz.build
5612
5598
@@ -24,10 +24,18 @@ UNIFIED_SOURCES += [
5613
5599
     'nsAppShell.cpp',
5614
5600
     'nsBidiKeyboard.cpp',
5637
5623
     'nsWindow.cpp', # conflicts with X11 headers
5638
5624
 ]
5639
5625
 
5640
 
@@ -90,6 +100,7 @@ FINAL_LIBRARY = 'xul'
 
5626
@@ -104,6 +114,7 @@ FINAL_LIBRARY = 'xul'
5641
5627
 
5642
5628
 LOCAL_INCLUDES += [
5643
5629
     '/layout/generic',
5645
5631
     '/layout/xul',
5646
5632
     '/other-licenses/atk-1.0',
5647
5633
     '/widget',
5648
 
Index: firefox-trunk-51.0~a1~hg20160830r311818/browser/base/content/browser.js
 
5634
Index: firefox-trunk-52.0~a1~hg20161001r316143/browser/base/content/browser.js
5649
5635
===================================================================
5650
 
--- firefox-trunk-51.0~a1~hg20160830r311818.orig/browser/base/content/browser.js
5651
 
+++ firefox-trunk-51.0~a1~hg20160830r311818/browser/base/content/browser.js
5652
 
@@ -5025,6 +5025,8 @@ function getTogglableToolbars() {
 
5636
--- firefox-trunk-52.0~a1~hg20161001r316143.orig/browser/base/content/browser.js
 
5637
+++ firefox-trunk-52.0~a1~hg20161001r316143/browser/base/content/browser.js
 
5638
@@ -5069,6 +5069,8 @@ function getTogglableToolbars() {
5653
5639
   let toolbarNodes = Array.slice(gNavToolbox.childNodes);
5654
5640
   toolbarNodes = toolbarNodes.concat(gNavToolbox.externalToolbars);
5655
5641
   toolbarNodes = toolbarNodes.filter(node => node.getAttribute("toolbarname"));
5658
5644
   return toolbarNodes;
5659
5645
 }
5660
5646
 
5661
 
Index: firefox-trunk-51.0~a1~hg20160830r311818/widget/moz.build
 
5647
Index: firefox-trunk-52.0~a1~hg20161001r316143/widget/moz.build
5662
5648
===================================================================
5663
 
--- firefox-trunk-51.0~a1~hg20160830r311818.orig/widget/moz.build
5664
 
+++ firefox-trunk-51.0~a1~hg20160830r311818/widget/moz.build
 
5649
--- firefox-trunk-52.0~a1~hg20161001r316143.orig/widget/moz.build
 
5650
+++ firefox-trunk-52.0~a1~hg20161001r316143/widget/moz.build
5665
5651
@@ -37,10 +37,12 @@ elif toolkit == 'cocoa':
5666
5652
         'nsITaskbarProgress.idl',
5667
5653
     ]
5676
5662
 TEST_DIRS += ['tests']
5677
5663
 
5678
5664
 # Don't build the DSO under the 'build' directory as windows does.
5679
 
Index: firefox-trunk-51.0~a1~hg20160830r311818/modules/libpref/init/all.js
 
5665
Index: firefox-trunk-52.0~a1~hg20161001r316143/modules/libpref/init/all.js
5680
5666
===================================================================
5681
 
--- firefox-trunk-51.0~a1~hg20160830r311818.orig/modules/libpref/init/all.js
5682
 
+++ firefox-trunk-51.0~a1~hg20160830r311818/modules/libpref/init/all.js
 
5667
--- firefox-trunk-52.0~a1~hg20161001r316143.orig/modules/libpref/init/all.js
 
5668
+++ firefox-trunk-52.0~a1~hg20161001r316143/modules/libpref/init/all.js
5683
5669
@@ -221,6 +221,9 @@ pref("dom.compartment_per_addon", true);
5684
5670
 pref("browser.sessionhistory.max_total_viewers", -1);
5685
5671
 
5690
5676
 pref("ui.click_hold_context_menus", false);
5691
5677
 // Duration of timeout of incremental search in menus (ms).  0 means infinite.
5692
5678
 pref("ui.menu.incremental_search.timeout", 1000);
5693
 
Index: firefox-trunk-51.0~a1~hg20160830r311818/widget/gtk/nsScreenGtk.cpp
 
5679
Index: firefox-trunk-52.0~a1~hg20161001r316143/widget/gtk/nsScreenGtk.cpp
5694
5680
===================================================================
5695
 
--- firefox-trunk-51.0~a1~hg20160830r311818.orig/widget/gtk/nsScreenGtk.cpp
5696
 
+++ firefox-trunk-51.0~a1~hg20160830r311818/widget/gtk/nsScreenGtk.cpp
5697
 
@@ -13,6 +13,7 @@
 
5681
--- firefox-trunk-52.0~a1~hg20161001r316143.orig/widget/gtk/nsScreenGtk.cpp
 
5682
+++ firefox-trunk-52.0~a1~hg20161001r316143/widget/gtk/nsScreenGtk.cpp
 
5683
@@ -15,6 +15,7 @@
5698
5684
 #include <gtk/gtk.h>
5699
5685
 #include <dlfcn.h>
5700
5686
 #include "gfxPlatformGtk.h"