~mozillateam/firefox/firefox.utopic : revision 1109

1

Index: firefox-trunk-38.0~a1~hg20150223r230246/browser/base/content/browser-menubar.inc

1

Index: firefox-39.0~a2~hg20150402r254824/browser/base/content/browser-menubar.inc

2

===================================================================

3

--- firefox-trunk-38.0~a1~hg20150223r230246.orig/browser/base/content/browser-menubar.inc 2015-02-23 11:00:06.339486664 +0000

4

+++ firefox-trunk-38.0~a1~hg20150223r230246/browser/base/content/browser-menubar.inc 2015-02-23 11:00:06.327486661 +0000

3

--- firefox-39.0~a2~hg20150402r254824.orig/browser/base/content/browser-menubar.inc 2015-04-03 14:18:30.318256364 +0100

4

+++ firefox-39.0~a2~hg20150402r254824/browser/base/content/browser-menubar.inc 2015-04-03 14:18:30.302256357 +0100

5

@@ -5,7 +5,11 @@

6

7

<menubar id="main-menubar"

14

this.setAttribute('openedwithkey',

15

event.target.parentNode.openedWithKey);"

16

style="border:0px;padding:0px;margin:0px;-moz-appearance:none">

17

Index: firefox-trunk-38.0~a1~hg20150223r230246/browser/components/places/content/places.xul

17

Index: firefox-39.0~a2~hg20150402r254824/browser/components/places/content/places.xul

18

===================================================================

19

--- firefox-trunk-38.0~a1~hg20150223r230246.orig/browser/components/places/content/places.xul 2015-02-23 11:00:06.339486664 +0000

20

+++ firefox-trunk-38.0~a1~hg20150223r230246/browser/components/places/content/places.xul 2015-02-23 11:00:06.327486661 +0000

19

--- firefox-39.0~a2~hg20150402r254824.orig/browser/components/places/content/places.xul 2015-04-03 14:18:30.318256364 +0100

20

+++ firefox-39.0~a2~hg20150402r254824/browser/components/places/content/places.xul 2015-04-03 14:18:30.302256357 +0100

21

@@ -157,7 +157,7 @@

22

<toolbarbutton type="menu" class="tabbable"

23

onpopupshowing="document.getElementById('placeContent').focus()"

27

<menu accesskey="&organize.accesskey;" class="menu-iconic"

28

#endif

29

id="organizeButton" label="&organize.label;"

30

Index: firefox-trunk-38.0~a1~hg20150223r230246/toolkit/content/widgets/popup.xml

30

Index: firefox-39.0~a2~hg20150402r254824/toolkit/content/widgets/popup.xml

31

===================================================================

32

--- firefox-trunk-38.0~a1~hg20150223r230246.orig/toolkit/content/widgets/popup.xml 2015-02-23 11:00:06.339486664 +0000

33

+++ firefox-trunk-38.0~a1~hg20150223r230246/toolkit/content/widgets/popup.xml 2015-02-23 11:00:06.327486661 +0000

32

--- firefox-39.0~a2~hg20150402r254824.orig/toolkit/content/widgets/popup.xml 2015-04-03 14:18:30.318256364 +0100

33

+++ firefox-39.0~a2~hg20150402r254824/toolkit/content/widgets/popup.xml 2015-04-03 14:18:30.302256357 +0100

34

@@ -25,8 +25,14 @@

35

</getter>

36

</property>

48

49

<property name="triggerNode" readonly="true"

50

onget="return this.popupBoxObject.triggerNode"/>

51

Index: firefox-trunk-38.0~a1~hg20150223r230246/toolkit/content/xul.css

51

Index: firefox-39.0~a2~hg20150402r254824/toolkit/content/xul.css

52

===================================================================

53

--- firefox-trunk-38.0~a1~hg20150223r230246.orig/toolkit/content/xul.css 2015-02-23 11:00:06.339486664 +0000

54

+++ firefox-trunk-38.0~a1~hg20150223r230246/toolkit/content/xul.css 2015-02-23 11:00:06.327486661 +0000

55

@@ -306,6 +306,18 @@

53

--- firefox-39.0~a2~hg20150402r254824.orig/toolkit/content/xul.css 2015-04-03 14:18:30.318256364 +0100

54

+++ firefox-39.0~a2~hg20150402r254824/toolkit/content/xul.css 2015-04-03 14:18:30.302256357 +0100

55

@@ -308,6 +308,18 @@

56

}

57

%endif

58

71

toolbarseparator {

72

-moz-binding: url("chrome://global/content/bindings/toolbar.xml#toolbardecoration");

73

}

74

Index: firefox-trunk-38.0~a1~hg20150223r230246/widget/gtk/nsDbusmenu.cpp

74

Index: firefox-39.0~a2~hg20150402r254824/widget/gtk/nsDbusmenu.cpp

