← Back to branch summary

~jbicha/firefox/update-dependencies

« back to all changes in this revision

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

  • Committer: Rico Tzschichholz
  • Date: 2017-10-10 13:25:09 UTC
  • Revision ID: ricotz@ubuntu.com-20171010132509-f3ec1g57jwgs9g8e
* New upstream release from the beta channel (FIREFOX_57_0b7_BUILD1)
* Install watermark.svg from the onbording extension as symbolic icon
  - debian/firefox.install.in

Show diffs side-by-side

added added

removed removed

Lines of Context:
debian/patches/unity-menubar.patch
 
1
diff --git a/browser/base/content/browser-menubar.inc b/browser/base/content/browser-menubar.inc
1
2
--- a/browser/base/content/browser-menubar.inc
2
3
+++ b/browser/base/content/browser-menubar.inc
3
4
@@ -5,7 +5,11 @@
12
13
                                   this.setAttribute('openedwithkey',
13
14
                                                     event.target.parentNode.openedWithKey);"
14
15
                 style="border:0px;padding:0px;margin:0px;-moz-appearance:none">
 
16
diff --git a/browser/base/content/browser.js b/browser/base/content/browser.js
15
17
--- a/browser/base/content/browser.js
16
18
+++ b/browser/base/content/browser.js
17
 
@@ -5427,6 +5427,8 @@
 
19
@@ -5401,6 +5401,8 @@ function getTogglableToolbars() {
18
20
   let toolbarNodes = Array.slice(gNavToolbox.childNodes);
19
21
   toolbarNodes = toolbarNodes.concat(gNavToolbox.externalToolbars);
20
22
   toolbarNodes = toolbarNodes.filter(node => node.getAttribute("toolbarname"));
23
25
   return toolbarNodes;
24
26
 }
25
27
 
 
28
diff --git a/browser/components/places/content/places.xul b/browser/components/places/content/places.xul
26
29
--- a/browser/components/places/content/places.xul
27
30
+++ b/browser/components/places/content/places.xul
28
 
@@ -158,7 +158,7 @@
 
31
@@ -155,7 +155,7 @@
29
32
         <toolbarbutton type="menu" class="tabbable"
30
33
               onpopupshowing="document.getElementById('placeContent').focus()"
31
34
 #else
34
37
         <menu accesskey="&organize.accesskey;" class="menu-iconic"
35
38
 #endif
36
39
               id="organizeButton" label="&organize.label;"
 
40
diff --git a/layout/build/moz.build b/layout/build/moz.build
37
41
--- a/layout/build/moz.build
38
42
+++ b/layout/build/moz.build
39
 
@@ -74,6 +74,10 @@
 
43
@@ -74,6 +74,10 @@ elif CONFIG['MOZ_WIDGET_TOOLKIT'] == 'an
40
44
         '/dom/system',
41
45
         '/dom/system/android',
42
46
     ]
47
51
 
48
52
 if CONFIG['MOZ_WEBSPEECH']:
