← Back to branch summary

~jbicha/firefox/update-dependencies

« back to all changes in this revision

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

  • Committer: Chris Coulson
  • Date: 2017-03-02 22:41:57 UTC
  • Revision ID: chris.coulson@canonical.com-20170302224157-sbg1km52siyk9k5p
Tags: 52.0~b9+build2-0ubuntu0.17.04.2
releasing package firefox version 52.0~b9+build2-0ubuntu0.17.04.2

Show diffs side-by-side

added added

removed removed

Lines of Context:
debian/patches/unity-menubar.patch
1
 
Index: firefox-trunk-52.0~a1~hg20161001r316143/browser/base/content/browser-menubar.inc
 
1
Index: firefox-52.0~b9+build2/browser/base/content/browser-menubar.inc
2
2
===================================================================
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
 
3
--- firefox-52.0~b9+build2.orig/browser/base/content/browser-menubar.inc
 
4
+++ firefox-52.0~b9+build2/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-52.0~a1~hg20161001r316143/browser/components/places/content/places.xul
 
17
Index: firefox-52.0~b9+build2/browser/components/places/content/places.xul
18
18
===================================================================
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
 
19
--- firefox-52.0~b9+build2.orig/browser/components/places/content/places.xul
 
20
+++ firefox-52.0~b9+build2/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-52.0~a1~hg20161001r316143/toolkit/content/widgets/popup.xml
 
30
Index: firefox-52.0~b9+build2/toolkit/content/widgets/popup.xml
31
31
===================================================================
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
 
32
--- firefox-52.0~b9+build2.orig/toolkit/content/widgets/popup.xml
 
33
+++ firefox-52.0~b9+build2/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-52.0~a1~hg20161001r316143/toolkit/content/xul.css
 
51
Index: firefox-52.0~b9+build2/toolkit/content/xul.css
52
52
===================================================================
53
 
--- firefox-trunk-52.0~a1~hg20161001r316143.orig/toolkit/content/xul.css
54
 
+++ firefox-trunk-52.0~a1~hg20161001r316143/toolkit/content/xul.css
 
53
--- firefox-52.0~b9+build2.orig/toolkit/content/xul.css
 
54
+++ firefox-52.0~b9+build2/toolkit/content/xul.css
55
55
@@ -307,6 +307,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-52.0~a1~hg20161001r316143/widget/gtk/nsDbusmenu.cpp
 
74
Index: firefox-52.0~b9+build2/widget/gtk/nsDbusmenu.cpp
75
75
===================================================================
76
76
--- /dev/null
77
 
+++ firefox-trunk-52.0~a1~hg20161001r316143/widget/gtk/nsDbusmenu.cpp
 
77
+++ firefox-52.0~b9+build2/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-52.0~a1~hg20161001r316143/widget/gtk/nsDbusmenu.h
 
142
Index: firefox-52.0~b9+build2/widget/gtk/nsDbusmenu.h
143
143
===================================================================
144
144
--- /dev/null
145
 
+++ firefox-trunk-52.0~a1~hg20161001r316143/widget/gtk/nsDbusmenu.h
 
145
+++ firefox-52.0~b9+build2/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-52.0~a1~hg20161001r316143/widget/gtk/nsMenu.cpp
 
246
Index: firefox-52.0~b9+build2/widget/gtk/nsMenu.cpp
247
247
===================================================================
248
248
--- /dev/null
249
 
+++ firefox-trunk-52.0~a1~hg20161001r316143/widget/gtk/nsMenu.cpp
 
249
+++ firefox-52.0~b9+build2/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-52.0~a1~hg20161001r316143/widget/gtk/nsMenu.h
 
1119
Index: firefox-52.0~b9+build2/widget/gtk/nsMenu.h
1120
1120
===================================================================
1121
1121
--- /dev/null
1122
 
+++ firefox-trunk-52.0~a1~hg20161001r316143/widget/gtk/nsMenu.h
 
1122
+++ firefox-52.0~b9+build2/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-52.0~a1~hg20161001r316143/widget/gtk/nsMenuBar.cpp
 
1290
Index: firefox-52.0~b9+build2/widget/gtk/nsMenuBar.cpp
1291
1291
===================================================================
1292
1292
--- /dev/null
1293
 