75

===================================================================

76

--- /dev/null 1970-01-01 00:00:00.000000000 +0000

77

+++ firefox-trunk-38.0~a1~hg20150223r230246/widget/gtk/nsDbusmenu.cpp 2015-02-23 11:00:06.331486661 +0000

77

+++ firefox-39.0~a2~hg20150402r254824/widget/gtk/nsDbusmenu.cpp 2015-04-03 14:18:30.302256357 +0100

78

@@ -0,0 +1,59 @@

79

+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */

80

+/* vim:expandtab:shiftwidth=4:tabstop=4:

135

+

136

+ return NS_OK;

137

+}

138

Index: firefox-trunk-38.0~a1~hg20150223r230246/widget/gtk/nsDbusmenu.h

138

Index: firefox-39.0~a2~hg20150402r254824/widget/gtk/nsDbusmenu.h

139

===================================================================

140

--- /dev/null 1970-01-01 00:00:00.000000000 +0000

141

+++ firefox-trunk-38.0~a1~hg20150223r230246/widget/gtk/nsDbusmenu.h 2015-02-23 11:00:06.331486661 +0000

141

+++ firefox-39.0~a2~hg20150402r254824/widget/gtk/nsDbusmenu.h 2015-04-03 14:18:30.302256357 +0100

142

@@ -0,0 +1,99 @@

143

+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */

144

+/* vim:expandtab:shiftwidth=4:tabstop=4:

239

+#define dbusmenu_menuitem_property_set_shortcut nsDbusmenuFunctions::s_dbusmenu_menuitem_property_set_shortcut

240

+

241

+#endif /* __nsDbusmenu_h__ */

242

Index: firefox-trunk-38.0~a1~hg20150223r230246/widget/gtk/nsMenu.cpp

242

Index: firefox-39.0~a2~hg20150402r254824/widget/gtk/nsMenu.cpp

243

===================================================================

244

--- /dev/null 1970-01-01 00:00:00.000000000 +0000

245

+++ firefox-trunk-38.0~a1~hg20150223r230246/widget/gtk/nsMenu.cpp 2015-02-23 11:00:06.331486661 +0000

245

+++ firefox-39.0~a2~hg20150402r254824/widget/gtk/nsMenu.cpp 2015-04-03 14:18:30.306256359 +0100

246

@@ -0,0 +1,866 @@

247

+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */

248

+/* vim:expandtab:shiftwidth=4:tabstop=4:

1110

+

1111

+ MaybeAddPlaceholderItem();

1112

+}

1113

Index: firefox-trunk-38.0~a1~hg20150223r230246/widget/gtk/nsMenu.h

1113

Index: firefox-39.0~a2~hg20150402r254824/widget/gtk/nsMenu.h

1114

===================================================================

1115

--- /dev/null 1970-01-01 00:00:00.000000000 +0000

1116

+++ firefox-trunk-38.0~a1~hg20150223r230246/widget/gtk/nsMenu.h 2015-02-23 11:00:06.331486661 +0000

1116

+++ firefox-39.0~a2~hg20150402r254824/widget/gtk/nsMenu.h 2015-04-03 14:18:30.306256359 +0100

1117

@@ -0,0 +1,166 @@

1118

+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */

1119

+/* vim:expandtab:shiftwidth=4:tabstop=4:

1281

+};

1282

+

1283

+#endif /* __nsMenu_h__ */

1284

Index: firefox-trunk-38.0~a1~hg20150223r230246/widget/gtk/nsMenuBar.cpp

1284

Index: firefox-39.0~a2~hg20150402r254824/widget/gtk/nsMenuBar.cpp

1285

===================================================================

1286

--- /dev/null 1970-01-01 00:00:00.000000000 +0000

1287

+++ firefox-trunk-38.0~a1~hg20150223r230246/widget/gtk/nsMenuBar.cpp 2015-02-23 11:00:06.331486661 +0000

1287

+++ firefox-39.0~a2~hg20150402r254824/widget/gtk/nsMenuBar.cpp 2015-04-03 14:18:30.306256359 +0100

1288

@@ -0,0 +1,545 @@

1289

+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */

1290

+/* vim:expandtab:shiftwidth=4:tabstop=4:

1831

+ DebugOnly<nsresult> rv = RemoveChild(aChild);

1832

+ NS_ASSERTION(NS_SUCCEEDED(rv), "Failed to remove item from menubar");

1833

+}

1834

Index: firefox-trunk-38.0~a1~hg20150223r230246/widget/gtk/nsMenuBar.h

1834

Index: firefox-39.0~a2~hg20150402r254824/widget/gtk/nsMenuBar.h

1835

===================================================================

1836

--- /dev/null 1970-01-01 00:00:00.000000000 +0000

1837

+++ firefox-trunk-38.0~a1~hg20150223r230246/widget/gtk/nsMenuBar.h 2015-02-23 11:00:06.331486661 +0000

1837

+++ firefox-39.0~a2~hg20150402r254824/widget/gtk/nsMenuBar.h 2015-04-03 14:18:30.306256359 +0100

1838

@@ -0,0 +1,112 @@

1839

+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */

1840

+/* vim:expandtab:shiftwidth=4:tabstop=4:

1948

+};

1949

+

1950

+#endif /* __nsMenuBar_h__ */

1951

Index: firefox-trunk-38.0~a1~hg20150223r230246/widget/gtk/nsMenuContainer.cpp

1951

Index: firefox-39.0~a2~hg20150402r254824/widget/gtk/nsMenuContainer.cpp

1952

===================================================================

1953

--- /dev/null 1970-01-01 00:00:00.000000000 +0000

1954

+++ firefox-trunk-38.0~a1~hg20150223r230246/widget/gtk/nsMenuContainer.cpp 2015-02-23 11:00:06.331486661 +0000

1955

@@ -0,0 +1,179 @@

1954

+++ firefox-39.0~a2~hg20150402r254824/widget/gtk/nsMenuContainer.cpp 2015-04-03 14:18:30.306256359 +0100

1955

@@ -0,0 +1,174 @@

1956

+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */

1957

+/* vim:expandtab:shiftwidth=4:tabstop=4:

1958

+ */

1978

+static nsMenuObjectConstructor

1979

+GetMenuObjectConstructor(nsIContent *aContent)

1980

+{

1981

+ if (!aContent->IsXUL()) {

1982

+ return nullptr;

1983

+ }

1984

+

1985

+ nsIAtom *tag = aContent->Tag();

1986

+ if (tag == nsGkAtoms::menuitem) {

1981

+ if (aContent->IsXULElement(nsGkAtoms::menuitem)) {

1987

1982

+ return nsMenuItem::Create;

1988

+ } else if (tag == nsGkAtoms::menu) {

1983

+ } else if (aContent->IsXULElement(nsGkAtoms::menu)) {

1989

1984

+ return nsMenu::Create;

1990

+ } else if (tag == nsGkAtoms::menuseparator) {

1985

+ } else if (aContent->IsXULElement(nsGkAtoms::menuseparator)) {

1991

1986

+ return nsMenuSeparator::Create;

1992

1987

+ }

1993

1988

+

2132

2127

+

2133

2128

+ return aContent;

2134

2129

+}

2135

Index: firefox-trunk-38.0~a1~hg20150223r230246/widget/gtk/nsMenuContainer.h

2130

Index: firefox-39.0~a2~hg20150402r254824/widget/gtk/nsMenuContainer.h

2136

2131

===================================================================

2137

2132

--- /dev/null 1970-01-01 00:00:00.000000000 +0000

2138

+++ firefox-trunk-38.0~a1~hg20150223r230246/widget/gtk/nsMenuContainer.h 2015-02-23 11:00:06.331486661 +0000

2133

+++ firefox-39.0~a2~hg20150402r254824/widget/gtk/nsMenuContainer.h 2015-04-03 14:18:30.306256359 +0100

2139

2134

@@ -0,0 +1,66 @@

2140

2135

+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */

2141

2136

+/* vim:expandtab:shiftwidth=4:tabstop=4:

2203

2198

+};

2204

2199

+

2205

2200

+#endif /* __nsMenuContainer_h__ */

2206

Index: firefox-trunk-38.0~a1~hg20150223r230246/widget/gtk/nsMenuItem.cpp

2201

Index: firefox-39.0~a2~hg20150402r254824/widget/gtk/nsMenuItem.cpp

2207

2202

===================================================================

2208

2203

--- /dev/null 1970-01-01 00:00:00.000000000 +0000

2209

+++ firefox-trunk-38.0~a1~hg20150223r230246/widget/gtk/nsMenuItem.cpp 2015-02-23 11:00:06.331486661 +0000

2204

+++ firefox-39.0~a2~hg20150402r254824/widget/gtk/nsMenuItem.cpp 2015-04-03 14:18:30.306256359 +0100

2210

2205

@@ -0,0 +1,739 @@

2211

2206

+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */

2212

2207

+/* vim:expandtab:shiftwidth=4:tabstop=4:

2947

2942

+ UpdateIcon(sc);

2948

2943

+ }

2949

2944

+}

2950

Index: firefox-trunk-38.0~a1~hg20150223r230246/widget/gtk/nsMenuItem.h

2945

Index: firefox-39.0~a2~hg20150402r254824/widget/gtk/nsMenuItem.h

2951

2946

===================================================================

2952

2947

--- /dev/null 1970-01-01 00:00:00.000000000 +0000

2953

+++ firefox-trunk-38.0~a1~hg20150223r230246/widget/gtk/nsMenuItem.h 2015-02-23 11:00:06.331486661 +0000

2948

+++ firefox-39.0~a2~hg20150402r254824/widget/gtk/nsMenuItem.h 2015-04-03 14:18:30.306256359 +0100

2954

2949

@@ -0,0 +1,107 @@

2955

2950

+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */

2956

2951

+/* vim:expandtab:shiftwidth=4:tabstop=4:

3059

3054

+};

3060

3055

+

3061

3056

+#endif /* __nsMenuItem_h__ */

3062

Index: firefox-trunk-38.0~a1~hg20150223r230246/widget/gtk/nsMenuObject.cpp

3057

Index: firefox-39.0~a2~hg20150402r254824/widget/gtk/nsMenuObject.cpp

3063

3058

===================================================================

3064

3059

--- /dev/null 1970-01-01 00:00:00.000000000 +0000

3065

+++ firefox-trunk-38.0~a1~hg20150223r230246/widget/gtk/nsMenuObject.cpp 2015-02-23 11:00:06.331486661 +0000

3060

+++ firefox-39.0~a2~hg20150402r254824/widget/gtk/nsMenuObject.cpp 2015-04-03 14:18:30.306256359 +0100

3066

3061

@@ -0,0 +1,707 @@

3067

3062

+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */

3068

3063

+/* vim:expandtab:shiftwidth=4:tabstop=4:

3771

3766

+ weak = weak->GetPrevious();

3772

3767

+ }

3773

3768

+}

3774

Index: firefox-trunk-38.0~a1~hg20150223r230246/widget/gtk/nsMenuObject.h

3769

Index: firefox-39.0~a2~hg20150402r254824/widget/gtk/nsMenuObject.h

3775

3770

===================================================================

3776

3771

--- /dev/null 1970-01-01 00:00:00.000000000 +0000

3777

+++ firefox-trunk-38.0~a1~hg20150223r230246/widget/gtk/nsMenuObject.h 2015-02-23 11:00:06.331486661 +0000

3772

+++ firefox-39.0~a2~hg20150402r254824/widget/gtk/nsMenuObject.h 2015-04-03 14:18:30.306256359 +0100

3778

3773

@@ -0,0 +1,242 @@

3779

3774

+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */

3780

3775

+/* vim:expandtab:shiftwidth=4:tabstop=4:

4018

4013

+};

4019

4014

+

4020

4015

+#endif /* __nsMenuObject_h__ */

4021

Index: firefox-trunk-38.0~a1~hg20150223r230246/widget/gtk/nsMenuSeparator.cpp

4016

Index: firefox-39.0~a2~hg20150402r254824/widget/gtk/nsMenuSeparator.cpp

4022

4017

===================================================================

4023

4018

--- /dev/null 1970-01-01 00:00:00.000000000 +0000

4024

+++ firefox-trunk-38.0~a1~hg20150223r230246/widget/gtk/nsMenuSeparator.cpp 2015-02-23 11:00:06.331486661 +0000

4019

+++ firefox-39.0~a2~hg20150402r254824/widget/gtk/nsMenuSeparator.cpp 2015-04-03 14:18:30.310256360 +0100

4025

4020

@@ -0,0 +1,90 @@

4026

4021

+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */

4027

4022

+/* vim:expandtab:shiftwidth=4:tabstop=4:

4113

4108

+ UpdateVisibility(sc);

4114

4109

+ }

4115

4110

+}

4116

Index: firefox-trunk-38.0~a1~hg20150223r230246/widget/gtk/nsMenuSeparator.h

4111

Index: firefox-39.0~a2~hg20150402r254824/widget/gtk/nsMenuSeparator.h

4117

4112

===================================================================

4118

4113

--- /dev/null 1970-01-01 00:00:00.000000000 +0000

4119

+++ firefox-trunk-38.0~a1~hg20150223r230246/widget/gtk/nsMenuSeparator.h 2015-02-23 11:00:06.331486661 +0000

4114

+++ firefox-39.0~a2~hg20150402r254824/widget/gtk/nsMenuSeparator.h 2015-04-03 14:18:30.310256360 +0100

4120

4115

@@ -0,0 +1,41 @@

4121

4116

+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */

4122

4117

+/* vim:expandtab:shiftwidth=4:tabstop=4:

4159

4154

+};

4160

4155

+

4161

4156

+#endif /* __nsMenuSeparator_h__ */

4162

Index: firefox-trunk-38.0~a1~hg20150223r230246/widget/gtk/nsNativeMenuAtomList.h

4157

Index: firefox-39.0~a2~hg20150402r254824/widget/gtk/nsNativeMenuAtomList.h

4163

4158

===================================================================

4164

4159

--- /dev/null 1970-01-01 00:00:00.000000000 +0000

4165

+++ firefox-trunk-38.0~a1~hg20150223r230246/widget/gtk/nsNativeMenuAtomList.h 2015-02-23 11:00:06.331486661 +0000

4160

+++ firefox-39.0~a2~hg20150402r254824/widget/gtk/nsNativeMenuAtomList.h 2015-04-03 14:18:30.310256360 +0100

4166

4161

@@ -0,0 +1,11 @@

4167

4162

+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */

4168

4163

+/* vim:expandtab:shiftwidth=4:tabstop=4:

4175

4170

+WIDGET_ATOM2(_moz_menupopupstate, "_moz-menupopupstate")

4176

4171

+WIDGET_ATOM(openedwithkey)

4177

4172

+WIDGET_ATOM(shellshowingmenubar)

4178

Index: firefox-trunk-38.0~a1~hg20150223r230246/widget/gtk/nsNativeMenuAtoms.cpp

4173

Index: firefox-39.0~a2~hg20150402r254824/widget/gtk/nsNativeMenuAtoms.cpp

4179

4174

===================================================================

4180

4175

--- /dev/null 1970-01-01 00:00:00.000000000 +0000

4181

+++ firefox-trunk-38.0~a1~hg20150223r230246/widget/gtk/nsNativeMenuAtoms.cpp 2015-02-23 11:00:06.331486661 +0000

4176

+++ firefox-39.0~a2~hg20150402r254824/widget/gtk/nsNativeMenuAtoms.cpp 2015-04-03 14:18:30.310256360 +0100

4182

4177

@@ -0,0 +1,39 @@

4183

4178

+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */

4184

4179

+/* vim:expandtab:shiftwidth=4:tabstop=4:

4219

4214

+{

4220

4215

+ NS_RegisterStaticAtoms(gAtoms);

4221

4216

+}

4222

Index: firefox-trunk-38.0~a1~hg20150223r230246/widget/gtk/nsNativeMenuAtoms.h

4217

Index: firefox-39.0~a2~hg20150402r254824/widget/gtk/nsNativeMenuAtoms.h

4223

4218

===================================================================

4224

4219

--- /dev/null 1970-01-01 00:00:00.000000000 +0000

4225

+++ firefox-trunk-38.0~a1~hg20150223r230246/widget/gtk/nsNativeMenuAtoms.h 2015-02-23 11:00:06.331486661 +0000

4220

+++ firefox-39.0~a2~hg20150402r254824/widget/gtk/nsNativeMenuAtoms.h 2015-04-03 14:18:30.310256360 +0100

4226

4221

@@ -0,0 +1,25 @@

4227

4222

+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */

4228

4223

+/* vim:expandtab:shiftwidth=4:tabstop=4:

4249

4244

+};

4250

4245

+

4251

4246

+#endif /* __nsNativeMenuAtoms_h__ */

4252

Index: firefox-trunk-38.0~a1~hg20150223r230246/widget/gtk/nsNativeMenuDocListener.cpp

4247

Index: firefox-39.0~a2~hg20150402r254824/widget/gtk/nsNativeMenuDocListener.cpp

4253

4248

===================================================================

4254

4249

--- /dev/null 1970-01-01 00:00:00.000000000 +0000

4255

+++ firefox-trunk-38.0~a1~hg20150223r230246/widget/gtk/nsNativeMenuDocListener.cpp 2015-02-23 11:00:06.335486663 +0000

4250

+++ firefox-39.0~a2~hg20150402r254824/widget/gtk/nsNativeMenuDocListener.cpp 2015-04-03 14:18:30.310256360 +0100

4256

4251

@@ -0,0 +1,369 @@

4257

4252

+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */

4258

4253

+/* vim:expandtab:shiftwidth=4:tabstop=4:

4623

4618

+ CancelFlush(this);

4624

4619

+ mPendingMutations.Clear();

4625

4620

+}

4626

Index: firefox-trunk-38.0~a1~hg20150223r230246/widget/gtk/nsNativeMenuDocListener.h

4621

Index: firefox-39.0~a2~hg20150402r254824/widget/gtk/nsNativeMenuDocListener.h

4627

4622

===================================================================

4628

4623

--- /dev/null 1970-01-01 00:00:00.000000000 +0000

4629

+++ firefox-trunk-38.0~a1~hg20150223r230246/widget/gtk/nsNativeMenuDocListener.h 2015-02-23 11:00:06.335486663 +0000

4624

+++ firefox-39.0~a2~hg20150402r254824/widget/gtk/nsNativeMenuDocListener.h 2015-04-03 14:18:30.310256360 +0100

4630

4625

@@ -0,0 +1,152 @@

4631

4626

+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */

4632

4627

+/* vim:expandtab:shiftwidth=4:tabstop=4:

4780

4775

+};

4781

4776

+

4782

4777

+#endif /* __nsNativeMenuDocListener_h__ */

4783

Index: firefox-trunk-38.0~a1~hg20150223r230246/widget/gtk/nsNativeMenuService.cpp

4778

Index: firefox-39.0~a2~hg20150402r254824/widget/gtk/nsNativeMenuService.cpp

4784

4779

===================================================================

4785

4780

--- /dev/null 1970-01-01 00:00:00.000000000 +0000

4786

+++ firefox-trunk-38.0~a1~hg20150223r230246/widget/gtk/nsNativeMenuService.cpp 2015-02-23 11:00:06.335486663 +0000

4781

+++ firefox-39.0~a2~hg20150402r254824/widget/gtk/nsNativeMenuService.cpp 2015-04-03 14:18:30.310256360 +0100

4787

4782

@@ -0,0 +1,506 @@

4788

4783

+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */

4789

4784

+/* vim:expandtab:shiftwidth=4:tabstop=4:

5291

5286

+

5292

5287

+ return NS_OK;

5293

5288

+}

5294

Index: firefox-trunk-38.0~a1~hg20150223r230246/widget/gtk/nsNativeMenuService.h

5289

Index: firefox-39.0~a2~hg20150402r254824/widget/gtk/nsNativeMenuService.h

5295

5290

===================================================================

5296

5291

--- /dev/null 1970-01-01 00:00:00.000000000 +0000

5297

+++ firefox-trunk-38.0~a1~hg20150223r230246/widget/gtk/nsNativeMenuService.h 2015-02-23 11:00:06.335486663 +0000

5292

+++ firefox-39.0~a2~hg20150402r254824/widget/gtk/nsNativeMenuService.h 2015-04-03 14:18:30.310256360 +0100

5298

5293

@@ -0,0 +1,88 @@

5299

5294

+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */

5300

5295

+/* vim:expandtab:shiftwidth=4:tabstop=4:

5384

5379

+};

5385

5380

+

5386

5381

+#endif /* __nsNativeMenuService_h__ */

5387

Index: firefox-trunk-38.0~a1~hg20150223r230246/widget/gtk/nsNativeMenuUtils.h

5382

Index: firefox-39.0~a2~hg20150402r254824/widget/gtk/nsNativeMenuUtils.h

5388

5383

===================================================================

5389

5384

--- /dev/null 1970-01-01 00:00:00.000000000 +0000

5390

+++ firefox-trunk-38.0~a1~hg20150223r230246/widget/gtk/nsNativeMenuUtils.h 2015-02-23 11:00:06.335486663 +0000

5385

+++ firefox-39.0~a2~hg20150402r254824/widget/gtk/nsNativeMenuUtils.h 2015-04-03 14:18:30.310256360 +0100

5391

5386

@@ -0,0 +1,59 @@

5392

5387

+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */

5393

5388

+/* vim:expandtab:shiftwidth=4:tabstop=4:

5448

5443

+};

5449

5444

+

5450

5445

+#endif /* __nsNativeMenuUtils_h__ */

5451

Index: firefox-trunk-38.0~a1~hg20150223r230246/widget/gtk/nsWidgetFactory.cpp

5446

Index: firefox-39.0~a2~hg20150402r254824/widget/gtk/nsWidgetFactory.cpp

5452

5447

===================================================================

5453

--- firefox-trunk-38.0~a1~hg20150223r230246.orig/widget/gtk/nsWidgetFactory.cpp 2015-02-23 11:00:06.339486664 +0000

5454

+++ firefox-trunk-38.0~a1~hg20150223r230246/widget/gtk/nsWidgetFactory.cpp 2015-02-23 11:00:06.335486663 +0000

5448

--- firefox-39.0~a2~hg20150402r254824.orig/widget/gtk/nsWidgetFactory.cpp 2015-04-03 14:18:30.318256364 +0100

5449

+++ firefox-39.0~a2~hg20150402r254824/widget/gtk/nsWidgetFactory.cpp 2015-04-03 14:18:30.310256360 +0100

5455

5450

@@ -45,6 +45,9 @@

5456

5451

#include "GfxInfoX11.h"

5457

5452

#endif

5520

5515

nsWidgetGtk2ModuleDtor

5521

5516

};