49
53
     LOCAL_INCLUDES += [
 
54
diff --git a/layout/build/nsLayoutStatics.cpp b/layout/build/nsLayoutStatics.cpp
50
55
--- a/layout/build/nsLayoutStatics.cpp
51
56
+++ b/layout/build/nsLayoutStatics.cpp
52
57
@@ -126,6 +126,10 @@
 
58
 #include "mozilla/dom/ipc/IPCBlobInputStreamStorage.h"
53
59
 #include "mozilla/dom/U2FTokenManager.h"
54
 
 #include "mozilla/dom/PointerEventHandler.h"
55
60
 
56
61
+#ifdef MOZ_WIDGET_GTK
57
62
+#include "nsNativeMenuAtoms.h"
60
65
 using namespace mozilla;
61
66
 using namespace mozilla::net;
62
67
 using namespace mozilla::dom;
63
 
@@ -158,6 +162,9 @@
 
68
@@ -158,6 +162,9 @@ nsLayoutStatics::Initialize()
64
69
   nsTextServicesDocument::RegisterAtoms();
65
70
   nsHTMLTags::RegisterAtoms();
66
71
   nsRDFAtoms::RegisterAtoms();
70
75
 
71
76
   NS_SealStaticAtomTable();
72
77
 
 
78
diff --git a/modules/libpref/init/all.js b/modules/libpref/init/all.js
73
79
--- a/modules/libpref/init/all.js
74
80
+++ b/modules/libpref/init/all.js
75
 
@@ -230,6 +230,9 @@
 
81
@@ -242,6 +242,9 @@ pref("dom.script_loader.bytecode_cache.s
76
82
 pref("browser.sessionhistory.max_total_viewers", -1);
77
83
 
78
84
 pref("ui.use_native_colors", true);
82
88
 pref("ui.click_hold_context_menus", false);
83
89
 // Duration of timeout of incremental search in menus (ms).  0 means infinite.
84
90
 pref("ui.menu.incremental_search.timeout", 1000);
 
91
diff --git a/toolkit/content/widgets/popup.xml b/toolkit/content/widgets/popup.xml
85
92
--- a/toolkit/content/widgets/popup.xml
86
93
+++ b/toolkit/content/widgets/popup.xml
87
94
@@ -27,8 +27,14 @@
101
108
 
102
109
       <property name="triggerNode" readonly="true"
103
110
                 onget="return this.popupBoxObject.triggerNode"/>
 
111
diff --git a/toolkit/content/xul.css b/toolkit/content/xul.css
104
112
--- a/toolkit/content/xul.css
105
113
+++ b/toolkit/content/xul.css
106
 
@@ -319,6 +319,18 @@
 
114
@@ -319,6 +319,18 @@ toolbar[type="menubar"][autohide="true"]
107
115
 }
108
116
 %endif
109
117
 
122
130
 toolbarseparator {
123
131
   -moz-binding: url("chrome://global/content/bindings/toolbar.xml#toolbardecoration");
124
132
 }
 
133
diff --git a/widget/gtk/moz.build b/widget/gtk/moz.build
125
134
--- a/widget/gtk/moz.build
126
135
+++ b/widget/gtk/moz.build
127
 
@@ -33,10 +33,18 @@
 
136
@@ -33,10 +33,18 @@ UNIFIED_SOURCES += [
128
137
     'nsAppShell.cpp',
129
138
     'nsBidiKeyboard.cpp',
130
139
     'nsColorPicker.cpp',
143
152
     'nsNativeThemeGTK.cpp',
144
153
     'nsSound.cpp',
145
154
     'nsToolkit.cpp',
146
 
@@ -48,6 +56,8 @@
 
155
@@ -48,6 +56,8 @@ UNIFIED_SOURCES += [
147
156
 ]
148
157
 
149
158
 SOURCES += [
152
161
     'nsWindow.cpp', # conflicts with X11 headers
153
162
 ]
154
163
 
155
 
@@ -112,6 +122,7 @@
 
164
@@ -112,6 +122,7 @@ FINAL_LIBRARY = 'xul'
156
165
 
157
166
 LOCAL_INCLUDES += [
158
167
     '/layout/generic',
160
169
     '/layout/xul',
161
170
     '/other-licenses/atk-1.0',
162
171
     '/widget',
 
172
diff --git a/widget/gtk/nsDbusmenu.cpp b/widget/gtk/nsDbusmenu.cpp
 
173
new file mode 100644
163
174
--- /dev/null
164
175
+++ b/widget/gtk/nsDbusmenu.cpp
165
176
@@ -0,0 +1,63 @@
226
237
+
227
238
+    return NS_OK;
228
239
+}
 
240
diff --git a/widget/gtk/nsDbusmenu.h b/widget/gtk/nsDbusmenu.h
 
241
new file mode 100644
229
242
--- /dev/null
230
243
+++ b/widget/gtk/nsDbusmenu.h
231
244
@@ -0,0 +1,101 @@
330
343
+#define dbusmenu_menuitem_property_set_shortcut nsDbusmenuFunctions::s_dbusmenu_menuitem_property_set_shortcut
331
344
+
332
345
+#endif /* __nsDbusmenu_h__ */
 
346
diff --git a/widget/gtk/nsMenu.cpp b/widget/gtk/nsMenu.cpp
 
347
new file mode 100644
333
348
--- /dev/null
334
349
+++ b/widget/gtk/nsMenu.cpp
335
 
@@ -0,0 +1,852 @@
 
350
@@ -0,0 +1,858 @@
336
351
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
337
352
+/* vim:expandtab:shiftwidth=4:tabstop=4:
338
353
+ */
350
365
+#include "mozilla/MouseEvents.h"
351
366
+#include "mozilla/Move.h"
352
367
+#include "mozilla/ServoStyleContext.h"
 
368
+#include "mozilla/ServoStyleSet.h"
353
369
+#include "mozilla/ServoTypes.h"
354
 
+#include "mozilla/StyleSetHandle.h"
355
370
+#include "mozilla/StyleSetHandleInlines.h"
356
371
+#include "nsAutoPtr.h"
357
372
+#include "nsBindingManager.h"
369
384
+#include "nsString.h"
370
385
+#include "nsStyleContext.h"
371
386
+#include "nsStyleContextInlines.h"
 
387
+#include "nsStyleSet.h"
372
388
+#include "nsStyleStruct.h"
373
389
+#include "nsThreadUtils.h"
374
390
+#include "nsXBLBinding.h"
465
481
+        return;
466
482
+    }
467
483
+
468
 
+    RefPtr<nsStyleContext> sc =
469
 
+        shell->StyleSet()->ResolveStyleFor(aContent->AsElement(),
470
 
+                                           nullptr,
471
 
+                                           LazyComputeBehavior::Allow);
 
484
+    RefPtr<nsStyleContext> sc;
 
485
+    if (shell->StyleSet()->IsGecko()) {
 
486
+        sc = shell->StyleSet()->AsGecko()->ResolveStyleFor(aContent->AsElement(),
 
487
+                                                           nullptr);
 
488
+    } else {
 
489
+        sc = shell->StyleSet()->AsServo()->ResolveStyleFor(aContent->AsElement(),
 
490
+                                                           nullptr,
 
491
+                                                           LazyComputeBehavior::Allow);
 
492
+    }
472
493
+
473
494
+    if (!sc) {
474
495
+        return;
684
705
+        nsIContent *child = ContentNode()->GetChildAt(i);
685
706
+
686
707
+        int32_t dummy;
687
 
+        nsIAtom* tag = child->OwnerDoc()->BindingManager()->ResolveTag(child, &dummy);
 
708
+        nsCOMPtr<nsIAtom> tag = child->OwnerDoc()->BindingManager()->ResolveTag(child, &dummy);
688
709
+        if (tag == nsGkAtoms::menupopup) {
689
710
+            mPopupContent = child;
690
711
+            break;
1185
1206
+    ContentNode()->UnsetAttr(kNameSpaceID_None, nsGkAtoms::open, true);
1186
1207
+}
1187
1208
+
 
1209
diff --git a/widget/gtk/nsMenu.h b/widget/gtk/nsMenu.h
 
1210
new file mode 100644
1188
1211
--- /dev/null
1189
1212
+++ b/widget/gtk/nsMenu.h
1190
1213
@@ -0,0 +1,124 @@
1312
1335
+};
1313
1336
+
1314
1337
+#endif /* __nsMenu_h__ */
 
1338
diff --git a/widget/gtk/nsMenuBar.cpp b/widget/gtk/nsMenuBar.cpp
 
1339
new file mode 100644
1315
1340
--- /dev/null
1316
1341
+++ b/widget/gtk/nsMenuBar.cpp
1317
1342
@@ -0,0 +1,576 @@
1891
1916
+    DocListener()->Stop();
1892
1917
+    DisconnectDocumentEventListeners();
1893
1918
+}
 