+++ firefox-trunk-52.0~a1~hg20161001r316143/widget/gtk/nsMenuBar.cpp
 
1293
+++ firefox-52.0~b9+build2/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-52.0~a1~hg20161001r316143/widget/gtk/nsMenuBar.h
 
1840
Index: firefox-52.0~b9+build2/widget/gtk/nsMenuBar.h
1841
1841
===================================================================
1842
1842
--- /dev/null
1843
 
+++ firefox-trunk-52.0~a1~hg20161001r316143/widget/gtk/nsMenuBar.h
 
1843
+++ firefox-52.0~b9+build2/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-52.0~a1~hg20161001r316143/widget/gtk/nsMenuContainer.cpp
 
1957
Index: firefox-52.0~b9+build2/widget/gtk/nsMenuContainer.cpp
1958
1958
===================================================================
1959
1959
--- /dev/null
1960
 
+++ firefox-trunk-52.0~a1~hg20161001r316143/widget/gtk/nsMenuContainer.cpp
 
1960
+++ firefox-52.0~b9+build2/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-52.0~a1~hg20161001r316143/widget/gtk/nsMenuContainer.h
 
2136
Index: firefox-52.0~b9+build2/widget/gtk/nsMenuContainer.h
2137
2137
===================================================================
2138
2138
--- /dev/null
2139
 
+++ firefox-trunk-52.0~a1~hg20161001r316143/widget/gtk/nsMenuContainer.h
 
2139
+++ firefox-52.0~b9+build2/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-52.0~a1~hg20161001r316143/widget/gtk/nsMenuItem.cpp
 
2207
Index: firefox-52.0~b9+build2/widget/gtk/nsMenuItem.cpp
2208
2208
===================================================================
2209
2209
--- /dev/null
2210
 
+++ firefox-trunk-52.0~a1~hg20161001r316143/widget/gtk/nsMenuItem.cpp
 
2210
+++ firefox-52.0~b9+build2/widget/gtk/nsMenuItem.cpp
2211
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:
2952
2952
+        UpdateIcon(sc);
2953
2953
+    }
2954
2954
+}
2955
 
Index: firefox-trunk-52.0~a1~hg20161001r316143/widget/gtk/nsMenuItem.h
 
2955
Index: firefox-52.0~b9+build2/widget/gtk/nsMenuItem.h
2956
2956
===================================================================
2957
2957
--- /dev/null
2958
 
+++ firefox-trunk-52.0~a1~hg20161001r316143/widget/gtk/nsMenuItem.h
 
2958
+++ firefox-52.0~b9+build2/widget/gtk/nsMenuItem.h
2959
2959
@@ -0,0 +1,107 @@
2960
2960
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
2961
2961
+/* vim:expandtab:shiftwidth=4:tabstop=4:
3064
3064
+};
3065
3065
+
3066
3066
+#endif /* __nsMenuItem_h__ */
3067
 
Index: firefox-trunk-52.0~a1~hg20161001r316143/widget/gtk/nsMenuObject.cpp
 
3067
Index: firefox-52.0~b9+build2/widget/gtk/nsMenuObject.cpp
3068
3068
===================================================================
3069
3069
--- /dev/null
3070
 
+++ firefox-trunk-52.0~a1~hg20161001r316143/widget/gtk/nsMenuObject.cpp
 
3070
+++ firefox-52.0~b9+build2/widget/gtk/nsMenuObject.cpp
3071
3071
@@ -0,0 +1,694 @@
3072
3072
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
3073
3073
+/* vim:expandtab:shiftwidth=4:tabstop=4:
3763
3763
+        weak = weak->GetPrevious();
3764
3764
+    }
3765
3765
+}
3766
 
Index: firefox-trunk-52.0~a1~hg20161001r316143/widget/gtk/nsMenuObject.h
 
3766
Index: firefox-52.0~b9+build2/widget/gtk/nsMenuObject.h
3767
3767
===================================================================
3768
3768
--- /dev/null
3769
 
+++ firefox-trunk-52.0~a1~hg20161001r316143/widget/gtk/nsMenuObject.h
 
3769
+++ firefox-52.0~b9+build2/widget/gtk/nsMenuObject.h
3770
3770
@@ -0,0 +1,242 @@
3771
3771
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
3772
3772
+/* vim:expandtab:shiftwidth=4:tabstop=4:
4010
4010
+};
4011
4011
+
4012
4012
+#endif /* __nsMenuObject_h__ */
4013
 