5522

5517

5523

Index: firefox-trunk-38.0~a1~hg20150223r230246/widget/gtk/nsWindow.cpp

5518

Index: firefox-39.0~a2~hg20150402r254824/widget/gtk/nsWindow.cpp

5524

5519

===================================================================

5525

--- firefox-trunk-38.0~a1~hg20150223r230246.orig/widget/gtk/nsWindow.cpp 2015-02-23 11:00:06.339486664 +0000

5526

+++ firefox-trunk-38.0~a1~hg20150223r230246/widget/gtk/nsWindow.cpp 2015-02-23 11:00:06.335486663 +0000

5527

@@ -4892,6 +4892,11 @@

5520

--- firefox-39.0~a2~hg20150402r254824.orig/widget/gtk/nsWindow.cpp 2015-04-03 14:18:30.318256364 +0100

5521

+++ firefox-39.0~a2~hg20150402r254824/widget/gtk/nsWindow.cpp 2015-04-03 14:18:30.310256360 +0100

5522

@@ -4888,6 +4888,11 @@

5528

5523

return NS_OK;

5529

5524

}

5530

5525

5536

5531

bool

5537

5532

nsWindow::CheckForRollup(gdouble aMouseX, gdouble aMouseY,

5538

5533

bool aIsWheel, bool aAlwaysRollup)