1919
diff --git a/widget/gtk/nsMenuBar.h b/widget/gtk/nsMenuBar.h
 
1920
new file mode 100644
1894
1921
--- /dev/null
1895
1922
+++ b/widget/gtk/nsMenuBar.h
1896
1923
@@ -0,0 +1,107 @@
2001
2028
+};
2002
2029
+
2003
2030
+#endif /* __nsMenuBar_h__ */
 
2031
diff --git a/widget/gtk/nsMenuContainer.cpp b/widget/gtk/nsMenuContainer.cpp
 
2032
new file mode 100644
2004
2033
--- /dev/null
2005
2034
+++ b/widget/gtk/nsMenuContainer.cpp
2006
2035
@@ -0,0 +1,172 @@
2176
2205
+
2177
2206
+    return aContent;
2178
2207
+}
 
2208
diff --git a/widget/gtk/nsMenuContainer.h b/widget/gtk/nsMenuContainer.h
 
2209
new file mode 100644
2179
2210
--- /dev/null
2180
2211
+++ b/widget/gtk/nsMenuContainer.h
2181
2212
@@ -0,0 +1,70 @@
2249
2280
+};
2250
2281
+
2251
2282
+#endif /* __nsMenuContainer_h__ */
 
2283
diff --git a/widget/gtk/nsMenuItem.cpp b/widget/gtk/nsMenuItem.cpp
 
2284
new file mode 100644
2252
2285
--- /dev/null
2253
2286
+++ b/widget/gtk/nsMenuItem.cpp
2254
2287
@@ -0,0 +1,737 @@
2989
3022
+{
2990
3023
+    return eType_MenuItem;
2991
3024
+}
 