Index: firefox-trunk-52.0~a1~hg20161001r316143/widget/gtk/nsMenuSeparator.cpp
 
4013
Index: firefox-52.0~b9+build2/widget/gtk/nsMenuSeparator.cpp
4014
4014
===================================================================
4015
4015
--- /dev/null
4016
 
+++ firefox-trunk-52.0~a1~hg20161001r316143/widget/gtk/nsMenuSeparator.cpp
 
4016
+++ firefox-52.0~b9+build2/widget/gtk/nsMenuSeparator.cpp
4017
4017
@@ -0,0 +1,90 @@
4018
4018
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
4019
4019
+/* vim:expandtab:shiftwidth=4:tabstop=4:
4105
4105
+        UpdateVisibility(sc);
4106
4106
+    }
4107
4107
+}
4108
 
Index: firefox-trunk-52.0~a1~hg20161001r316143/widget/gtk/nsMenuSeparator.h
 
4108
Index: firefox-52.0~b9+build2/widget/gtk/nsMenuSeparator.h
4109
4109
===================================================================
4110
4110
--- /dev/null
4111
 
+++ firefox-trunk-52.0~a1~hg20161001r316143/widget/gtk/nsMenuSeparator.h
 
4111
+++ firefox-52.0~b9+build2/widget/gtk/nsMenuSeparator.h
4112
4112
@@ -0,0 +1,41 @@
4113
4113
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
4114
4114
+/* vim:expandtab:shiftwidth=4:tabstop=4:
4151
4151
+};
4152
4152
+
4153
4153
+#endif /* __nsMenuSeparator_h__ */
4154
 
Index: firefox-trunk-52.0~a1~hg20161001r316143/widget/gtk/nsNativeMenuAtomList.h
 
4154
Index: firefox-52.0~b9+build2/widget/gtk/nsNativeMenuAtomList.h
4155
4155
===================================================================
4156
4156
--- /dev/null
4157
 
+++ firefox-trunk-52.0~a1~hg20161001r316143/widget/gtk/nsNativeMenuAtomList.h
 
4157
+++ firefox-52.0~b9+build2/widget/gtk/nsNativeMenuAtomList.h
4158
4158
@@ -0,0 +1,11 @@
4159
4159
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
4160
4160
+/* vim:expandtab:shiftwidth=4:tabstop=4:
4167
4167
+WIDGET_ATOM2(_moz_menupopupstate, "_moz-menupopupstate")
4168
4168
+WIDGET_ATOM(openedwithkey)
4169
4169
+WIDGET_ATOM(shellshowingmenubar)
4170
 
Index: firefox-trunk-52.0~a1~hg20161001r316143/widget/gtk/nsNativeMenuAtoms.cpp
 
4170
Index: firefox-52.0~b9+build2/widget/gtk/nsNativeMenuAtoms.cpp
4171
4171
===================================================================
4172
4172
--- /dev/null
4173
 
+++ firefox-trunk-52.0~a1~hg20161001r316143/widget/gtk/nsNativeMenuAtoms.cpp
 
4173
+++ firefox-52.0~b9+build2/widget/gtk/nsNativeMenuAtoms.cpp
4174
4174
@@ -0,0 +1,39 @@
4175
4175
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
4176
4176
+/* vim:expandtab:shiftwidth=4:tabstop=4:
4207
4207
+};
4208
4208
+
4209
4209
+/* static */ void
4210
 
+nsNativeMenuAtoms::Init()
 
4210
+nsNativeMenuAtoms::RegisterAtoms()
4211
4211
+{
4212
4212
+    NS_RegisterStaticAtoms(gAtoms);
4213
4213
+}
4214
 
Index: firefox-trunk-52.0~a1~hg20161001r316143/widget/gtk/nsNativeMenuAtoms.h
 
