← Back to branch summary

~gyancey/firefox/firefox-alsa

« back to all changes in this revision

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

  • Committer: Chris Coulson
  • Date: 2016-09-12 12:03:22 UTC
  • Revision ID: chris.coulson@canonical.com-20160912120322-lljw5cjgh0exac2a
* New upstream stable release (49.0build2)
* Ensure we generate all of the required checksum files for FIPS mode
  to work correctly
  - update debian/build/rukes.mk
* Refresh patches:
  - update debian/patches/allow-lockPref-everywhere.patch
  - update debian/patches/unity-menubar.patch
* Update GOOGLE API keys for Ubuntu distro.

Show diffs side-by-side

added added

removed removed

Lines of Context:
debian/patches/unity-menubar.patch
1
 
Index: firefox-trunk-48.0~a1~hg20160424r294498/browser/base/content/browser-menubar.inc
 
1
Index: firefox-trunk-49.0~a1~hg20160602r300071/browser/base/content/browser-menubar.inc
2
2
===================================================================
3
 
--- firefox-trunk-48.0~a1~hg20160424r294498.orig/browser/base/content/browser-menubar.inc
4
 
+++ firefox-trunk-48.0~a1~hg20160424r294498/browser/base/content/browser-menubar.inc
 
3
--- firefox-trunk-49.0~a1~hg20160602r300071.orig/browser/base/content/browser-menubar.inc
 
4
+++ firefox-trunk-49.0~a1~hg20160602r300071/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-48.0~a1~hg20160424r294498/browser/components/places/content/places.xul
 
17
Index: firefox-trunk-49.0~a1~hg20160602r300071/browser/components/places/content/places.xul
18
18
===================================================================
19
 
--- firefox-trunk-48.0~a1~hg20160424r294498.orig/browser/components/places/content/places.xul
20
 
+++ firefox-trunk-48.0~a1~hg20160424r294498/browser/components/places/content/places.xul
 
19
--- firefox-trunk-49.0~a1~hg20160602r300071.orig/browser/components/places/content/places.xul
 
20
+++ firefox-trunk-49.0~a1~hg20160602r300071/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-48.0~a1~hg20160424r294498/toolkit/content/widgets/popup.xml
 
30
Index: firefox-trunk-49.0~a1~hg20160602r300071/toolkit/content/widgets/popup.xml
31
31
===================================================================
32
 
--- firefox-trunk-48.0~a1~hg20160424r294498.orig/toolkit/content/widgets/popup.xml
33
 
+++ firefox-trunk-48.0~a1~hg20160424r294498/toolkit/content/widgets/popup.xml
 
32
--- firefox-trunk-49.0~a1~hg20160602r300071.orig/toolkit/content/widgets/popup.xml
 
33
+++ firefox-trunk-49.0~a1~hg20160602r300071/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-48.0~a1~hg20160424r294498/toolkit/content/xul.css
 
51
Index: firefox-trunk-49.0~a1~hg20160602r300071/toolkit/content/xul.css
52
52
===================================================================
53
 
--- firefox-trunk-48.0~a1~hg20160424r294498.orig/toolkit/content/xul.css
54
 
+++ firefox-trunk-48.0~a1~hg20160424r294498/toolkit/content/xul.css
 
53
--- firefox-trunk-49.0~a1~hg20160602r300071.orig/toolkit/content/xul.css
 
54
+++ firefox-trunk-49.0~a1~hg20160602r300071/toolkit/content/xul.css
55
55
@@ -315,6 +315,18 @@ toolbar[type="menubar"][autohide="true"]
56
56
 }
57
57
 %endif
71
71
 toolbarseparator {
72
72
   -moz-binding: url("chrome://global/content/bindings/toolbar.xml#toolbardecoration");
73
73
 }
74
 
Index: firefox-trunk-48.0~a1~hg20160424r294498/widget/gtk/nsDbusmenu.cpp
 
74
Index: firefox-trunk-49.0~a1~hg20160602r300071/widget/gtk/nsDbusmenu.cpp
75
75
===================================================================
76
76
--- /dev/null
77
 
+++ firefox-trunk-48.0~a1~hg20160424r294498/widget/gtk/nsDbusmenu.cpp
 
77
+++ firefox-trunk-49.0~a1~hg20160602r300071/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-48.0~a1~hg20160424r294498/widget/gtk/nsDbusmenu.h
 