3025
diff --git a/widget/gtk/nsMenuItem.h b/widget/gtk/nsMenuItem.h
 
3026
new file mode 100644
2992
3027
--- /dev/null
2993
3028
+++ b/widget/gtk/nsMenuItem.h
2994
3029
@@ -0,0 +1,81 @@
3073
3108
+};
3074
3109
+
3075
3110
+#endif /* __nsMenuItem_h__ */
 
3111
diff --git a/widget/gtk/nsMenuObject.cpp b/widget/gtk/nsMenuObject.cpp
 
3112
new file mode 100644
3076
3113
--- /dev/null
3077
3114
+++ b/widget/gtk/nsMenuObject.cpp
3078
3115
@@ -0,0 +1,666 @@
3319
3356
+        }
3320
3357
+
3321
3358
+        loader->LoadImage(uri, nullptr, nullptr, mozilla::net::RP_Unset,
3322
 
+                          nullptr, 0, loadGroup, this, nullptr, nullptr,
 
3359
+                          nullptr, loadGroup, this, nullptr, nullptr,
3323
3360
+                          nsIRequest::LOAD_NORMAL, nullptr,
3324
3361
+                          nsIContentPolicy::TYPE_IMAGE, EmptyString(),
3325
3362
+                          false, getter_AddRefs(mImageRequest));
3742
3779
+        weak = weak->mPrev;
3743
3780
+    }
3744
3781
+}
 
3782
diff --git a/widget/gtk/nsMenuObject.h b/widget/gtk/nsMenuObject.h
 
3783
new file mode 100644
3745
3784
--- /dev/null
3746
3785
+++ b/widget/gtk/nsMenuObject.h
3747
3786
@@ -0,0 +1,170 @@
3915
3954
+};
3916
3955
+
3917
3956
+#endif /* __nsMenuObject_h__ */
 
3957
diff --git a/widget/gtk/nsMenuSeparator.cpp b/widget/gtk/nsMenuSeparator.cpp
 
3958
new file mode 100644
3918
3959
--- /dev/null
3919
3960
+++ b/widget/gtk/nsMenuSeparator.cpp
3920
3961
@@ -0,0 +1,85 @@
4003
4044
+{
4004
4045
+    return eType_MenuItem;
4005
4046
+}
 
4047
diff --git a/widget/gtk/nsMenuSeparator.h b/widget/gtk/nsMenuSeparator.h
 
4048
new file mode 100644
4006
4049
--- /dev/null
4007
4050
+++ b/widget/gtk/nsMenuSeparator.h
4008
4051
@@ -0,0 +1,37 @@
4043
4086
+};
4044
4087
+
4045
4088
+#endif /* __nsMenuSeparator_h__ */
 
4089
diff --git a/widget/gtk/nsNativeMenuAtomList.h b/widget/gtk/nsNativeMenuAtomList.h
 
4090
new file mode 100644
4046
4091
--- /dev/null
4047
4092
+++ b/widget/gtk/nsNativeMenuAtomList.h
4048
4093
@@ -0,0 +1,12 @@
4058
4103
+WIDGET_ATOM2(_moz_nativemenupopupstate, "_moz-nativemenupopupstate")
4059
4104
+WIDGET_ATOM(openedwithkey)
4060
4105
+WIDGET_ATOM(shellshowingmenubar)
 
4106
diff --git a/widget/gtk/nsNativeMenuAtoms.cpp b/widget/gtk/nsNativeMenuAtoms.cpp
 
4107
new file mode 100644
4061
4108
--- /dev/null
4062
4109
+++ b/widget/gtk/nsNativeMenuAtoms.cpp
4063
4110
@@ -0,0 +1,39 @@
4100
4147
+{
4101
4148
+    NS_RegisterStaticAtoms(gAtoms);
4102
4149
+}
 
4150
diff --git a/widget/gtk/nsNativeMenuAtoms.h b/widget/gtk/nsNativeMenuAtoms.h
 
4151
new file mode 100644
4103
4152
--- /dev/null
4104
4153
+++ b/widget/gtk/nsNativeMenuAtoms.h
4105
4154
@@ -0,0 +1,27 @@
4130
4179
+};
4131
4180
+
4132
4181
+#endif /* __nsNativeMenuAtoms_h__ */
 
4182
diff --git a/widget/gtk/nsNativeMenuDocListener.cpp b/widget/gtk/nsNativeMenuDocListener.cpp
 