5539

Index: firefox-trunk-38.0~a1~hg20150223r230246/widget/gtk/nsWindow.h

5534

Index: firefox-39.0~a2~hg20150402r254824/widget/gtk/nsWindow.h

5540

5535

===================================================================

5541

--- firefox-trunk-38.0~a1~hg20150223r230246.orig/widget/gtk/nsWindow.h 2015-02-23 11:00:06.339486664 +0000

5542

+++ firefox-trunk-38.0~a1~hg20150223r230246/widget/gtk/nsWindow.h 2015-02-23 11:00:06.335486663 +0000

5536

--- firefox-39.0~a2~hg20150402r254824.orig/widget/gtk/nsWindow.h 2015-04-03 14:18:30.318256364 +0100

5537

+++ firefox-39.0~a2~hg20150402r254824/widget/gtk/nsWindow.h 2015-04-03 14:19:06.294272612 +0100

5543

5538

@@ -33,6 +33,8 @@

5544

5539

5545

5540

#include "nsGtkIMModule.h"

5549

5544

#undef LOG

5550

5545

#ifdef MOZ_LOGGING

5551

5546

5552

@@ -150,6 +152,8 @@

5547

@@ -151,6 +153,8 @@

5553

5548

nsIScreen* aTargetScreen = nullptr) override;