142
Index: firefox-trunk-49.0~a1~hg20160602r300071/widget/gtk/nsDbusmenu.h
143
143
===================================================================
144
144
--- /dev/null
145
 
+++ firefox-trunk-48.0~a1~hg20160424r294498/widget/gtk/nsDbusmenu.h
 
145
+++ firefox-trunk-49.0~a1~hg20160602r300071/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-48.0~a1~hg20160424r294498/widget/gtk/nsMenu.cpp
 
246
Index: firefox-trunk-49.0~a1~hg20160602r300071/widget/gtk/nsMenu.cpp
247
247
===================================================================
248
248
--- /dev/null
249
 
+++ firefox-trunk-48.0~a1~hg20160424r294498/widget/gtk/nsMenu.cpp
250
 
@@ -0,0 +1,867 @@
 
249
+++ firefox-trunk-49.0~a1~hg20160602r300071/widget/gtk/nsMenu.cpp
 
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:
253
253
+ */
277
277
+#include "nsStyleContext.h"
278
278
+#include "nsStyleSet.h"
279
279
+#include "nsStyleStruct.h"
 
280
+#include "nsThreadUtils.h"
280
281
+#include "nsXBLBinding.h"
281
282
+#include "nsXBLService.h"
282
283
+
309
310
+    nsMenu *mMenu;
310
311
+};
311
312
+
312
 
+class nsSetAttrRunnableNoNotify : public nsRunnable
 