4183
new file mode 100644
4133
4184
--- /dev/null
4134
4185
+++ b/widget/gtk/nsNativeMenuDocListener.cpp
4135
4186
@@ -0,0 +1,350 @@
4483
4534
+    CancelFlush(this);
4484
4535
+    mPendingMutations.Clear();
4485
4536
+}
 
4537
diff --git a/widget/gtk/nsNativeMenuDocListener.h b/widget/gtk/nsNativeMenuDocListener.h
 
4538
new file mode 100644
4486
4539
--- /dev/null
4487
4540
+++ b/widget/gtk/nsNativeMenuDocListener.h
4488
4541
@@ -0,0 +1,152 @@
4575
4628
+        nsCOMPtr<nsIContent> mTarget;
4576
4629
+        nsCOMPtr<nsIContent> mChild;
4577
4630
+        nsCOMPtr<nsIContent> mPrevSibling;
4578
 
+        RefPtr<nsIAtom> mAttribute;
 
4631
+        nsCOMPtr<nsIAtom> mAttribute;
4579
4632
+    };
4580
4633
+
4581
4634
+    ~nsNativeMenuDocListener();
4638
4691
+};
4639
4692
+
4640
4693
+#endif /* __nsNativeMenuDocListener_h__ */
 
4694
diff --git a/widget/gtk/nsNativeMenuService.cpp b/widget/gtk/nsNativeMenuService.cpp
 
4695
new file mode 100644
4641
4696
--- /dev/null
4642
4697
+++ b/widget/gtk/nsNativeMenuService.cpp
4643
4698
@@ -0,0 +1,508 @@
5149
5204
+        g_object_unref(cancellable);
5150
5205
+    }
5151
5206
+}
 
5207
diff --git a/widget/gtk/nsNativeMenuService.h b/widget/gtk/nsNativeMenuService.h
 
5208
new file mode 100644
5152
5209
--- /dev/null
5153
5210
+++ b/widget/gtk/nsNativeMenuService.h
5154
5211
@@ -0,0 +1,84 @@
5236
5293
+};
5237
5294
+
5238
5295
+#endif /* __nsNativeMenuService_h__ */
 
5296
diff --git a/widget/gtk/nsNativeThemeGTK.cpp b/widget/gtk/nsNativeThemeGTK.cpp
5239
5297
--- a/widget/gtk/nsNativeThemeGTK.cpp
5240
5298
+++ b/widget/gtk/nsNativeThemeGTK.cpp
5241
5299
@@ -51,6 +51,7 @@
5246
5304
 
5247
5305
 NS_IMPL_ISUPPORTS_INHERITED(nsNativeThemeGTK, nsNativeTheme, nsITheme,
5248
5306
                                                              nsIObserver)
 
5307
diff --git a/widget/gtk/nsWidgetFactory.cpp b/widget/gtk/nsWidgetFactory.cpp
5249
5308
--- a/widget/gtk/nsWidgetFactory.cpp
5250
5309
+++ b/widget/gtk/nsWidgetFactory.cpp
5251
 
@@ -49,6 +49,8 @@
 
5310
@@ -48,6 +48,8 @@
5252
5311
 #include "GfxInfoX11.h"
5253
5312
 #endif
5254
5313
 
5257
5316
 #include "nsNativeThemeGTK.h"
5258
5317
 
5259
5318
 #include "nsIComponentRegistrar.h"
5260
 
@@ -123,6 +125,9 @@
 
5319
@@ -123,6 +125,9 @@ NS_GENERIC_FACTORY_CONSTRUCTOR_INIT(GfxI
5261
5320
 }
5262
5321
 #endif
5263
5322
 
5267
5326
 #ifdef NS_PRINTING
5268
5327
 NS_GENERIC_FACTORY_CONSTRUCTOR(nsDeviceContextSpecGTK)
5269
5328
 NS_GENERIC_FACTORY_CONSTRUCTOR_INIT(nsPrintOptionsGTK, Init)
5270
 
@@ -247,6 +252,7 @@
 