4214
Index: firefox-52.0~b9+build2/widget/gtk/nsNativeMenuAtoms.h
4215
4215
===================================================================
4216
4216
--- /dev/null
4217
 
+++ firefox-trunk-52.0~a1~hg20161001r316143/widget/gtk/nsNativeMenuAtoms.h
 
4217
+++ firefox-52.0~b9+build2/widget/gtk/nsNativeMenuAtoms.h
4218
4218
@@ -0,0 +1,25 @@
4219
4219
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
4220
4220
+/* vim:expandtab:shiftwidth=4:tabstop=4:
4231
4231
+class nsNativeMenuAtoms
4232
4232
+{
4233
4233
+public:
4234
 
+    static void Init();
 
4234
+    static void RegisterAtoms();
4235
4235
+
4236
4236
+#define WIDGET_ATOM(_name) static nsIAtom* _name;
4237
4237
+#define WIDGET_ATOM2(_name, _value) static nsIAtom* _name;
4241
4241
+};
4242
4242
+
4243
4243
+#endif /* __nsNativeMenuAtoms_h__ */
4244
 
Index: firefox-trunk-52.0~a1~hg20161001r316143/widget/gtk/nsNativeMenuDocListener.cpp
 
4244
Index: firefox-52.0~b9+build2/widget/gtk/nsNativeMenuDocListener.cpp
4245
4245
===================================================================
4246
4246
--- /dev/null
4247
 
+++ firefox-trunk-52.0~a1~hg20161001r316143/widget/gtk/nsNativeMenuDocListener.cpp
 
4247
+++ firefox-52.0~b9+build2/widget/gtk/nsNativeMenuDocListener.cpp
4248
4248
@@ -0,0 +1,370 @@
4249
4249
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
4250
4250
+/* vim:expandtab:shiftwidth=4:tabstop=4:
4616
4616
+    CancelFlush(this);
4617
4617
+    mPendingMutations.Clear();
4618
4618
+}
4619
 
Index: firefox-trunk-52.0~a1~hg20161001r316143/widget/gtk/nsNativeMenuDocListener.h
 
4619
Index: firefox-52.0~b9+build2/widget/gtk/nsNativeMenuDocListener.h
4620
4620
===================================================================
4621
4621
--- /dev/null
4622
 
+++ firefox-trunk-52.0~a1~hg20161001r316143/widget/gtk/nsNativeMenuDocListener.h
 
4622
+++ firefox-52.0~b9+build2/widget/gtk/nsNativeMenuDocListener.h
4623
4623
@@ -0,0 +1,153 @@
4624
4624
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
4625
4625
+/* vim:expandtab:shiftwidth=4:tabstop=4:
4774
4774
+};
4775
4775
+
4776
4776
+#endif /* __nsNativeMenuDocListener_h__ */
4777
 
Index: firefox-trunk-52.0~a1~hg20161001r316143/widget/gtk/nsNativeMenuService.cpp
 
4777
Index: firefox-52.0~b9+build2/widget/gtk/nsNativeMenuService.cpp
4778
4778
===================================================================
4779
4779
--- /dev/null
4780
 
+++ firefox-trunk-52.0~a1~hg20161001r316143/widget/gtk/nsNativeMenuService.cpp
 
4780
+++ firefox-52.0~b9+build2/widget/gtk/nsNativeMenuService.cpp
4781
4781
@@ -0,0 +1,506 @@
4782
4782
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
4783
4783
+/* vim:expandtab:shiftwidth=4:tabstop=4:
5285
5285
+
5286
5286
+    return NS_OK;
5287
5287
+}
5288
 
Index: firefox-trunk-52.0~a1~hg20161001r316143/widget/gtk/nsNativeMenuService.h
 
5288
Index: firefox-52.0~b9+build2/widget/gtk/nsNativeMenuService.h
5289
5289
===================================================================
5290
5290
--- /dev/null
5291
 
+++ firefox-trunk-52.0~a1~hg20161001r316143/widget/gtk/nsNativeMenuService.h
 
5291
+++ firefox-52.0~b9+build2/widget/gtk/nsNativeMenuService.h
5292
5292
@@ -0,0 +1,88 @@
5293
5293
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
5294
5294
+/* vim:expandtab:shiftwidth=4:tabstop=4:
5378
5378
+};
5379
5379
+
5380
5380
+#endif /* __nsNativeMenuService_h__ */
5381
 