5554

5549

NS_IMETHOD HideWindowChrome(bool aShouldHide) override;

5555

5550

5558

5553

/**

5559

5554

* GetLastUserInputTime returns a timestamp for the most recent user input

5560

5555

* event. This is intended for pointer grab requests (including drags).

5561

@@ -498,6 +502,8 @@

5556

@@ -499,6 +503,8 @@

5562

5557

int GdkCoordToDevicePixels(gint coord);

5563

5558

mozilla::LayoutDeviceIntPoint GdkPointToDevicePixels(GdkPoint point);

5564

5559

nsIntRect GdkRectToDevicePixels(GdkRectangle rect);

5567

5562

};

5568

5563

5569

5564

class nsChildWindow : public nsWindow {

5570

Index: firefox-trunk-38.0~a1~hg20150223r230246/xpfe/appshell/nsWebShellWindow.cpp

5565

Index: firefox-39.0~a2~hg20150402r254824/xpfe/appshell/nsWebShellWindow.cpp

5571

5566

===================================================================

5572

--- firefox-trunk-38.0~a1~hg20150223r230246.orig/xpfe/appshell/nsWebShellWindow.cpp 2015-02-23 11:00:06.339486664 +0000

5573

+++ firefox-trunk-38.0~a1~hg20150223r230246/xpfe/appshell/nsWebShellWindow.cpp 2015-02-23 11:22:40.737311348 +0000

5567

--- firefox-39.0~a2~hg20150402r254824.orig/xpfe/appshell/nsWebShellWindow.cpp 2015-04-03 14:18:30.318256364 +0100

5568

+++ firefox-39.0~a2~hg20150402r254824/xpfe/appshell/nsWebShellWindow.cpp 2015-04-03 14:19:39.038287392 +0100

5574

5569

@@ -58,6 +58,7 @@

5575

5570

#include "nsIScreen.h"

5576

5571

5579

5574

#include "nsIScriptSecurityManager.h"

5580

5575

5581

5576

// For calculating size

5582

@@ -71,7 +72,7 @@

5583

#include "mozilla/DebugOnly.h"

5584

#include "mozilla/MouseEvents.h"

5577

@@ -73,7 +74,7 @@

5578

5579

#include "nsPIWindowRoot.h"

5585

5580

5586

5581

-#ifdef XP_MACOSX

5587

5582

+#if defined(XP_MACOSX) || defined(MOZ_WIDGET_GTK)

5588

5583

#include "nsINativeMenuService.h"

5589

5584

#define USE_NATIVE_MENUS

5590

5585

#endif

5591

@@ -436,6 +437,11 @@

5586

@@ -447,6 +448,11 @@

5592

5587

5593

5588

if (menubarNode) {

5594

5589

nsCOMPtr<nsIContent> menubarContent(do_QueryInterface(menubarNode));

5600

5595

nms->CreateNativeMenuBar(aParentWindow, menubarContent);

5601

5596

} else {

5602

5597

nms->CreateNativeMenuBar(aParentWindow, nullptr);

5603

Index: firefox-trunk-38.0~a1~hg20150223r230246/widget/gtk/moz.build

5598

Index: firefox-39.0~a2~hg20150402r254824/widget/gtk/moz.build

5604

5599

===================================================================

5605

--- firefox-trunk-38.0~a1~hg20150223r230246.orig/widget/gtk/moz.build 2015-02-23 11:00:06.339486664 +0000

5606

+++ firefox-trunk-38.0~a1~hg20150223r230246/widget/gtk/moz.build 2015-02-23 11:00:06.335486663 +0000

5600

--- firefox-39.0~a2~hg20150402r254824.orig/widget/gtk/moz.build 2015-04-03 14:18:30.318256364 +0100

5601

+++ firefox-39.0~a2~hg20150402r254824/widget/gtk/moz.build 2015-04-03 14:18:30.314256362 +0100

5607

5602

@@ -19,11 +19,20 @@

5608

5603

'nsAppShell.cpp',

5609

5604

'nsBidiKeyboard.cpp',

5641

5636

'/layout/xul',

5642

5637

'/other-licenses/atk-1.0',

5643

5638

'/widget',

5644

Index: firefox-trunk-38.0~a1~hg20150223r230246/browser/base/content/browser.js

5639

Index: firefox-39.0~a2~hg20150402r254824/browser/base/content/browser.js

5645

5640

===================================================================

5646

--- firefox-trunk-38.0~a1~hg20150223r230246.orig/browser/base/content/browser.js 2015-02-23 11:00:06.339486664 +0000

5647

+++ firefox-trunk-38.0~a1~hg20150223r230246/browser/base/content/browser.js 2015-02-23 11:00:06.335486663 +0000

5648

@@ -4715,6 +4715,8 @@

5641

--- firefox-39.0~a2~hg20150402r254824.orig/browser/base/content/browser.js 2015-04-03 14:18:30.318256364 +0100

5642

+++ firefox-39.0~a2~hg20150402r254824/browser/base/content/browser.js 2015-04-03 14:18:30.314256362 +0100

5643

@@ -4799,6 +4799,8 @@

5649

5644

let toolbarNodes = Array.slice(gNavToolbox.childNodes);

5650

5645

toolbarNodes = toolbarNodes.concat(gNavToolbox.externalToolbars);

5651

5646

toolbarNodes = toolbarNodes.filter(node => node.getAttribute("toolbarname"));

5654

5649

return toolbarNodes;

5655

5650

}

5656

5651

5657

Index: firefox-trunk-38.0~a1~hg20150223r230246/widget/moz.build

5652

Index: firefox-39.0~a2~hg20150402r254824/widget/moz.build

5658

5653

===================================================================

5659

--- firefox-trunk-38.0~a1~hg20150223r230246.orig/widget/moz.build 2015-02-23 11:00:06.339486664 +0000

5660

+++ firefox-trunk-38.0~a1~hg20150223r230246/widget/moz.build 2015-02-23 11:00:06.339486664 +0000

5654

--- firefox-39.0~a2~hg20150402r254824.orig/widget/moz.build 2015-04-03 14:18:30.318256364 +0100

5655

+++ firefox-39.0~a2~hg20150402r254824/widget/moz.build 2015-04-03 14:18:30.314256362 +0100

5661

5656

@@ -38,10 +38,12 @@

5662

5657

'nsITaskbarProgress.idl',

5663

5658

]

5672

5667

TEST_DIRS += ['tests']

5673

5668

5674

5669

# Don't build the DSO under the 'build' directory as windows does.

5675

Index: firefox-trunk-38.0~a1~hg20150223r230246/modules/libpref/init/all.js

5670

Index: firefox-39.0~a2~hg20150402r254824/modules/libpref/init/all.js

5676

5671

===================================================================

5677

--- firefox-trunk-38.0~a1~hg20150223r230246.orig/modules/libpref/init/all.js 2015-02-23 11:00:06.339486664 +0000

5678

+++ firefox-trunk-38.0~a1~hg20150223r230246/modules/libpref/init/all.js 2015-02-23 11:00:06.339486664 +0000

5672

--- firefox-39.0~a2~hg20150402r254824.orig/modules/libpref/init/all.js 2015-04-03 14:18:30.318256364 +0100

5673

+++ firefox-39.0~a2~hg20150402r254824/modules/libpref/init/all.js 2015-04-03 14:18:30.318256364 +0100

5679

5674

@@ -190,6 +190,9 @@

5680

5675

pref("browser.sessionhistory.max_total_viewers", -1);

5681

5676