313
+class nsSetAttrRunnableNoNotify : public Runnable
313
314
+{
314
315
+public:
315
316
+    nsSetAttrRunnableNoNotify(nsIContent *aContent, nsIAtom *aAttribute,
327
328
+    nsAutoString mValue;
328
329
+};
329
330
+
330
 
+class nsUnsetAttrRunnableNoNotify : public nsRunnable
 
331
+class nsUnsetAttrRunnableNoNotify : public Runnable
331
332
+{
332
333
+public:
333
334
+    nsUnsetAttrRunnableNoNotify(nsIContent *aContent, nsIAtom *aAttribute) :
1115
1116
+
1116
1117
+    MaybeAddPlaceholderItem();
1117
1118
+}
1118
 
Index: firefox-trunk-48.0~a1~hg20160424r294498/widget/gtk/nsMenu.h
 
1119
Index: firefox-trunk-49.0~a1~hg20160602r300071/widget/gtk/nsMenu.h
1119
1120
===================================================================
1120
1121
--- /dev/null
1121
 
+++ firefox-trunk-48.0~a1~hg20160424r294498/widget/gtk/nsMenu.h
 
1122
+++ firefox-trunk-49.0~a1~hg20160602r300071/widget/gtk/nsMenu.h
1122
1123
@@ -0,0 +1,166 @@
1123
1124
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
1124
1125
+/* vim:expandtab:shiftwidth=4:tabstop=4:
1286
1287
+};
1287
1288
+
1288
1289
+#endif /* __nsMenu_h__ */
1289
 
Index: firefox-trunk-48.0~a1~hg20160424r294498/widget/gtk/nsMenuBar.cpp
 
1290
Index: firefox-trunk-49.0~a1~hg20160602r300071/widget/gtk/nsMenuBar.cpp
1290
1291
===================================================================
1291
1292
--- /dev/null
1292
 
+++ firefox-trunk-48.0~a1~hg20160424r294498/widget/gtk/nsMenuBar.cpp
 
1293
+++ firefox-trunk-49.0~a1~hg20160602r300071/widget/gtk/nsMenuBar.cpp
1293
1294
@@ -0,0 +1,545 @@
1294
1295
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
1295
1296
+/* vim:expandtab:shiftwidth=4:tabstop=4:
1836
1837
+    DebugOnly<nsresult> rv = RemoveChild(aChild);
1837
1838
+    NS_ASSERTION(NS_SUCCEEDED(rv), "Failed to remove item from menubar");
1838
1839
+}
1839
 
Index: firefox-trunk-48.0~a1~hg20160424r294498/widget/gtk/nsMenuBar.h
 
1840
Index: firefox-trunk-49.0~a1~hg20160602r300071/widget/gtk/nsMenuBar.h
1840
1841
===================================================================
1841
1842
--- /dev/null
1842
 
+++ firefox-trunk-48.0~a1~hg20160424r294498/widget/gtk/nsMenuBar.h
 
1843
+++ firefox-trunk-49.0~a1~hg20160602r300071/widget/gtk/nsMenuBar.h
1843
1844
@@ -0,0 +1,112 @@
1844
1845
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
1845
1846
+/* vim:expandtab:shiftwidth=4:tabstop=4:
1953
1954
+};
1954
1955
+
1955
1956
+#endif /* __nsMenuBar_h__ */
1956
 
Index: firefox-trunk-48.0~a1~hg20160424r294498/widget/gtk/nsMenuContainer.cpp
 
1957
Index: firefox-trunk-49.0~a1~hg20160602r300071/widget/gtk/nsMenuContainer.cpp
1957
1958
===================================================================
1958
1959
--- /dev/null
1959
 
+++ firefox-trunk-48.0~a1~hg20160424r294498/widget/gtk/nsMenuContainer.cpp
 
1960
+++ firefox-trunk-49.0~a1~hg20160602r300071/widget/gtk/nsMenuContainer.cpp
1960
1961
@@ -0,0 +1,174 @@
1961
1962
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
1962
1963
+/* vim:expandtab:shiftwidth=4:tabstop=4:
2132
2133
+
2133
2134
+    return aContent;
2134
2135
+}
2135
 
Index: firefox-trunk-48.0~a1~hg20160424r294498/widget/gtk/nsMenuContainer.h
 
2136
Index: firefox-trunk-49.0~a1~hg20160602r300071/widget/gtk/nsMenuContainer.h
2136
2137
===================================================================
2137
2138
--- /dev/null
2138
 
+++ firefox-trunk-48.0~a1~hg20160424r294498/widget/gtk/nsMenuContainer.h
 
2139
+++ firefox-trunk-49.0~a1~hg20160602r300071/widget/gtk/nsMenuContainer.h
2139
2140
@@ -0,0 +1,66 @@
2140
2141
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
2141
2142
+/* vim:expandtab:shiftwidth=4:tabstop=4:
2203
2204
+};
2204
2205
+
2205
2206
+#endif /* __nsMenuContainer_h__ */
2206
 
Index: firefox-trunk-48.0~a1~hg20160424r294498/widget/gtk/nsMenuItem.cpp
 
2207
Index: firefox-trunk-49.0~a1~hg20160602r300071/widget/gtk/nsMenuItem.cpp
2207
2208
===================================================================
2208
2209
--- /dev/null
2209
 
+++ firefox-trunk-48.0~a1~hg20160424r294498/widget/gtk/nsMenuItem.cpp
 
2210
+++ firefox-trunk-49.0~a1~hg20160602r300071/widget/gtk/nsMenuItem.cpp
2210
2211
@@ -0,0 +1,742 @@
2211
2212
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
2212
2213
+/* vim:expandtab:shiftwidth=4:tabstop=4:
2503
2504
+    return 0;
2504
2505
+}
2505
2506
+
2506
 
+class nsMenuItemUncheckSiblingsRunnable final : public nsRunnable
 
2507
+class nsMenuItemUncheckSiblingsRunnable final : public Runnable
2507
2508
+{
2508
2509
+public:
2509
2510
+    NS_IMETHODIMP Run()
2950
2951
+        UpdateIcon(sc);
2951
2952
+    }
2952
2953
+}
2953
 
Index: firefox-trunk-48.0~a1~hg20160424r294498/widget/gtk/nsMenuItem.h
 
2954
Index: firefox-trunk-49.0~a1~hg20160602r300071/widget/gtk/nsMenuItem.h
2954
2955
===================================================================
2955
2956
--- /dev/null
2956
 
+++ firefox-trunk-48.0~a1~hg20160424r294498/widget/gtk/nsMenuItem.h
 
2957
+++ firefox-trunk-49.0~a1~hg20160602r300071/widget/gtk/nsMenuItem.h
2957
2958
@@ -0,0 +1,107 @@
2958
2959
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
2959
2960
+/* vim:expandtab:shiftwidth=4:tabstop=4:
3062
3063
+};
3063
3064
+
3064
3065
+#endif /* __nsMenuItem_h__ */
3065
 
Index: firefox-trunk-48.0~a1~hg20160424r294498/widget/gtk/nsMenuObject.cpp
 
3066
Index: firefox-trunk-49.0~a1~hg20160602r300071/widget/gtk/nsMenuObject.cpp
3066
3067
===================================================================
3067
3068
--- /dev/null
3068
 
+++ firefox-trunk-48.0~a1~hg20160424r294498/widget/gtk/nsMenuObject.cpp
 
3069
+++ firefox-trunk-49.0~a1~hg20160602r300071/widget/gtk/nsMenuObject.cpp
3069
3070
@@ -0,0 +1,709 @@
3070
3071
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
3071
3072
+/* vim:expandtab:shiftwidth=4:tabstop=4:
3131
3132
+nsWeakMenuObjectBase* nsWeakMenuObjectBase::sHead;
3132
3133
+PangoLayout* gPangoLayout = nullptr;
3133
3134
+
3134
 
+class nsMenuObjectContainerOpeningRunnable : public nsRunnable
 
3135
+class nsMenuObjectContainerOpeningRunnable : public Runnable
3135
3136
+{
3136
3137
+public:
3137
3138
+    NS_IMETHODIMP Run()
3776
3777
+        weak = weak->GetPrevious();
3777
3778
+    }
3778
3779
+}
3779
 
Index: firefox-trunk-48.0~a1~hg20160424r294498/widget/gtk/nsMenuObject.h
 
3780
Index: firefox-trunk-49.0~a1~hg20160602r300071/widget/gtk/nsMenuObject.h
3780
3781
===================================================================
3781
3782
--- /dev/null
3782
 
+++ firefox-trunk-48.0~a1~hg20160424r294498/widget/gtk/nsMenuObject.h
 
3783
+++ firefox-trunk-49.0~a1~hg20160602r300071/widget/gtk/nsMenuObject.h
3783
3784
@@ -0,0 +1,242 @@
3784
3785
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
3785
3786
+/* vim:expandtab:shiftwidth=4:tabstop=4:
4023
4024
+};
4024
4025
+
4025
4026
+#endif /* __nsMenuObject_h__ */
4026
 
Index: firefox-trunk-48.0~a1~hg20160424r294498/widget/gtk/nsMenuSeparator.cpp
 
4027
Index: firefox-trunk-49.0~a1~hg20160602r300071/widget/gtk/nsMenuSeparator.cpp
4027
4028
===================================================================
4028
4029
--- /dev/null
4029
 
+++ firefox-trunk-48.0~a1~hg20160424r294498/widget/gtk/nsMenuSeparator.cpp
 
4030
+++ firefox-trunk-49.0~a1~hg20160602r300071/widget/gtk/nsMenuSeparator.cpp
4030
4031
@@ -0,0 +1,90 @@
4031
4032
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
4032
4033
+/* vim:expandtab:shiftwidth=4:tabstop=4:
4118
4119
+        UpdateVisibility(sc);
4119
4120
+    }
4120
4121
+}
4121
 
Index: firefox-trunk-48.0~a1~hg20160424r294498/widget/gtk/nsMenuSeparator.h
 
4122
Index: firefox-trunk-49.0~a1~hg20160602r300071/widget/gtk/nsMenuSeparator.h
4122
4123
===================================================================
4123
4124
--- /dev/null
4124
 
+++ firefox-trunk-48.0~a1~hg20160424r294498/widget/gtk/nsMenuSeparator.h
 
4125
+++ firefox-trunk-49.0~a1~hg20160602r300071/widget/gtk/nsMenuSeparator.h
4125
4126
@@ -0,0 +1,41 @@
4126
4127
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
4127
4128
+/* vim:expandtab:shiftwidth=4:tabstop=4:
4164
4165
+};
4165
4166
+
4166
4167
+#endif /* __nsMenuSeparator_h__ */
4167
 
Index: firefox-trunk-48.0~a1~hg20160424r294498/widget/gtk/nsNativeMenuAtomList.h
 
4168
Index: firefox-trunk-49.0~a1~hg20160602r300071/widget/gtk/nsNativeMenuAtomList.h
4168
4169
===================================================================
4169
4170
--- /dev/null
4170
 
+++ firefox-trunk-48.0~a1~hg20160424r294498/widget/gtk/nsNativeMenuAtomList.h
 
4171
+++ firefox-trunk-49.0~a1~hg20160602r300071/widget/gtk/nsNativeMenuAtomList.h
4171
4172
@@ -0,0 +1,11 @@
4172
4173
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
4173
4174
+/* vim:expandtab:shiftwidth=4:tabstop=4:
4180
4181
+WIDGET_ATOM2(_moz_menupopupstate, "_moz-menupopupstate")
4181
4182
+WIDGET_ATOM(openedwithkey)
4182
4183
+WIDGET_ATOM(shellshowingmenubar)
4183
 
Index: firefox-trunk-48.0~a1~hg20160424r294498/widget/gtk/nsNativeMenuAtoms.cpp
 
4184
Index: firefox-trunk-49.0~a1~hg20160602r300071/widget/gtk/nsNativeMenuAtoms.cpp
4184
4185
===================================================================
4185
4186
--- /dev/null
4186
 
+++ firefox-trunk-48.0~a1~hg20160424r294498/widget/gtk/nsNativeMenuAtoms.cpp
 
4187
+++ firefox-trunk-49.0~a1~hg20160602r300071/widget/gtk/nsNativeMenuAtoms.cpp
4187
4188
@@ -0,0 +1,39 @@
4188
4189
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
4189
4190
+/* vim:expandtab:shiftwidth=4:tabstop=4:
4224
4225
+{
4225
4226
+    NS_RegisterStaticAtoms(gAtoms);
4226
4227
+}
4227
 
Index: firefox-trunk-48.0~a1~hg20160424r294498/widget/gtk/nsNativeMenuAtoms.h
 
4228
Index: firefox-trunk-49.0~a1~hg20160602r300071/widget/gtk/nsNativeMenuAtoms.h
4228
4229
===================================================================
4229
4230
--- /dev/null
4230
 
+++ firefox-trunk-48.0~a1~hg20160424r294498/widget/gtk/nsNativeMenuAtoms.h
 
4231
+++ firefox-trunk-49.0~a1~hg20160602r300071/widget/gtk/nsNativeMenuAtoms.h
4231
4232
@@ -0,0 +1,25 @@
4232
4233
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
4233
4234
+/* vim:expandtab:shiftwidth=4:tabstop=4:
4254
4255
+};
4255
4256
+
4256
4257
+#endif /* __nsNativeMenuAtoms_h__ */
4257
 
Index: firefox-trunk-48.0~a1~hg20160424r294498/widget/gtk/nsNativeMenuDocListener.cpp
 
4258
Index: firefox-trunk-49.0~a1~hg20160602r300071/widget/gtk/nsNativeMenuDocListener.cpp
4258
4259
===================================================================
4259
4260
--- /dev/null
4260
 
+++ firefox-trunk-48.0~a1~hg20160424r294498/widget/gtk/nsNativeMenuDocListener.cpp
 
4261
+++ firefox-trunk-49.0~a1~hg20160602r300071/widget/gtk/nsNativeMenuDocListener.cpp
4261
4262
@@ -0,0 +1,370 @@
4262
4263
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
4263
4264
+/* vim:expandtab:shiftwidth=4:tabstop=4:
4629
4630
+    CancelFlush(this);
4630
4631
+    mPendingMutations.Clear();
4631
4632
+}
4632
 
Index: firefox-trunk-48.0~a1~hg20160424r294498/widget/gtk/nsNativeMenuDocListener.h
 
4633
Index: firefox-trunk-49.0~a1~hg20160602r300071/widget/gtk/nsNativeMenuDocListener.h
4633
4634
===================================================================
4634
4635
--- /dev/null
4635
 
+++ firefox-trunk-48.0~a1~hg20160424r294498/widget/gtk/nsNativeMenuDocListener.h
 
4636
+++ firefox-trunk-49.0~a1~hg20160602r300071/widget/gtk/nsNativeMenuDocListener.h
4636
4637
@@ -0,0 +1,153 @@
4637
4638
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
4638
4639
+/* vim:expandtab:shiftwidth=4:tabstop=4:
4787
4788
+};
4788
4789
+
4789
4790
+#endif /* __nsNativeMenuDocListener_h__ */
4790
 
Index: firefox-trunk-48.0~a1~hg20160424r294498/widget/gtk/nsNativeMenuService.cpp
 
4791
Index: firefox-trunk-49.0~a1~hg20160602r300071/widget/gtk/nsNativeMenuService.cpp
4791
4792
===================================================================
4792
4793
--- /dev/null
4793
 
+++ firefox-trunk-48.0~a1~hg20160424r294498/widget/gtk/nsNativeMenuService.cpp
 
4794
+++ firefox-trunk-49.0~a1~hg20160602r300071/widget/gtk/nsNativeMenuService.cpp
4794
4795
@@ -0,0 +1,506 @@
4795
4796
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
4796
4797
+/* vim:expandtab:shiftwidth=4:tabstop=4:
5298
5299
+
5299
5300
+    return NS_OK;
5300
5301
+}
5301
 
Index: firefox-trunk-48.0~a1~hg20160424r294498/widget/gtk/nsNativeMenuService.h
 
5302
Index: firefox-trunk-49.0~a1~hg20160602r300071/widget/gtk/nsNativeMenuService.h
5302
5303
===================================================================
5303
5304
--- /dev/null
5304
 
+++ firefox-trunk-48.0~a1~hg20160424r294498/widget/gtk/nsNativeMenuService.h
 
5305
+++ firefox-trunk-49.0~a1~hg20160602r300071/widget/gtk/nsNativeMenuService.h
5305
5306
@@ -0,0 +1,88 @@
5306
5307
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
5307
5308
+/* vim:expandtab:shiftwidth=4:tabstop=4:
5391
5392
+};
5392
5393
+
5393
5394
+#endif /* __nsNativeMenuService_h__ */
5394
 
Index: firefox-trunk-48.0~a1~hg20160424r294498/widget/gtk/nsNativeMenuUtils.h
 
5395
Index: firefox-trunk-49.0~a1~hg20160602r300071/widget/gtk/nsNativeMenuUtils.h
5395
5396
===================================================================
5396
5397
--- /dev/null
5397
 
+++ firefox-trunk-48.0~a1~hg20160424r294498/widget/gtk/nsNativeMenuUtils.h
 
5398
+++ firefox-trunk-49.0~a1~hg20160602r300071/widget/gtk/nsNativeMenuUtils.h
5398
5399
@@ -0,0 +1,59 @@
5399
5400
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
5400
5401
+/* vim:expandtab:shiftwidth=4:tabstop=4:
5455
5456
+};
5456
5457
+
5457
5458
+#endif /* __nsNativeMenuUtils_h__ */
5458
 
Index: firefox-trunk-48.0~a1~hg20160424r294498/widget/gtk/nsWidgetFactory.cpp
 
5459
Index: firefox-trunk-49.0~a1~hg20160602r300071/widget/gtk/nsWidgetFactory.cpp
5459
5460
===================================================================
5460
 
--- firefox-trunk-48.0~a1~hg20160424r294498.orig/widget/gtk/nsWidgetFactory.cpp
5461
 
+++ firefox-trunk-48.0~a1~hg20160424r294498/widget/gtk/nsWidgetFactory.cpp
 
5461
--- firefox-trunk-49.0~a1~hg20160602r300071.orig/widget/gtk/nsWidgetFactory.cpp
 
5462
+++ firefox-trunk-49.0~a1~hg20160602r300071/widget/gtk/nsWidgetFactory.cpp
5462
5463
@@ -49,6 +49,9 @@
5463
5464
 #include "GfxInfoX11.h"
5464
5465
 #endif
5527
5528
     nsWidgetGtk2ModuleDtor
5528
5529
 };