Index: firefox-trunk-52.0~a1~hg20161001r316143/widget/gtk/nsNativeMenuUtils.h
 
5381
Index: firefox-52.0~b9+build2/widget/gtk/nsNativeMenuUtils.h
5382
5382
===================================================================
5383
5383
--- /dev/null
5384
 
+++ firefox-trunk-52.0~a1~hg20161001r316143/widget/gtk/nsNativeMenuUtils.h
 
5384
+++ firefox-52.0~b9+build2/widget/gtk/nsNativeMenuUtils.h
5385
5385
@@ -0,0 +1,59 @@
5386
5386
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
5387
5387
+/* vim:expandtab:shiftwidth=4:tabstop=4:
5442
5442
+};
5443
5443
+
5444
5444
+#endif /* __nsNativeMenuUtils_h__ */
5445
 
Index: firefox-trunk-52.0~a1~hg20161001r316143/widget/gtk/nsWidgetFactory.cpp
 
5445
Index: firefox-52.0~b9+build2/widget/gtk/nsWidgetFactory.cpp
5446
5446
===================================================================
5447
 
--- firefox-trunk-52.0~a1~hg20161001r316143.orig/widget/gtk/nsWidgetFactory.cpp
5448
 
+++ firefox-trunk-52.0~a1~hg20161001r316143/widget/gtk/nsWidgetFactory.cpp
5449
 
@@ -49,6 +49,9 @@
 
5447
--- firefox-52.0~b9+build2.orig/widget/gtk/nsWidgetFactory.cpp
 
5448
+++ firefox-52.0~b9+build2/widget/gtk/nsWidgetFactory.cpp
 
5449
@@ -49,6 +49,8 @@
5450
5450
 #include "GfxInfoX11.h"
5451
5451
 #endif
5452
5452
 
5453
5453
+#include "nsNativeMenuService.h"
5454
 
+#include "nsNativeMenuAtoms.h"
5455
5454
+
5456
5455
 #include "nsNativeThemeGTK.h"
5457
5456
 
5458
5457
 #include "nsIComponentRegistrar.h"
5459
 