5329
@@ -225,6 +230,7 @@ NS_DEFINE_NAMED_CID(NS_IMAGE_TO_PIXBUF_C
5271
5330
 NS_DEFINE_NAMED_CID(NS_IDLE_SERVICE_CID);
5272
5331
 NS_DEFINE_NAMED_CID(NS_GFXINFO_CID);
5273
5332
 #endif
5275
5334
 
5276
5335
 
5277
5336
 static const mozilla::Module::CIDEntry kWidgetCIDs[] = {
5278
 
@@ -282,6 +288,7 @@
 
5337
@@ -260,6 +266,7 @@ static const mozilla::Module::CIDEntry k
5279
5338
     { &kNS_IDLE_SERVICE_CID, false, nullptr, nsIdleServiceGTKConstructor },
5280
5339
     { &kNS_GFXINFO_CID, false, nullptr, mozilla::widget::GfxInfoConstructor },
5281
5340
 #endif
5283
5342
     { nullptr }
5284
5343
 };
5285
5344
 
5286
 
@@ -319,6 +326,7 @@
 
5345
@@ -297,6 +304,7 @@ static const mozilla::Module::ContractID
5287
5346
     { "@mozilla.org/widget/idleservice;1", &kNS_IDLE_SERVICE_CID },
5288
5347
     { "@mozilla.org/gfx/info;1", &kNS_GFXINFO_CID },
5289
5348
 #endif
5291
5350
     { nullptr }
5292
5351
 };
5293
5352
 
 
5353
diff --git a/widget/gtk/nsWindow.cpp b/widget/gtk/nsWindow.cpp
5294
5354
--- a/widget/gtk/nsWindow.cpp
5295
5355
+++ b/widget/gtk/nsWindow.cpp
5296
5356
@@ -72,6 +72,7 @@
5301
5361
 #include "mozilla/Preferences.h"
5302
5362
 #include "nsIPrefService.h"
5303
5363
 #include "nsIGConfService.h"
5304
 
@@ -5091,6 +5092,11 @@
 
5364
@@ -5092,6 +5093,11 @@ nsWindow::HideWindowChrome(bool aShouldH
5305
5365
 #endif /* MOZ_X11 */
5306
5366
 }
5307
5367
 
5313
5373
 bool
5314
5374
 nsWindow::CheckForRollup(gdouble aMouseX, gdouble aMouseY,
5315
5375
                          bool aIsWheel, bool aAlwaysRollup)
 
5376
diff --git a/widget/gtk/nsWindow.h b/widget/gtk/nsWindow.h
5316
5377
--- a/widget/gtk/nsWindow.h
5317
5378
+++ b/widget/gtk/nsWindow.h
5318
 
@@ -36,6 +36,8 @@
 
5379
@@ -35,6 +35,8 @@
5319
5380
 
5320
5381
 #include "IMContextWrapper.h"
5321
5382
 
5324
5385
 #undef LOG
5325
5386
 #ifdef MOZ_LOGGING
5326
5387
 
5327
 
@@ -159,6 +161,8 @@
 
5388
@@ -157,6 +159,8 @@ public:
5328
5389
                                       nsIScreen* aTargetScreen = nullptr) override;
5329
5390
     virtual void       HideWindowChrome(bool aShouldHide) override;
5330
5391
 
5333
5394
     /**
5334
5395
      * GetLastUserInputTime returns a timestamp for the most recent user input
5335
5396
      * event.  This is intended for pointer grab requests (including drags).
5336
 
@@ -567,6 +571,8 @@
 
5397
@@ -561,6 +565,8 @@ private:
5337
5398
     RefPtr<mozilla::widget::IMContextWrapper> mIMContext;
5338
5399
 
5339
5400
     mozilla::UniquePtr<mozilla::CurrentX11TimeGetter> mCurrentTimeGetter;
5342
5403
 };
5343
5404
 
5344
5405
 #endif /* __nsWindow_h__ */
 
5406
diff --git a/widget/moz.build b/widget/moz.build
5345
5407
--- a/widget/moz.build
5346
5408
+++ b/widget/moz.build
5347
 
@@ -66,9 +66,9 @@
 
5409
@@ -63,9 +63,9 @@ elif toolkit == 'cocoa':
5348
5410
         'nsISystemStatusBar.idl',
5349
5411
         'nsITaskbarProgress.idl',
5350
5412
     ]
5357
5419
 
5358
5420
 TEST_DIRS += ['tests']
5359
5421
 
 
5422
diff --git a/xpfe/appshell/nsWebShellWindow.cpp b/xpfe/appshell/nsWebShellWindow.cpp
5360
5423
--- a/xpfe/appshell/nsWebShellWindow.cpp
5361
5424
+++ b/xpfe/appshell/nsWebShellWindow.cpp
5362
 
@@ -75,7 +75,7 @@
 
5425
@@ -74,7 +74,7 @@
5363
5426
 
5364
5427
 #include "gfxPlatform.h"
5365
5428