5529
5530
 
5530
 
Index: firefox-trunk-48.0~a1~hg20160424r294498/widget/gtk/nsWindow.cpp
 
5531
Index: firefox-trunk-49.0~a1~hg20160602r300071/widget/gtk/nsWindow.cpp
5531
5532
===================================================================
5532
 
--- firefox-trunk-48.0~a1~hg20160424r294498.orig/widget/gtk/nsWindow.cpp
5533
 
+++ firefox-trunk-48.0~a1~hg20160424r294498/widget/gtk/nsWindow.cpp
5534
 
@@ -5078,6 +5078,11 @@ nsWindow::HideWindowChrome(bool aShouldH
 
5533
--- firefox-trunk-49.0~a1~hg20160602r300071.orig/widget/gtk/nsWindow.cpp
 
5534
+++ firefox-trunk-49.0~a1~hg20160602r300071/widget/gtk/nsWindow.cpp
 
5535
@@ -5108,6 +5108,11 @@ nsWindow::HideWindowChrome(bool aShouldH
5535
5536
     return NS_OK;
5536
5537
 }
5537
5538
 
5543
5544
 bool
5544
5545
 nsWindow::CheckForRollup(gdouble aMouseX, gdouble aMouseY,
5545
5546
                          bool aIsWheel, bool aAlwaysRollup)
5546
 
Index: firefox-trunk-48.0~a1~hg20160424r294498/widget/gtk/nsWindow.h
 
5547
Index: firefox-trunk-49.0~a1~hg20160602r300071/widget/gtk/nsWindow.h
5547
5548
===================================================================
5548
 
--- firefox-trunk-48.0~a1~hg20160424r294498.orig/widget/gtk/nsWindow.h
5549
 
+++ firefox-trunk-48.0~a1~hg20160424r294498/widget/gtk/nsWindow.h
 
5549
--- firefox-trunk-49.0~a1~hg20160602r300071.orig/widget/gtk/nsWindow.h
 
5550
+++ firefox-trunk-49.0~a1~hg20160602r300071/widget/gtk/nsWindow.h
5550
5551
@@ -34,6 +34,8 @@
5551
5552
 
5552
5553
 #include "IMContextWrapper.h"
5565
5566
     /**
5566
5567
      * GetLastUserInputTime returns a timestamp for the most recent user input
5567
5568
      * event.  This is intended for pointer grab requests (including drags).
5568
 
@@ -563,6 +567,8 @@ private:
 
5569
@@ -569,6 +573,8 @@ private:
5569
5570
     RefPtr<mozilla::widget::IMContextWrapper> mIMContext;
5570
5571
 
5571
5572
     mozilla::UniquePtr<mozilla::CurrentX11TimeGetter> mCurrentTimeGetter;
5574
5575
 };
5575
5576
 
5576
5577
 class nsChildWindow : public nsWindow {
5577
 
Index: firefox-trunk-48.0~a1~hg20160424r294498/xpfe/appshell/nsWebShellWindow.cpp
 
5578
Index: firefox-trunk-49.0~a1~hg20160602r300071/xpfe/appshell/nsWebShellWindow.cpp
5578
5579
===================================================================
5579
 
--- firefox-trunk-48.0~a1~hg20160424r294498.orig/xpfe/appshell/nsWebShellWindow.cpp
5580
 
+++ firefox-trunk-48.0~a1~hg20160424r294498/xpfe/appshell/nsWebShellWindow.cpp
 
5580
--- firefox-trunk-49.0~a1~hg20160602r300071.orig/xpfe/appshell/nsWebShellWindow.cpp
 
5581
+++ firefox-trunk-49.0~a1~hg20160602r300071/xpfe/appshell/nsWebShellWindow.cpp
5581
5582
@@ -58,6 +58,7 @@
5582
5583
 #include "nsIScreen.h"
5583
5584
 
5607
5608
     nms->CreateNativeMenuBar(aParentWindow, menubarContent);
5608
5609
   } else {
5609
5610
     nms->CreateNativeMenuBar(aParentWindow, nullptr);
5610
 
Index: firefox-trunk-48.0~a1~hg20160424r294498/widget/gtk/moz.build
 
5611
Index: firefox-trunk-49.0~a1~hg20160602r300071/widget/gtk/moz.build
5611
5612
===================================================================
5612
 
--- firefox-trunk-48.0~a1~hg20160424r294498.orig/widget/gtk/moz.build
5613
 
+++ firefox-trunk-48.0~a1~hg20160424r294498/widget/gtk/moz.build
 
5613
--- firefox-trunk-49.0~a1~hg20160602r300071.orig/widget/gtk/moz.build
 
5614
+++ firefox-trunk-49.0~a1~hg20160602r300071/widget/gtk/moz.build
5614
5615
@@ -24,10 +24,18 @@ UNIFIED_SOURCES += [
5615
5616
     'nsAppShell.cpp',
5616
5617
     'nsBidiKeyboard.cpp',
5639
5640
     'nsWindow.cpp', # conflicts with X11 headers
5640
5641
 ]
5641
5642
 
5642
 
@@ -92,6 +102,7 @@ FINAL_LIBRARY = 'xul'
 
5643
@@ -90,6 +100,7 @@ FINAL_LIBRARY = 'xul'
5643
5644
 
5644
5645
 LOCAL_INCLUDES += [
5645
5646
     '/layout/generic',
5647
5648
     '/layout/xul',
5648
5649
     '/other-licenses/atk-1.0',
5649
5650
     '/widget',
5650
 
Index: firefox-trunk-48.0~a1~hg20160424r294498/browser/base/content/browser.js
 
5651
Index: firefox-trunk-49.0~a1~hg20160602r300071/browser/base/content/browser.js
5651
5652
===================================================================
5652
 
--- firefox-trunk-48.0~a1~hg20160424r294498.orig/browser/base/content/browser.js
5653
 
+++ firefox-trunk-48.0~a1~hg20160424r294498/browser/base/content/browser.js
5654
 
@@ -4924,6 +4924,8 @@ function getTogglableToolbars() {
 
5653
--- firefox-trunk-49.0~a1~hg20160602r300071.orig/browser/base/content/browser.js
 
5654
+++ firefox-trunk-49.0~a1~hg20160602r300071/browser/base/content/browser.js
 
5655
@@ -4975,6 +4975,8 @@ function getTogglableToolbars() {
5655
5656
   let toolbarNodes = Array.slice(gNavToolbox.childNodes);
5656
5657
   toolbarNodes = toolbarNodes.concat(gNavToolbox.externalToolbars);
5657
5658
   toolbarNodes = toolbarNodes.filter(node => node.getAttribute("toolbarname"));
5660
5661
   return toolbarNodes;
5661
5662
 }
5662
5663
 
5663
 
Index: firefox-trunk-48.0~a1~hg20160424r294498/widget/moz.build
 
5664
Index: firefox-trunk-49.0~a1~hg20160602r300071/widget/moz.build
5664
5665
===================================================================
5665
 
--- firefox-trunk-48.0~a1~hg20160424r294498.orig/widget/moz.build
5666
 
+++ firefox-trunk-48.0~a1~hg20160424r294498/widget/moz.build
 
5666
--- firefox-trunk-49.0~a1~hg20160602r300071.orig/widget/moz.build
 
5667
+++ firefox-trunk-49.0~a1~hg20160602r300071/widget/moz.build
5667
5668
@@ -37,10 +37,12 @@ elif toolkit == 'cocoa':
5668
5669
         'nsITaskbarProgress.idl',
5669
5670
     ]
5678
5679
 TEST_DIRS += ['tests']
5679
5680
 
5680
5681
 # Don't build the DSO under the 'build' directory as windows does.
5681
 
Index: firefox-trunk-48.0~a1~hg20160424r294498/modules/libpref/init/all.js
 
5682
Index: firefox-trunk-49.0~a1~hg20160602r300071/modules/libpref/init/all.js
5682
5683
===================================================================
5683
 
--- firefox-trunk-48.0~a1~hg20160424r294498.orig/modules/libpref/init/all.js
5684
 
+++ firefox-trunk-48.0~a1~hg20160424r294498/modules/libpref/init/all.js
5685
 
@@ -202,6 +202,9 @@ pref("dom.compartment_per_addon", true);
 
5684
--- firefox-trunk-49.0~a1~hg20160602r300071.orig/modules/libpref/init/all.js
 
5685
+++ firefox-trunk-49.0~a1~hg20160602r300071/modules/libpref/init/all.js
 
5686
@@ -209,6 +209,9 @@ pref("dom.compartment_per_addon", true);
5686
5687
 pref("browser.sessionhistory.max_total_viewers", -1);
5687
5688
 
5688
5689
 pref("ui.use_native_colors", true);
5692
5693
 pref("ui.click_hold_context_menus", false);
5693
5694
 // Duration of timeout of incremental search in menus (ms).  0 means infinite.
5694
5695
 pref("ui.menu.incremental_search.timeout", 1000);
5695
 
Index: firefox-trunk-48.0~a1~hg20160424r294498/widget/gtk/nsScreenGtk.cpp
 
5696
Index: firefox-trunk-49.0~a1~hg20160602r300071/widget/gtk/nsScreenGtk.cpp
5696
5697
===================================================================
5697
 
--- firefox-trunk-48.0~a1~hg20160424r294498.orig/widget/gtk/nsScreenGtk.cpp
5698
 
+++ firefox-trunk-48.0~a1~hg20160424r294498/widget/gtk/nsScreenGtk.cpp
 
5698
--- firefox-trunk-49.0~a1~hg20160602r300071.orig/widget/gtk/nsScreenGtk.cpp
 
5699
+++ firefox-trunk-49.0~a1~hg20160602r300071/widget/gtk/nsScreenGtk.cpp
5699
5700
@@ -13,6 +13,7 @@
5700
5701
 #include <gtk/gtk.h>
5701
5702
 #include <dlfcn.h>