@@ -121,6 +124,9 @@ NS_GENERIC_FACTORY_CONSTRUCTOR_INIT(GfxI
 
5458
@@ -121,6 +123,9 @@ NS_GENERIC_FACTORY_CONSTRUCTOR_INIT(GfxI
5460
5459
 }
5461
5460
 #endif
5462
5461
 
5466
5465
 #ifdef NS_PRINTING
5467
5466
 NS_GENERIC_FACTORY_CONSTRUCTOR(nsDeviceContextSpecGTK)
5468
5467
 NS_GENERIC_FACTORY_CONSTRUCTOR_INIT(nsPrintOptionsGTK, Init)
5469
 
@@ -223,6 +229,7 @@ NS_DEFINE_NAMED_CID(NS_IMAGE_TO_PIXBUF_C
 
5468
@@ -223,6 +228,7 @@ NS_DEFINE_NAMED_CID(NS_IMAGE_TO_PIXBUF_C
5470
5469
 NS_DEFINE_NAMED_CID(NS_IDLE_SERVICE_CID);
5471
5470
 NS_DEFINE_NAMED_CID(NS_GFXINFO_CID);
5472
5471
 #endif
5474
5473
 
5475
5474
 
5476
5475
 static const mozilla::Module::CIDEntry kWidgetCIDs[] = {
5477
 
@@ -258,6 +265,7 @@ static const mozilla::Module::CIDEntry k
 
5476
@@ -258,6 +264,7 @@ static const mozilla::Module::CIDEntry k
5478
5477
     { &kNS_IDLE_SERVICE_CID, false, nullptr, nsIdleServiceGTKConstructor },
5479
5478
     { &kNS_GFXINFO_CID, false, nullptr, mozilla::widget::GfxInfoConstructor },
5480
5479
 #endif
5482
5481
     { nullptr }
5483
5482
 };
5484
5483
 
5485
 
@@ -295,9 +303,19 @@ static const mozilla::Module::ContractID
 
5484
@@ -295,6 +302,7 @@ static const mozilla::Module::ContractID
5486
5485
     { "@mozilla.org/widget/idleservice;1", &kNS_IDLE_SERVICE_CID },
5487
5486
     { "@mozilla.org/gfx/info;1", &kNS_GFXINFO_CID },
5488
5487
 #endif
5490
5489
     { nullptr }
5491
5490
 };
5492
5491
 
5493
 
+static nsresult
5494
 
+nsWidgetGtk2ModuleCtor()
5495
 
+{
5496
 
+  nsAppShellInit();
5497
 
+  nsNativeMenuAtoms::Init();
5498
 
+
5499
 
+  return NS_OK;
5500
 
+}
5501
 
+
5502
 
 static void
5503
 
 nsWidgetGtk2ModuleDtor()
5504
 
 {
5505
 
@@ -323,7 +341,7 @@ static const mozilla::Module kWidgetModu
5506
 
     kWidgetContracts,
5507
 
     nullptr,
5508
 
     nullptr,
5509
 
-    nsAppShellInit,
5510
 
+    nsWidgetGtk2ModuleCtor,
5511
 
     nsWidgetGtk2ModuleDtor,
5512
 
     Module::ALLOW_IN_GPU_PROCESS
5513
 
 };
5514
 
Index: firefox-trunk-52.0~a1~hg20161001r316143/widget/gtk/nsWindow.cpp
 
5492
Index: firefox-52.0~b9+build2/widget/gtk/nsWindow.cpp
5515
5493
===================================================================
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
 
5494
--- firefox-52.0~b9+build2.orig/widget/gtk/nsWindow.cpp
 
5495
+++ firefox-52.0~b9+build2/widget/gtk/nsWindow.cpp
 
5496
@@ -5175,6 +5175,11 @@ nsWindow::HideWindowChrome(bool aShouldH
5519
5497
     return NS_OK;
5520
5498
 }
5521
5499
 
5527
5505
 bool
5528
5506
 nsWindow::CheckForRollup(gdouble aMouseX, gdouble aMouseY,
5529
5507
                          bool aIsWheel, bool aAlwaysRollup)
5530
 
Index: firefox-trunk-52.0~a1~hg20161001r316143/widget/gtk/nsWindow.h
 
5508
Index: firefox-52.0~b9+build2/widget/gtk/nsWindow.h
5531
5509
===================================================================
5532
 
--- firefox-trunk-52.0~a1~hg20161001r316143.orig/widget/gtk/nsWindow.h
5533
 
+++ firefox-trunk-52.0~a1~hg20161001r316143/widget/gtk/nsWindow.h
 
5510
--- firefox-52.0~b9+build2.orig/widget/gtk/nsWindow.h
 
5511
+++ firefox-52.0~b9+build2/widget/gtk/nsWindow.h
5534
5512
@@ -35,6 +35,8 @@
5535
5513
 
5536
5514
 #include "IMContextWrapper.h"
5549
5527
     /**
5550
5528
      * GetLastUserInputTime returns a timestamp for the most recent user input
5551
5529
      * event.  This is intended for pointer grab requests (including drags).
5552
 
@@ -565,6 +569,8 @@ private:
 
5530
@@ -569,6 +573,8 @@ private:
5553
5531
     RefPtr<mozilla::widget::IMContextWrapper> mIMContext;
5554
5532
 
5555
5533
     mozilla::UniquePtr<mozilla::CurrentX11TimeGetter> mCurrentTimeGetter;
5558
5536
 };
5559
5537
 
5560
5538
 class nsChildWindow : public nsWindow {
5561
 
Index: firefox-trunk-52.0~a1~hg20161001r316143/xpfe/appshell/nsWebShellWindow.cpp
 
5539
Index: firefox-52.0~b9+build2/xpfe/appshell/nsWebShellWindow.cpp
5562
5540
===================================================================
5563
 
--- firefox-trunk-52.0~a1~hg20161001r316143.orig/xpfe/appshell/nsWebShellWindow.cpp
5564
 
+++ firefox-trunk-52.0~a1~hg20161001r316143/xpfe/appshell/nsWebShellWindow.cpp
 
5541
--- firefox-52.0~b9+build2.orig/xpfe/appshell/nsWebShellWindow.cpp
 
5542
+++ firefox-52.0~b9+build2/xpfe/appshell/nsWebShellWindow.cpp
5565
5543
@@ -58,6 +58,7 @@
5566
5544
 #include "nsIScreen.h"
5567
5545
 
5579
5557
 #include "nsINativeMenuService.h"
5580
5558
 #define USE_NATIVE_MENUS
5581
5559
 #endif
5582
 
@@ -491,6 +492,11 @@ static void LoadNativeMenus(nsIDOMDocume
 
5560
@@ -498,6 +499,11 @@ static void LoadNativeMenus(nsIDOMDocume
5583
5561
 
5584
5562
   if (menubarNode) {
5585
5563
     nsCOMPtr<nsIContent> menubarContent(do_QueryInterface(menubarNode));
5591
5569
     nms->CreateNativeMenuBar(aParentWindow, menubarContent);
5592
5570
   } else {
5593
5571
     nms->CreateNativeMenuBar(aParentWindow, nullptr);
5594
 
Index: firefox-trunk-52.0~a1~hg20161001r316143/widget/gtk/moz.build
 
5572
Index: firefox-52.0~b9+build2/widget/gtk/moz.build
5595
5573
===================================================================
5596
 
--- firefox-trunk-52.0~a1~hg20161001r316143.orig/widget/gtk/moz.build
5597
 
+++ firefox-trunk-52.0~a1~hg20161001r316143/widget/gtk/moz.build
 
5574
--- firefox-52.0~b9+build2.orig/widget/gtk/moz.build
 
5575
+++ firefox-52.0~b9+build2/widget/gtk/moz.build
5598
5576
@@ -24,10 +24,18 @@ UNIFIED_SOURCES += [
5599
5577
     'nsAppShell.cpp',
5600
5578
     'nsBidiKeyboard.cpp',
5631
5609
     '/layout/xul',
5632
5610
     '/other-licenses/atk-1.0',
5633
5611
     '/widget',
5634
 
Index: firefox-trunk-52.0~a1~hg20161001r316143/browser/base/content/browser.js
 
5612
Index: firefox-52.0~b9+build2/browser/base/content/browser.js
5635
5613
===================================================================
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() {
 
5614
--- firefox-52.0~b9+build2.orig/browser/base/content/browser.js
 
5615
+++ firefox-52.0~b9+build2/browser/base/content/browser.js
 
5616
@@ -5079,6 +5079,8 @@ function getTogglableToolbars() {
5639
5617
   let toolbarNodes = Array.slice(gNavToolbox.childNodes);
5640
5618
   toolbarNodes = toolbarNodes.concat(gNavToolbox.externalToolbars);
5641
5619
   toolbarNodes = toolbarNodes.filter(node => node.getAttribute("toolbarname"));
5644
5622
   return toolbarNodes;
5645
5623
 }
5646
5624
 
5647
 
Index: firefox-trunk-52.0~a1~hg20161001r316143/widget/moz.build
 
5625
Index: firefox-52.0~b9+build2/widget/moz.build
5648
5626
===================================================================
5649
 
--- firefox-trunk-52.0~a1~hg20161001r316143.orig/widget/moz.build
5650
 
+++ firefox-trunk-52.0~a1~hg20161001r316143/widget/moz.build
 
5627
--- firefox-52.0~b9+build2.orig/widget/moz.build
 
5628
+++ firefox-52.0~b9+build2/widget/moz.build
5651
5629
@@ -37,10 +37,12 @@ elif toolkit == 'cocoa':
5652
5630
         'nsITaskbarProgress.idl',
5653
5631
     ]
5662
5640
 TEST_DIRS += ['tests']
5663
5641
 
5664
5642
 # Don't build the DSO under the 'build' directory as windows does.
5665
 
Index: firefox-trunk-52.0~a1~hg20161001r316143/modules/libpref/init/all.js
 
5643
Index: firefox-52.0~b9+build2/modules/libpref/init/all.js
5666
5644
===================================================================
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
5669
 
@@ -221,6 +221,9 @@ pref("dom.compartment_per_addon", true);
 
5645
--- firefox-52.0~b9+build2.orig/modules/libpref/init/all.js
 
5646
+++ firefox-52.0~b9+build2/modules/libpref/init/all.js
 
5647
@@ -229,6 +229,9 @@ pref("dom.compartment_per_addon", true);
5670
5648
 pref("browser.sessionhistory.max_total_viewers", -1);
5671
5649
 
5672
5650
 pref("ui.use_native_colors", true);
5676
5654
 pref("ui.click_hold_context_menus", false);
5677
5655
 // Duration of timeout of incremental search in menus (ms).  0 means infinite.
5678
5656
 pref("ui.menu.incremental_search.timeout", 1000);
5679
 
Index: firefox-trunk-52.0~a1~hg20161001r316143/widget/gtk/nsScreenGtk.cpp
 
5657
Index: firefox-52.0~b9+build2/widget/gtk/nsScreenGtk.cpp
5680
5658
===================================================================
5681
 
--- firefox-trunk-52.0~a1~hg20161001r316143.orig/widget/gtk/nsScreenGtk.cpp
5682
 
+++ firefox-trunk-52.0~a1~hg20161001r316143/widget/gtk/nsScreenGtk.cpp
 
5659
--- firefox-52.0~b9+build2.orig/widget/gtk/nsScreenGtk.cpp
 
5660
+++ firefox-52.0~b9+build2/widget/gtk/nsScreenGtk.cpp
5683
5661
@@ -15,6 +15,7 @@
5684
5662
 #include <gtk/gtk.h>
5685
5663
 #include <dlfcn.h>
5688
5666
 
5689
5667
 static uint32_t sScreenId = 0;
5690
5668
 
 
5669
Index: firefox-52.0~b9+build2/layout/build/moz.build
 
5670
===================================================================
 
5671
--- firefox-52.0~b9+build2.orig/layout/build/moz.build
 
5672
+++ firefox-52.0~b9+build2/layout/build/moz.build
 
5673
@@ -77,6 +77,10 @@ elif CONFIG['MOZ_WIDGET_TOOLKIT'] == 'go
 
5674
     LOCAL_INCLUDES += [
 
5675
         '/dom/system/gonk',
 
5676
     ]
 
5677
+elif 'gtk' in CONFIG['MOZ_WIDGET_TOOLKIT']:
 
5678
+    LOCAL_INCLUDES += [
 
5679
+        '/widget/gtk',
 
5680
+    ]
 
5681
 
 
5682
 if CONFIG['MOZ_WEBSPEECH']:
 
5683
     LOCAL_INCLUDES += [
 
5684
Index: firefox-52.0~b9+build2/layout/build/nsLayoutStatics.cpp
 
5685
===================================================================
 
5686
--- firefox-52.0~b9+build2.orig/layout/build/nsLayoutStatics.cpp
 
5687
+++ firefox-52.0~b9+build2/layout/build/nsLayoutStatics.cpp
 
5688
@@ -132,6 +132,10 @@ using namespace mozilla::system;
 
5689
 #include "mozilla/StaticPresData.h"
 
5690
 #include "mozilla/dom/WebIDLGlobalNameHash.h"
 
5691
 
 
5692
+#ifdef MOZ_WIDGET_GTK
 
5693
+#include "nsNativeMenuAtoms.h"
 
5694
+#endif
 
5695
+
 
5696
 using namespace mozilla;
 
5697
 using namespace mozilla::net;
 
5698
 using namespace mozilla::dom;
 
5699
@@ -166,6 +170,9 @@ nsLayoutStatics::Initialize()
 
5700
   nsTextServicesDocument::RegisterAtoms();
 
5701
   nsHTMLTags::RegisterAtoms();
 
5702
   nsRDFAtoms::RegisterAtoms();
 
5703
+#ifdef MOZ_WIDGET_GTK
 
5704
+  nsNativeMenuAtoms::RegisterAtoms();
 
5705
+#endif
 
5706
 
 
5707
   NS_SealStaticAtomTable();
 
5708