diff options
| -rw-r--r-- | .SRCINFO | 36 | ||||
| -rw-r--r-- | PKGBUILD | 30 | ||||
| -rw-r--r-- | firefox-quicktime.patch | 144 | ||||
| -rw-r--r-- | unity-menubar.patch | 240 |
4 files changed, 147 insertions, 303 deletions
@@ -1,9 +1,9 @@ # Generated by mksrcinfo v8 -# Sat Feb 27 17:16:29 UTC 2016 +# Sat Mar 12 08:41:19 UTC 2016 pkgbase = firefox-kde-opensuse pkgdesc = Standalone web browser from mozilla.org with OpenSUSE patch, integrate better with KDE - pkgver = 44.0.2 - pkgrel = 4 + pkgver = 45.0 + pkgrel = 1 url = https://build.opensuse.org/package/show/mozilla:Factory/MozillaFirefox install = firefox.install arch = i686 @@ -43,46 +43,42 @@ pkgbase = firefox-kde-opensuse depends = gtk3 optdepends = networkmanager: Location detection via available WiFi networks optdepends = upower: Battery API - provides = firefox=44.0.2 + provides = firefox=45.0 conflicts = firefox options = !emptydirs options = strip - source = https://ftp.mozilla.org/pub/mozilla.org/firefox/releases/44.0.2/source/firefox-44.0.2.source.tar.xz + source = https://ftp.mozilla.org/pub/mozilla.org/firefox/releases/45.0/source/firefox-45.0.source.tar.xz source = mozconfig source = firefox.desktop source = firefox-install-dir.patch source = vendor.js source = kde.js source = firefox-fixed-loading-icon.png - source = rhbz-966424.patch - source = http://www.rosenauer.org/hg/mozilla/raw-file/11475705ab0f/firefox-branded-icons.patch - source = http://www.rosenauer.org/hg/mozilla/raw-file/11475705ab0f/firefox-kde.patch - source = http://www.rosenauer.org/hg/mozilla/raw-file/11475705ab0f/firefox-no-default-ualocale.patch - source = http://www.rosenauer.org/hg/mozilla/raw-file/11475705ab0f/mozilla-kde.patch - source = http://www.rosenauer.org/hg/mozilla/raw-file/11475705ab0f/mozilla-language.patch - source = http://www.rosenauer.org/hg/mozilla/raw-file/11475705ab0f/mozilla-nongnome-proxies.patch + source = http://www.rosenauer.org/hg/mozilla/raw-file/6a889427cd4f/firefox-branded-icons.patch + source = http://www.rosenauer.org/hg/mozilla/raw-file/6a889427cd4f/firefox-kde.patch + source = http://www.rosenauer.org/hg/mozilla/raw-file/6a889427cd4f/firefox-no-default-ualocale.patch + source = http://www.rosenauer.org/hg/mozilla/raw-file/6a889427cd4f/mozilla-kde.patch + source = http://www.rosenauer.org/hg/mozilla/raw-file/6a889427cd4f/mozilla-language.patch + source = http://www.rosenauer.org/hg/mozilla/raw-file/6a889427cd4f/mozilla-nongnome-proxies.patch source = unity-menubar.patch source = add_missing_pgo_rule.patch source = pgo_fix_missing_kdejs.patch - source = firefox-quicktime.patch - sha256sums = 0bb28841a9268c50cbb239f759f16f55b3a624f679c68965158beaa0a83a2d9e + sha256sums = 36ab0f09b1b1df071a8aafa673c6286d99c18dc06cecbb70d1bb2021fbf379f1 sha256sums = 633084aa03336088e087f39eb55b212cc97b11d27a4b288a87f75148350be4dd sha256sums = c202e5e18da1eeddd2e1d81cb3436813f11e44585ca7357c4c5f1bddd4bec826 sha256sums = d86e41d87363656ee62e12543e2f5181aadcff448e406ef3218e91865ae775cd sha256sums = 4b50e9aec03432e21b44d18c4c97b2630bace606b033f7d556c9d3e3eb0f4fa4 sha256sums = b8cc5f35ec35fc96ac5c5a2477b36722e373dbb57eba87eb5ad1276e4df7236d sha256sums = 68e3a5b47c6d175cc95b98b069a15205f027cab83af9e075818d38610feb6213 - sha256sums = 746cb474c5a2c26fc474256e430e035e604b71b27df1003d4af85018fa263f4a - sha256sums = 0ac532cb40be8057225032a000587e1fb7936dd06607e79a69064b10d436afd5 - sha256sums = 8255adfb5289505c98c2f0aa534c5e63c4750e867552f6c6f9199e03d2cc9bc8 + sha256sums = 0778583e04d021d317aede459e47e9393bb164913eaa40aef56453377e2685ea + sha256sums = 661ed67b994605862999a8f650e3b660fae32d39c77f0663ea2d6578578b4a21 sha256sums = 02e92f84dd31ed079be3e67509cf23d0d351e06bb690fcc091c904d906d2d690 - sha256sums = 0d764c620fc2853803fca31e8b9ca1b44620ccfccceffc78f0e9af652ca80ea0 + sha256sums = 3e7d8d65b481c03eb1da37b2e211f018e6fc9de381433205398e5ddaaff1c44a sha256sums = feede2fb86527c4a5d90bd5458fe582da920ab02dd25ec656236d87caf8888ba sha256sums = e8289ea4c1f8191e1e23661312ceee2128b8e790501b9a589d0d7bfc4384553f - sha256sums = aaf7d17559777320b7380d185fce0fd0ba455c8bc83140a005dedffcdedfc5d7 + sha256sums = 6b0e2900be693805388a96e4b2f4ea9a838c1e95322a546388d384a21458cd3f sha256sums = f9067f62a25a7a77276e15f91cc9e7ba6576315345cfc6347b1b2e884becdb0c sha256sums = 2797d1e61031d24ee24bf682c9447b3b9c1bca10f8e6cbd597b854af2de1ec54 - sha256sums = 6b731ca36e7688aeb24685da702e0af0475e6671072fc96464fbbed49d0bbd50 pkgname = firefox-kde-opensuse @@ -8,12 +8,12 @@ _gtk3=true # try to build with PGO -_pgo=false +_pgo=true _pkgname=firefox pkgname=$_pkgname-kde-opensuse -pkgver=44.0.2 -pkgrel=4 +pkgver=45.0 +pkgrel=1 pkgdesc="Standalone web browser from mozilla.org with OpenSUSE patch, integrate better with KDE" arch=('i686' 'x86_64') license=('MPL' 'GPL' 'LGPL') @@ -33,12 +33,11 @@ optdepends=('networkmanager: Location detection via available WiFi networks' provides=("firefox=${pkgver}") conflicts=('firefox') install=firefox.install -_patchrev=11475705ab0f +_patchrev=6a889427cd4f options=('!emptydirs' 'strip' ) _patchurl=http://www.rosenauer.org/hg/mozilla/raw-file/$_patchrev source=(https://ftp.mozilla.org/pub/mozilla.org/firefox/releases/$pkgver/source/firefox-$pkgver.source.tar.xz mozconfig firefox.desktop firefox-install-dir.patch vendor.js kde.js firefox-fixed-loading-icon.png - rhbz-966424.patch # Firefox patchset $_patchurl/firefox-branded-icons.patch $_patchurl/firefox-kde.patch @@ -50,7 +49,6 @@ source=(https://ftp.mozilla.org/pub/mozilla.org/firefox/releases/$pkgver/source/ unity-menubar.patch add_missing_pgo_rule.patch pgo_fix_missing_kdejs.patch - firefox-quicktime.patch ) # Google API keys (see http://www.chromium.org/developers/how-tos/api-keys) @@ -85,12 +83,6 @@ prepare() { echo -n "$_mozilla_api_key" >mozilla-api-key echo "ac_add_options --with-mozilla-api-keyfile=\"$PWD/mozilla-api-key\"" >>.mozconfig - # https://bugs.archlinux.org/task/41689 - patch -Np1 -i "$srcdir/rhbz-966424.patch" - - # FS#47953 - [firefox] 44.0-1 breaks mp4a audio stream playback capability - # https://bugzilla.mozilla.org/show_bug.cgi?id=1244523 - patch -Np1 -i "$srcdir"/firefox-quicktime.patch msg "Patching for KDE" patch -Np1 -i "$srcdir/mozilla-nongnome-proxies.patch" @@ -190,21 +182,19 @@ package() { ln -sf firefox "$pkgdir/usr/lib/firefox/firefox-bin" } -sha256sums=('0bb28841a9268c50cbb239f759f16f55b3a624f679c68965158beaa0a83a2d9e' +sha256sums=('36ab0f09b1b1df071a8aafa673c6286d99c18dc06cecbb70d1bb2021fbf379f1' '633084aa03336088e087f39eb55b212cc97b11d27a4b288a87f75148350be4dd' 'c202e5e18da1eeddd2e1d81cb3436813f11e44585ca7357c4c5f1bddd4bec826' 'd86e41d87363656ee62e12543e2f5181aadcff448e406ef3218e91865ae775cd' '4b50e9aec03432e21b44d18c4c97b2630bace606b033f7d556c9d3e3eb0f4fa4' 'b8cc5f35ec35fc96ac5c5a2477b36722e373dbb57eba87eb5ad1276e4df7236d' '68e3a5b47c6d175cc95b98b069a15205f027cab83af9e075818d38610feb6213' - '746cb474c5a2c26fc474256e430e035e604b71b27df1003d4af85018fa263f4a' - '0ac532cb40be8057225032a000587e1fb7936dd06607e79a69064b10d436afd5' - '8255adfb5289505c98c2f0aa534c5e63c4750e867552f6c6f9199e03d2cc9bc8' + '0778583e04d021d317aede459e47e9393bb164913eaa40aef56453377e2685ea' + '661ed67b994605862999a8f650e3b660fae32d39c77f0663ea2d6578578b4a21' '02e92f84dd31ed079be3e67509cf23d0d351e06bb690fcc091c904d906d2d690' - '0d764c620fc2853803fca31e8b9ca1b44620ccfccceffc78f0e9af652ca80ea0' + '3e7d8d65b481c03eb1da37b2e211f018e6fc9de381433205398e5ddaaff1c44a' 'feede2fb86527c4a5d90bd5458fe582da920ab02dd25ec656236d87caf8888ba' 'e8289ea4c1f8191e1e23661312ceee2128b8e790501b9a589d0d7bfc4384553f' - 'aaf7d17559777320b7380d185fce0fd0ba455c8bc83140a005dedffcdedfc5d7' + '6b0e2900be693805388a96e4b2f4ea9a838c1e95322a546388d384a21458cd3f' 'f9067f62a25a7a77276e15f91cc9e7ba6576315345cfc6347b1b2e884becdb0c' - '2797d1e61031d24ee24bf682c9447b3b9c1bca10f8e6cbd597b854af2de1ec54' - '6b731ca36e7688aeb24685da702e0af0475e6671072fc96464fbbed49d0bbd50') + '2797d1e61031d24ee24bf682c9447b3b9c1bca10f8e6cbd597b854af2de1ec54') diff --git a/firefox-quicktime.patch b/firefox-quicktime.patch deleted file mode 100644 index 353ee3f31f7e..000000000000 --- a/firefox-quicktime.patch +++ /dev/null @@ -1,144 +0,0 @@ - -# HG changeset patch -# User John Lin <jolin@mozilla.com> -# Date 1447265580 -3600 -# Node ID aeb7ece8cbd40280f27ec3631f4f9e5b8b52c5a9 -# Parent 22d372a893d764554af0edb7e47f817af93b2114 -Bug 1211802 - Recognize 'avc?' as mp4 video. r=jya - -diff --git a/toolkit/components/mediasniffer/nsMediaSniffer.cpp b/toolkit/components/mediasniffer/nsMediaSniffer.cpp ---- a/toolkit/components/mediasniffer/nsMediaSniffer.cpp -+++ b/toolkit/components/mediasniffer/nsMediaSniffer.cpp -@@ -36,16 +36,17 @@ nsMediaSnifferEntry nsMediaSniffer::sSni - PATTERN_ENTRY("\xFF\xFF\xFF\xFF\x00\x00\x00\x00\xFF\xFF\xFF\xFF", "RIFF\x00\x00\x00\x00WAVE", AUDIO_WAV), - // mp3 with ID3 tags, the string "ID3". - PATTERN_ENTRY("\xFF\xFF\xFF", "ID3", AUDIO_MP3) - }; - - // For a complete list of file types, see http://www.ftyps.com/index.html - nsMediaSnifferEntry sFtypEntries[] = { - PATTERN_ENTRY("\xFF\xFF\xFF", "mp4", VIDEO_MP4), // Could be mp41 or mp42. -+ PATTERN_ENTRY("\xFF\xFF\xFF", "avc", VIDEO_MP4), // Could be avc1, avc2, ... - PATTERN_ENTRY("\xFF\xFF\xFF", "3gp", VIDEO_3GPP), // Could be 3gp4, 3gp5, ... - PATTERN_ENTRY("\xFF\xFF\xFF\xFF", "M4A ", AUDIO_MP4), - PATTERN_ENTRY("\xFF\xFF\xFF\xFF", "M4P ", AUDIO_MP4) - }; - - static bool MatchesBrands(const uint8_t aData[4], nsACString& aSniffedType) - { - for (size_t i = 0; i < mozilla::ArrayLength(sFtypEntries); ++i) { - - -# HG changeset patch -# User Jean-Yves Avenard <jyavenard@mozilla.com> -# Date 1454373529 -39600 -# Node ID f7d66b2782266c066f2efecc9f066af01472ffb5 -# Parent b237f1bffcfd9b7c7da767ffa54dbf4ed7b68321 -Bug 1244523: P1. Allow video/quicktime mimetype. r=cpearce - -It's just like video/mp4 - - -diff --git a/dom/media/fmp4/MP4Decoder.cpp b/dom/media/fmp4/MP4Decoder.cpp ---- a/dom/media/fmp4/MP4Decoder.cpp -+++ b/dom/media/fmp4/MP4Decoder.cpp -@@ -102,16 +102,17 @@ MP4Decoder::CanHandleMediaType(const nsA - const bool isMP4Audio = aMIMETypeExcludingCodecs.EqualsASCII("audio/mp4") || - aMIMETypeExcludingCodecs.EqualsASCII("audio/x-m4a"); - const bool isMP4Video = - // On B2G, treat 3GPP as MP4 when Gonk PDM is available. - #ifdef MOZ_GONK_MEDIACODEC - aMIMETypeExcludingCodecs.EqualsASCII(VIDEO_3GPP) || - #endif - aMIMETypeExcludingCodecs.EqualsASCII("video/mp4") || -+ aMIMETypeExcludingCodecs.EqualsASCII("video/quicktime") || - aMIMETypeExcludingCodecs.EqualsASCII("video/x-m4v"); - if (!isMP4Audio && !isMP4Video) { - return false; - } - - nsTArray<nsCString> codecMimes; - if (aCodecs.IsEmpty()) { - // No codecs specified. Assume AAC/H.264 - - -# HG changeset patch -# User Jean-Yves Avenard <jyavenard@mozilla.com> -# Date 1454373530 -39600 -# Node ID b0c3e8efafc8aa13935d023762e26495fc9b99a9 -# Parent f7d66b2782266c066f2efecc9f066af01472ffb5 -Bug 1244523: [mp4] P2. Have sniffer recognise ftyp qt subtype. r=cpearce - - -diff --git a/toolkit/components/mediasniffer/nsMediaSniffer.cpp b/toolkit/components/mediasniffer/nsMediaSniffer.cpp ---- a/toolkit/components/mediasniffer/nsMediaSniffer.cpp -+++ b/toolkit/components/mediasniffer/nsMediaSniffer.cpp -@@ -37,17 +37,18 @@ nsMediaSnifferEntry nsMediaSniffer::sSni - }; - - // For a complete list of file types, see http://www.ftyps.com/index.html - nsMediaSnifferEntry sFtypEntries[] = { - PATTERN_ENTRY("\xFF\xFF\xFF", "mp4", VIDEO_MP4), // Could be mp41 or mp42. - PATTERN_ENTRY("\xFF\xFF\xFF", "avc", VIDEO_MP4), // Could be avc1, avc2, ... - PATTERN_ENTRY("\xFF\xFF\xFF", "3gp", VIDEO_3GPP), // Could be 3gp4, 3gp5, ... - PATTERN_ENTRY("\xFF\xFF\xFF\xFF", "M4A ", AUDIO_MP4), -- PATTERN_ENTRY("\xFF\xFF\xFF\xFF", "M4P ", AUDIO_MP4) -+ PATTERN_ENTRY("\xFF\xFF\xFF\xFF", "M4P ", AUDIO_MP4), -+ PATTERN_ENTRY("\xFF\xFF\xFF\xFF", "qt ", VIDEO_MP4), - }; - - static bool MatchesBrands(const uint8_t aData[4], nsACString& aSniffedType) - { - for (size_t i = 0; i < mozilla::ArrayLength(sFtypEntries); ++i) { - const auto& currentEntry = sFtypEntries[i]; - bool matched = true; - MOZ_ASSERT(currentEntry.mLength <= 4, "Pattern is too large to match brand strings."); - - -# HG changeset patch -# User Jean-Yves Avenard <jyavenard@mozilla.com> -# Date 1454373533 -39600 -# Node ID 15d15d76aae97b14717eded043ea73cc81fe50e6 -# Parent b0c3e8efafc8aa13935d023762e26495fc9b99a9 -Bug 1244523: [mp4] P3. Skip four bytes when we hit a zero length box, r=kentuckyfriedtakahe - -Similar to bug 1180101, but don't handle only the last box in the file. - - -diff --git a/media/libstagefright/frameworks/av/media/libstagefright/MPEG4Extractor.cpp b/media/libstagefright/frameworks/av/media/libstagefright/MPEG4Extractor.cpp ---- a/media/libstagefright/frameworks/av/media/libstagefright/MPEG4Extractor.cpp -+++ b/media/libstagefright/frameworks/av/media/libstagefright/MPEG4Extractor.cpp -@@ -646,24 +646,24 @@ static bool ValidInputSize(int32_t size) - // frame. This is a reasonable cut-off for a lossy codec, - // combined with the current Firefox limit to 5k video. - return (size > 0 && size <= 4 * (1920 * 1080) * 3 / 2); - } - - status_t MPEG4Extractor::parseChunk(off64_t *offset, int depth) { - ALOGV("entering parseChunk %lld/%d", *offset, depth); - uint32_t hdr[2]; -- ssize_t nbytes; -- if ((nbytes = mDataSource->readAt(*offset, hdr, 8)) < 8) { -- if (nbytes == 4) { -- if (!hdr[0]) { -- *offset += 4; -- return OK; -- } -- } -+ if (mDataSource->readAt(*offset, hdr, 4) < 4) { -+ return ERROR_IO; -+ } -+ if (!hdr[0]) { -+ *offset += 4; -+ return OK; -+ } -+ if (mDataSource->readAt(*offset + 4, hdr + 1, 4) < 4) { - return ERROR_IO; - } - uint64_t chunk_size = ntohl(hdr[0]); - uint32_t chunk_type = ntohl(hdr[1]); - off64_t data_offset = *offset + 8; - - if (chunk_size == 1) { - if (mDataSource->readAt(*offset + 8, &chunk_size, 8) < 8) { - diff --git a/unity-menubar.patch b/unity-menubar.patch index 8642b76fd0cd..886c164b741c 100644 --- a/unity-menubar.patch +++ b/unity-menubar.patch @@ -1,7 +1,7 @@ -Index: firefox-44.0~a2~hg20151207r291794/browser/base/content/browser-menubar.inc +Index: firefox-trunk-45.0~a1~hg20151125r274040/browser/base/content/browser-menubar.inc =================================================================== ---- firefox-44.0~a2~hg20151207r291794.orig/browser/base/content/browser-menubar.inc 2015-12-08 05:35:46.000000000 +0000 -+++ firefox-44.0~a2~hg20151207r291794/browser/base/content/browser-menubar.inc 2015-12-09 22:34:37.000000000 +0000 +--- firefox-trunk-45.0~a1~hg20151125r274040.orig/browser/base/content/browser-menubar.inc 2015-11-26 00:46:44.677069351 +0000 ++++ firefox-trunk-45.0~a1~hg20151125r274040/browser/base/content/browser-menubar.inc 2015-11-26 00:46:44.577068690 +0000 @@ -5,7 +5,11 @@ <menubar id="main-menubar" @@ -14,10 +14,10 @@ Index: firefox-44.0~a2~hg20151207r291794/browser/base/content/browser-menubar.in this.setAttribute('openedwithkey', event.target.parentNode.openedWithKey);" style="border:0px;padding:0px;margin:0px;-moz-appearance:none"> -Index: firefox-44.0~a2~hg20151207r291794/browser/components/places/content/places.xul +Index: firefox-trunk-45.0~a1~hg20151125r274040/browser/components/places/content/places.xul =================================================================== ---- firefox-44.0~a2~hg20151207r291794.orig/browser/components/places/content/places.xul 2015-12-08 05:35:55.000000000 +0000 -+++ firefox-44.0~a2~hg20151207r291794/browser/components/places/content/places.xul 2015-12-09 22:34:37.000000000 +0000 +--- firefox-trunk-45.0~a1~hg20151125r274040.orig/browser/components/places/content/places.xul 2015-11-26 00:46:44.677069351 +0000 ++++ firefox-trunk-45.0~a1~hg20151125r274040/browser/components/places/content/places.xul 2015-11-26 00:46:44.577068690 +0000 @@ -157,7 +157,7 @@ <toolbarbutton type="menu" class="tabbable" onpopupshowing="document.getElementById('placeContent').focus()" @@ -27,10 +27,10 @@ Index: firefox-44.0~a2~hg20151207r291794/browser/components/places/content/place <menu accesskey="&organize.accesskey;" class="menu-iconic" #endif id="organizeButton" label="&organize.label;" -Index: firefox-44.0~a2~hg20151207r291794/toolkit/content/widgets/popup.xml +Index: firefox-trunk-45.0~a1~hg20151125r274040/toolkit/content/widgets/popup.xml =================================================================== ---- firefox-44.0~a2~hg20151207r291794.orig/toolkit/content/widgets/popup.xml 2015-12-08 05:37:22.000000000 +0000 -+++ firefox-44.0~a2~hg20151207r291794/toolkit/content/widgets/popup.xml 2015-12-09 22:34:37.000000000 +0000 +--- firefox-trunk-45.0~a1~hg20151125r274040.orig/toolkit/content/widgets/popup.xml 2015-11-26 00:46:44.677069351 +0000 ++++ firefox-trunk-45.0~a1~hg20151125r274040/toolkit/content/widgets/popup.xml 2015-11-26 00:46:44.577068690 +0000 @@ -25,8 +25,14 @@ </getter> </property> @@ -48,10 +48,10 @@ Index: firefox-44.0~a2~hg20151207r291794/toolkit/content/widgets/popup.xml <property name="triggerNode" readonly="true" onget="return this.popupBoxObject.triggerNode"/> -Index: firefox-44.0~a2~hg20151207r291794/toolkit/content/xul.css +Index: firefox-trunk-45.0~a1~hg20151125r274040/toolkit/content/xul.css =================================================================== ---- firefox-44.0~a2~hg20151207r291794.orig/toolkit/content/xul.css 2015-12-08 05:37:22.000000000 +0000 -+++ firefox-44.0~a2~hg20151207r291794/toolkit/content/xul.css 2015-12-09 22:34:37.000000000 +0000 +--- firefox-trunk-45.0~a1~hg20151125r274040.orig/toolkit/content/xul.css 2015-11-26 00:46:44.677069351 +0000 ++++ firefox-trunk-45.0~a1~hg20151125r274040/toolkit/content/xul.css 2015-11-26 00:46:44.577068690 +0000 @@ -315,6 +315,18 @@ } %endif @@ -71,10 +71,10 @@ Index: firefox-44.0~a2~hg20151207r291794/toolkit/content/xul.css toolbarseparator { -moz-binding: url("chrome://global/content/bindings/toolbar.xml#toolbardecoration"); } -Index: firefox-44.0~a2~hg20151207r291794/widget/gtk/nsDbusmenu.cpp +Index: firefox-trunk-45.0~a1~hg20151125r274040/widget/gtk/nsDbusmenu.cpp =================================================================== --- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ firefox-44.0~a2~hg20151207r291794/widget/gtk/nsDbusmenu.cpp 2015-12-09 22:34:37.000000000 +0000 ++++ firefox-trunk-45.0~a1~hg20151125r274040/widget/gtk/nsDbusmenu.cpp 2015-11-26 00:46:44.577068690 +0000 @@ -0,0 +1,63 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ +/* vim:expandtab:shiftwidth=4:tabstop=4: @@ -139,10 +139,10 @@ Index: firefox-44.0~a2~hg20151207r291794/widget/gtk/nsDbusmenu.cpp + + return NS_OK; +} -Index: firefox-44.0~a2~hg20151207r291794/widget/gtk/nsDbusmenu.h +Index: firefox-trunk-45.0~a1~hg20151125r274040/widget/gtk/nsDbusmenu.h =================================================================== --- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ firefox-44.0~a2~hg20151207r291794/widget/gtk/nsDbusmenu.h 2015-12-09 22:34:37.000000000 +0000 ++++ firefox-trunk-45.0~a1~hg20151125r274040/widget/gtk/nsDbusmenu.h 2015-11-26 00:46:44.577068690 +0000 @@ -0,0 +1,99 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ +/* vim:expandtab:shiftwidth=4:tabstop=4: @@ -243,10 +243,10 @@ Index: firefox-44.0~a2~hg20151207r291794/widget/gtk/nsDbusmenu.h +#define dbusmenu_menuitem_property_set_shortcut nsDbusmenuFunctions::s_dbusmenu_menuitem_property_set_shortcut + +#endif /* __nsDbusmenu_h__ */ -Index: firefox-44.0~a2~hg20151207r291794/widget/gtk/nsMenu.cpp +Index: firefox-trunk-45.0~a1~hg20151125r274040/widget/gtk/nsMenu.cpp =================================================================== --- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ firefox-44.0~a2~hg20151207r291794/widget/gtk/nsMenu.cpp 2015-12-09 22:34:37.000000000 +0000 ++++ firefox-trunk-45.0~a1~hg20151125r274040/widget/gtk/nsMenu.cpp 2015-11-26 00:46:44.577068690 +0000 @@ -0,0 +1,866 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ +/* vim:expandtab:shiftwidth=4:tabstop=4: @@ -1114,10 +1114,10 @@ Index: firefox-44.0~a2~hg20151207r291794/widget/gtk/nsMenu.cpp + + MaybeAddPlaceholderItem(); +} -Index: firefox-44.0~a2~hg20151207r291794/widget/gtk/nsMenu.h +Index: firefox-trunk-45.0~a1~hg20151125r274040/widget/gtk/nsMenu.h =================================================================== --- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ firefox-44.0~a2~hg20151207r291794/widget/gtk/nsMenu.h 2015-12-09 22:34:37.000000000 +0000 ++++ firefox-trunk-45.0~a1~hg20151125r274040/widget/gtk/nsMenu.h 2015-11-26 00:46:44.577068690 +0000 @@ -0,0 +1,166 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ +/* vim:expandtab:shiftwidth=4:tabstop=4: @@ -1285,10 +1285,10 @@ Index: firefox-44.0~a2~hg20151207r291794/widget/gtk/nsMenu.h +}; + +#endif /* __nsMenu_h__ */ -Index: firefox-44.0~a2~hg20151207r291794/widget/gtk/nsMenuBar.cpp +Index: firefox-trunk-45.0~a1~hg20151125r274040/widget/gtk/nsMenuBar.cpp =================================================================== --- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ firefox-44.0~a2~hg20151207r291794/widget/gtk/nsMenuBar.cpp 2015-12-09 22:34:37.000000000 +0000 ++++ firefox-trunk-45.0~a1~hg20151125r274040/widget/gtk/nsMenuBar.cpp 2015-11-26 00:46:44.577068690 +0000 @@ -0,0 +1,545 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ +/* vim:expandtab:shiftwidth=4:tabstop=4: @@ -1835,10 +1835,10 @@ Index: firefox-44.0~a2~hg20151207r291794/widget/gtk/nsMenuBar.cpp + DebugOnly<nsresult> rv = RemoveChild(aChild); + NS_ASSERTION(NS_SUCCEEDED(rv), "Failed to remove item from menubar"); +} -Index: firefox-44.0~a2~hg20151207r291794/widget/gtk/nsMenuBar.h +Index: firefox-trunk-45.0~a1~hg20151125r274040/widget/gtk/nsMenuBar.h =================================================================== --- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ firefox-44.0~a2~hg20151207r291794/widget/gtk/nsMenuBar.h 2015-12-09 22:34:37.000000000 +0000 ++++ firefox-trunk-45.0~a1~hg20151125r274040/widget/gtk/nsMenuBar.h 2015-11-26 00:46:44.577068690 +0000 @@ -0,0 +1,112 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ +/* vim:expandtab:shiftwidth=4:tabstop=4: @@ -1952,10 +1952,10 @@ Index: firefox-44.0~a2~hg20151207r291794/widget/gtk/nsMenuBar.h +}; + +#endif /* __nsMenuBar_h__ */ -Index: firefox-44.0~a2~hg20151207r291794/widget/gtk/nsMenuContainer.cpp +Index: firefox-trunk-45.0~a1~hg20151125r274040/widget/gtk/nsMenuContainer.cpp =================================================================== --- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ firefox-44.0~a2~hg20151207r291794/widget/gtk/nsMenuContainer.cpp 2015-12-09 22:34:37.000000000 +0000 ++++ firefox-trunk-45.0~a1~hg20151125r274040/widget/gtk/nsMenuContainer.cpp 2015-11-26 00:46:44.577068690 +0000 @@ -0,0 +1,174 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ +/* vim:expandtab:shiftwidth=4:tabstop=4: @@ -2131,10 +2131,10 @@ Index: firefox-44.0~a2~hg20151207r291794/widget/gtk/nsMenuContainer.cpp + + return aContent; +} -Index: firefox-44.0~a2~hg20151207r291794/widget/gtk/nsMenuContainer.h +Index: firefox-trunk-45.0~a1~hg20151125r274040/widget/gtk/nsMenuContainer.h =================================================================== --- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ firefox-44.0~a2~hg20151207r291794/widget/gtk/nsMenuContainer.h 2015-12-09 22:34:37.000000000 +0000 ++++ firefox-trunk-45.0~a1~hg20151125r274040/widget/gtk/nsMenuContainer.h 2015-11-26 00:46:44.581068717 +0000 @@ -0,0 +1,66 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ +/* vim:expandtab:shiftwidth=4:tabstop=4: @@ -2202,10 +2202,10 @@ Index: firefox-44.0~a2~hg20151207r291794/widget/gtk/nsMenuContainer.h +}; + +#endif /* __nsMenuContainer_h__ */ -Index: firefox-44.0~a2~hg20151207r291794/widget/gtk/nsMenuItem.cpp +Index: firefox-trunk-45.0~a1~hg20151125r274040/widget/gtk/nsMenuItem.cpp =================================================================== --- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ firefox-44.0~a2~hg20151207r291794/widget/gtk/nsMenuItem.cpp 2015-12-09 22:34:37.000000000 +0000 ++++ firefox-trunk-45.0~a1~hg20151125r274040/widget/gtk/nsMenuItem.cpp 2015-11-26 00:46:44.581068717 +0000 @@ -0,0 +1,742 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ +/* vim:expandtab:shiftwidth=4:tabstop=4: @@ -2949,10 +2949,10 @@ Index: firefox-44.0~a2~hg20151207r291794/widget/gtk/nsMenuItem.cpp + UpdateIcon(sc); + } +} -Index: firefox-44.0~a2~hg20151207r291794/widget/gtk/nsMenuItem.h +Index: firefox-trunk-45.0~a1~hg20151125r274040/widget/gtk/nsMenuItem.h =================================================================== --- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ firefox-44.0~a2~hg20151207r291794/widget/gtk/nsMenuItem.h 2015-12-09 22:34:37.000000000 +0000 ++++ firefox-trunk-45.0~a1~hg20151125r274040/widget/gtk/nsMenuItem.h 2015-11-26 00:46:44.585068743 +0000 @@ -0,0 +1,107 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ +/* vim:expandtab:shiftwidth=4:tabstop=4: @@ -3061,11 +3061,11 @@ Index: firefox-44.0~a2~hg20151207r291794/widget/gtk/nsMenuItem.h +}; + +#endif /* __nsMenuItem_h__ */ -Index: firefox-44.0~a2~hg20151207r291794/widget/gtk/nsMenuObject.cpp +Index: firefox-trunk-45.0~a1~hg20151125r274040/widget/gtk/nsMenuObject.cpp =================================================================== --- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ firefox-44.0~a2~hg20151207r291794/widget/gtk/nsMenuObject.cpp 2015-12-09 22:34:37.000000000 +0000 -@@ -0,0 +1,707 @@ ++++ firefox-trunk-45.0~a1~hg20151125r274040/widget/gtk/nsMenuObject.cpp 2015-11-26 11:48:32.781061404 +0000 +@@ -0,0 +1,709 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ +/* vim:expandtab:shiftwidth=4:tabstop=4: + */ @@ -3154,8 +3154,7 @@ Index: firefox-44.0~a2~hg20151207r291794/widget/gtk/nsMenuObject.cpp + NS_DECL_ISUPPORTS + NS_DECL_IMGINOTIFICATIONOBSERVER + -+ nsMenuObjectIconLoader(nsMenuObject *aOwner) : mOwner(aOwner), -+ mIconLoaded(false) { }; ++ nsMenuObjectIconLoader(nsMenuObject *aOwner) : mOwner(aOwner) { }; + + void LoadIcon(nsStyleContext *aStyleContext); + void Destroy(); @@ -3167,7 +3166,6 @@ Index: firefox-44.0~a2~hg20151207r291794/widget/gtk/nsMenuObject.cpp + RefPtr<imgRequestProxy> mImageRequest; + nsCOMPtr<nsIURI> mURI; + nsIntRect mImageRect; -+ bool mIconLoaded; +}; + +NS_IMPL_ISUPPORTS(nsMenuObjectIconLoader, imgINotificationObserver) @@ -3184,6 +3182,27 @@ Index: firefox-44.0~a2~hg20151207r291794/widget/gtk/nsMenuObject.cpp + return NS_ERROR_FAILURE; + } + ++ if (aType == imgINotificationObserver::LOAD_COMPLETE) { ++ uint32_t status = imgIRequest::STATUS_ERROR; ++ if (NS_FAILED(mImageRequest->GetImageStatus(&status)) || ++ (status & imgIRequest::STATUS_ERROR)) { ++ mImageRequest->Cancel(NS_BINDING_ABORTED); ++ mImageRequest = nullptr; ++ return NS_ERROR_FAILURE; ++ } ++ ++ nsCOMPtr<imgIContainer> image; ++ mImageRequest->GetImage(getter_AddRefs(image)); ++ MOZ_ASSERT(image); ++ ++ // Ask the image to decode at its intrinsic size. ++ int32_t width = 0, height = 0; ++ image->GetWidth(&width); ++ image->GetHeight(&height); ++ image->RequestDecodeForSize(nsIntSize(width, height), imgIContainer::FLAG_NONE); ++ return NS_OK; ++ } ++ + if (aType == imgINotificationObserver::DECODE_COMPLETE) { + mImageRequest->Cancel(NS_BINDING_ABORTED); + mImageRequest = nullptr; @@ -3194,12 +3213,6 @@ Index: firefox-44.0~a2~hg20151207r291794/widget/gtk/nsMenuObject.cpp + return NS_OK; + } + -+ if (mIconLoaded) { -+ return NS_OK; -+ } -+ -+ mIconLoaded = true; -+ + nsCOMPtr<imgIContainer> img; + mImageRequest->GetImage(getter_AddRefs(img)); + if (!img) { @@ -3295,8 +3308,6 @@ Index: firefox-44.0~a2~hg20151207r291794/widget/gtk/nsMenuObject.cpp + mImageRequest = nullptr; + } + -+ mIconLoaded = false; -+ + mURI = uri; + + if (imageRequest) { @@ -3318,15 +3329,6 @@ Index: firefox-44.0~a2~hg20151207r291794/widget/gtk/nsMenuObject.cpp + nsIContentPolicy::TYPE_IMAGE, EmptyString(), + getter_AddRefs(mImageRequest)); + } -+ -+ if (!mIconLoaded) { -+ if (!mImageRequest) { -+ NS_WARNING("Failed to load icon"); -+ return; -+ } -+ -+ mImageRequest->RequestDecode(); -+ } +} + +void @@ -3773,10 +3775,10 @@ Index: firefox-44.0~a2~hg20151207r291794/widget/gtk/nsMenuObject.cpp + weak = weak->GetPrevious(); + } +} -Index: firefox-44.0~a2~hg20151207r291794/widget/gtk/nsMenuObject.h +Index: firefox-trunk-45.0~a1~hg20151125r274040/widget/gtk/nsMenuObject.h =================================================================== --- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ firefox-44.0~a2~hg20151207r291794/widget/gtk/nsMenuObject.h 2015-12-09 22:34:37.000000000 +0000 ++++ firefox-trunk-45.0~a1~hg20151125r274040/widget/gtk/nsMenuObject.h 2015-11-26 00:46:44.585068743 +0000 @@ -0,0 +1,242 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ +/* vim:expandtab:shiftwidth=4:tabstop=4: @@ -4020,10 +4022,10 @@ Index: firefox-44.0~a2~hg20151207r291794/widget/gtk/nsMenuObject.h +}; + +#endif /* __nsMenuObject_h__ */ -Index: firefox-44.0~a2~hg20151207r291794/widget/gtk/nsMenuSeparator.cpp +Index: firefox-trunk-45.0~a1~hg20151125r274040/widget/gtk/nsMenuSeparator.cpp =================================================================== --- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ firefox-44.0~a2~hg20151207r291794/widget/gtk/nsMenuSeparator.cpp 2015-12-09 22:34:37.000000000 +0000 ++++ firefox-trunk-45.0~a1~hg20151125r274040/widget/gtk/nsMenuSeparator.cpp 2015-11-26 00:46:44.585068743 +0000 @@ -0,0 +1,90 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ +/* vim:expandtab:shiftwidth=4:tabstop=4: @@ -4115,10 +4117,10 @@ Index: firefox-44.0~a2~hg20151207r291794/widget/gtk/nsMenuSeparator.cpp + UpdateVisibility(sc); + } +} -Index: firefox-44.0~a2~hg20151207r291794/widget/gtk/nsMenuSeparator.h +Index: firefox-trunk-45.0~a1~hg20151125r274040/widget/gtk/nsMenuSeparator.h =================================================================== --- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ firefox-44.0~a2~hg20151207r291794/widget/gtk/nsMenuSeparator.h 2015-12-09 22:34:37.000000000 +0000 ++++ firefox-trunk-45.0~a1~hg20151125r274040/widget/gtk/nsMenuSeparator.h 2015-11-26 00:46:44.585068743 +0000 @@ -0,0 +1,41 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ +/* vim:expandtab:shiftwidth=4:tabstop=4: @@ -4161,10 +4163,10 @@ Index: firefox-44.0~a2~hg20151207r291794/widget/gtk/nsMenuSeparator.h +}; + +#endif /* __nsMenuSeparator_h__ */ -Index: firefox-44.0~a2~hg20151207r291794/widget/gtk/nsNativeMenuAtomList.h +Index: firefox-trunk-45.0~a1~hg20151125r274040/widget/gtk/nsNativeMenuAtomList.h =================================================================== --- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ firefox-44.0~a2~hg20151207r291794/widget/gtk/nsNativeMenuAtomList.h 2015-12-09 22:34:37.000000000 +0000 ++++ firefox-trunk-45.0~a1~hg20151125r274040/widget/gtk/nsNativeMenuAtomList.h 2015-11-26 00:46:44.585068743 +0000 @@ -0,0 +1,11 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ +/* vim:expandtab:shiftwidth=4:tabstop=4: @@ -4177,10 +4179,10 @@ Index: firefox-44.0~a2~hg20151207r291794/widget/gtk/nsNativeMenuAtomList.h +WIDGET_ATOM2(_moz_menupopupstate, "_moz-menupopupstate") +WIDGET_ATOM(openedwithkey) +WIDGET_ATOM(shellshowingmenubar) -Index: firefox-44.0~a2~hg20151207r291794/widget/gtk/nsNativeMenuAtoms.cpp +Index: firefox-trunk-45.0~a1~hg20151125r274040/widget/gtk/nsNativeMenuAtoms.cpp =================================================================== --- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ firefox-44.0~a2~hg20151207r291794/widget/gtk/nsNativeMenuAtoms.cpp 2015-12-09 22:34:37.000000000 +0000 ++++ firefox-trunk-45.0~a1~hg20151125r274040/widget/gtk/nsNativeMenuAtoms.cpp 2015-11-26 00:46:44.589068769 +0000 @@ -0,0 +1,39 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ +/* vim:expandtab:shiftwidth=4:tabstop=4: @@ -4221,10 +4223,10 @@ Index: firefox-44.0~a2~hg20151207r291794/widget/gtk/nsNativeMenuAtoms.cpp +{ + NS_RegisterStaticAtoms(gAtoms); +} -Index: firefox-44.0~a2~hg20151207r291794/widget/gtk/nsNativeMenuAtoms.h +Index: firefox-trunk-45.0~a1~hg20151125r274040/widget/gtk/nsNativeMenuAtoms.h =================================================================== --- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ firefox-44.0~a2~hg20151207r291794/widget/gtk/nsNativeMenuAtoms.h 2015-12-09 22:34:37.000000000 +0000 ++++ firefox-trunk-45.0~a1~hg20151125r274040/widget/gtk/nsNativeMenuAtoms.h 2015-11-26 00:46:44.589068769 +0000 @@ -0,0 +1,25 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ +/* vim:expandtab:shiftwidth=4:tabstop=4: @@ -4251,10 +4253,10 @@ Index: firefox-44.0~a2~hg20151207r291794/widget/gtk/nsNativeMenuAtoms.h +}; + +#endif /* __nsNativeMenuAtoms_h__ */ -Index: firefox-44.0~a2~hg20151207r291794/widget/gtk/nsNativeMenuDocListener.cpp +Index: firefox-trunk-45.0~a1~hg20151125r274040/widget/gtk/nsNativeMenuDocListener.cpp =================================================================== --- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ firefox-44.0~a2~hg20151207r291794/widget/gtk/nsNativeMenuDocListener.cpp 2015-12-09 22:34:37.000000000 +0000 ++++ firefox-trunk-45.0~a1~hg20151125r274040/widget/gtk/nsNativeMenuDocListener.cpp 2015-11-26 00:46:44.589068769 +0000 @@ -0,0 +1,370 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ +/* vim:expandtab:shiftwidth=4:tabstop=4: @@ -4626,10 +4628,10 @@ Index: firefox-44.0~a2~hg20151207r291794/widget/gtk/nsNativeMenuDocListener.cpp + CancelFlush(this); + mPendingMutations.Clear(); +} -Index: firefox-44.0~a2~hg20151207r291794/widget/gtk/nsNativeMenuDocListener.h +Index: firefox-trunk-45.0~a1~hg20151125r274040/widget/gtk/nsNativeMenuDocListener.h =================================================================== --- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ firefox-44.0~a2~hg20151207r291794/widget/gtk/nsNativeMenuDocListener.h 2015-12-09 22:34:37.000000000 +0000 ++++ firefox-trunk-45.0~a1~hg20151125r274040/widget/gtk/nsNativeMenuDocListener.h 2015-11-26 00:46:44.589068769 +0000 @@ -0,0 +1,153 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ +/* vim:expandtab:shiftwidth=4:tabstop=4: @@ -4784,10 +4786,10 @@ Index: firefox-44.0~a2~hg20151207r291794/widget/gtk/nsNativeMenuDocListener.h +}; + +#endif /* __nsNativeMenuDocListener_h__ */ -Index: firefox-44.0~a2~hg20151207r291794/widget/gtk/nsNativeMenuService.cpp +Index: firefox-trunk-45.0~a1~hg20151125r274040/widget/gtk/nsNativeMenuService.cpp =================================================================== --- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ firefox-44.0~a2~hg20151207r291794/widget/gtk/nsNativeMenuService.cpp 2015-12-09 22:34:37.000000000 +0000 ++++ firefox-trunk-45.0~a1~hg20151125r274040/widget/gtk/nsNativeMenuService.cpp 2015-11-26 00:46:44.589068769 +0000 @@ -0,0 +1,506 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ +/* vim:expandtab:shiftwidth=4:tabstop=4: @@ -5295,10 +5297,10 @@ Index: firefox-44.0~a2~hg20151207r291794/widget/gtk/nsNativeMenuService.cpp + + return NS_OK; +} -Index: firefox-44.0~a2~hg20151207r291794/widget/gtk/nsNativeMenuService.h +Index: firefox-trunk-45.0~a1~hg20151125r274040/widget/gtk/nsNativeMenuService.h =================================================================== --- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ firefox-44.0~a2~hg20151207r291794/widget/gtk/nsNativeMenuService.h 2015-12-09 22:34:37.000000000 +0000 ++++ firefox-trunk-45.0~a1~hg20151125r274040/widget/gtk/nsNativeMenuService.h 2015-11-26 00:46:44.589068769 +0000 @@ -0,0 +1,88 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ +/* vim:expandtab:shiftwidth=4:tabstop=4: @@ -5388,10 +5390,10 @@ Index: firefox-44.0~a2~hg20151207r291794/widget/gtk/nsNativeMenuService.h +}; + +#endif /* __nsNativeMenuService_h__ */ -Index: firefox-44.0~a2~hg20151207r291794/widget/gtk/nsNativeMenuUtils.h +Index: firefox-trunk-45.0~a1~hg20151125r274040/widget/gtk/nsNativeMenuUtils.h =================================================================== --- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ firefox-44.0~a2~hg20151207r291794/widget/gtk/nsNativeMenuUtils.h 2015-12-09 22:34:37.000000000 +0000 ++++ firefox-trunk-45.0~a1~hg20151125r274040/widget/gtk/nsNativeMenuUtils.h 2015-11-26 00:46:44.589068769 +0000 @@ -0,0 +1,59 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ +/* vim:expandtab:shiftwidth=4:tabstop=4: @@ -5452,10 +5454,10 @@ Index: firefox-44.0~a2~hg20151207r291794/widget/gtk/nsNativeMenuUtils.h +}; + +#endif /* __nsNativeMenuUtils_h__ */ -Index: firefox-44.0~a2~hg20151207r291794/widget/gtk/nsWidgetFactory.cpp +Index: firefox-trunk-45.0~a1~hg20151125r274040/widget/gtk/nsWidgetFactory.cpp =================================================================== ---- firefox-44.0~a2~hg20151207r291794.orig/widget/gtk/nsWidgetFactory.cpp 2015-12-08 05:37:43.000000000 +0000 -+++ firefox-44.0~a2~hg20151207r291794/widget/gtk/nsWidgetFactory.cpp 2015-12-09 22:34:37.000000000 +0000 +--- firefox-trunk-45.0~a1~hg20151125r274040.orig/widget/gtk/nsWidgetFactory.cpp 2015-11-26 00:46:44.677069351 +0000 ++++ firefox-trunk-45.0~a1~hg20151125r274040/widget/gtk/nsWidgetFactory.cpp 2015-11-26 00:46:44.589068769 +0000 @@ -49,6 +49,9 @@ #include "GfxInfoX11.h" #endif @@ -5524,11 +5526,11 @@ Index: firefox-44.0~a2~hg20151207r291794/widget/gtk/nsWidgetFactory.cpp nsWidgetGtk2ModuleDtor }; -Index: firefox-44.0~a2~hg20151207r291794/widget/gtk/nsWindow.cpp +Index: firefox-trunk-45.0~a1~hg20151125r274040/widget/gtk/nsWindow.cpp =================================================================== ---- firefox-44.0~a2~hg20151207r291794.orig/widget/gtk/nsWindow.cpp 2015-12-08 05:37:43.000000000 +0000 -+++ firefox-44.0~a2~hg20151207r291794/widget/gtk/nsWindow.cpp 2015-12-09 22:34:37.000000000 +0000 -@@ -5033,6 +5033,11 @@ +--- firefox-trunk-45.0~a1~hg20151125r274040.orig/widget/gtk/nsWindow.cpp 2015-11-26 00:46:44.677069351 +0000 ++++ firefox-trunk-45.0~a1~hg20151125r274040/widget/gtk/nsWindow.cpp 2015-11-26 00:46:44.593068796 +0000 +@@ -5034,6 +5034,11 @@ return NS_OK; } @@ -5540,10 +5542,10 @@ Index: firefox-44.0~a2~hg20151207r291794/widget/gtk/nsWindow.cpp bool nsWindow::CheckForRollup(gdouble aMouseX, gdouble aMouseY, bool aIsWheel, bool aAlwaysRollup) -Index: firefox-44.0~a2~hg20151207r291794/widget/gtk/nsWindow.h +Index: firefox-trunk-45.0~a1~hg20151125r274040/widget/gtk/nsWindow.h =================================================================== ---- firefox-44.0~a2~hg20151207r291794.orig/widget/gtk/nsWindow.h 2015-12-08 05:37:43.000000000 +0000 -+++ firefox-44.0~a2~hg20151207r291794/widget/gtk/nsWindow.h 2015-12-09 22:34:37.000000000 +0000 +--- firefox-trunk-45.0~a1~hg20151125r274040.orig/widget/gtk/nsWindow.h 2015-11-26 00:46:44.677069351 +0000 ++++ firefox-trunk-45.0~a1~hg20151125r274040/widget/gtk/nsWindow.h 2015-11-26 00:46:44.601068848 +0000 @@ -35,6 +35,8 @@ #include "IMContextWrapper.h" @@ -5562,7 +5564,7 @@ Index: firefox-44.0~a2~hg20151207r291794/widget/gtk/nsWindow.h /** * GetLastUserInputTime returns a timestamp for the most recent user input * event. This is intended for pointer grab requests (including drags). -@@ -548,6 +552,8 @@ +@@ -546,6 +550,8 @@ RefPtr<mozilla::widget::IMContextWrapper> mIMContext; nsAutoPtr<mozilla::CurrentX11TimeGetter> mCurrentTimeGetter; @@ -5571,10 +5573,10 @@ Index: firefox-44.0~a2~hg20151207r291794/widget/gtk/nsWindow.h }; class nsChildWindow : public nsWindow { -Index: firefox-44.0~a2~hg20151207r291794/xpfe/appshell/nsWebShellWindow.cpp +Index: firefox-trunk-45.0~a1~hg20151125r274040/xpfe/appshell/nsWebShellWindow.cpp =================================================================== ---- firefox-44.0~a2~hg20151207r291794.orig/xpfe/appshell/nsWebShellWindow.cpp 2015-12-08 05:37:50.000000000 +0000 -+++ firefox-44.0~a2~hg20151207r291794/xpfe/appshell/nsWebShellWindow.cpp 2015-12-09 22:34:37.000000000 +0000 +--- firefox-trunk-45.0~a1~hg20151125r274040.orig/xpfe/appshell/nsWebShellWindow.cpp 2015-11-26 00:46:44.677069351 +0000 ++++ firefox-trunk-45.0~a1~hg20151125r274040/xpfe/appshell/nsWebShellWindow.cpp 2015-11-26 00:46:44.605068876 +0000 @@ -58,6 +58,7 @@ #include "nsIScreen.h" @@ -5604,10 +5606,10 @@ Index: firefox-44.0~a2~hg20151207r291794/xpfe/appshell/nsWebShellWindow.cpp nms->CreateNativeMenuBar(aParentWindow, menubarContent); } else { nms->CreateNativeMenuBar(aParentWindow, nullptr); -Index: firefox-44.0~a2~hg20151207r291794/widget/gtk/moz.build +Index: firefox-trunk-45.0~a1~hg20151125r274040/widget/gtk/moz.build =================================================================== ---- firefox-44.0~a2~hg20151207r291794.orig/widget/gtk/moz.build 2015-12-08 05:37:43.000000000 +0000 -+++ firefox-44.0~a2~hg20151207r291794/widget/gtk/moz.build 2015-12-09 22:34:37.000000000 +0000 +--- firefox-trunk-45.0~a1~hg20151125r274040.orig/widget/gtk/moz.build 2015-11-26 00:46:44.677069351 +0000 ++++ firefox-trunk-45.0~a1~hg20151125r274040/widget/gtk/moz.build 2015-11-26 00:46:44.605068876 +0000 @@ -24,10 +24,18 @@ 'nsAppShell.cpp', 'nsBidiKeyboard.cpp', @@ -5644,11 +5646,11 @@ Index: firefox-44.0~a2~hg20151207r291794/widget/gtk/moz.build '/layout/xul', '/other-licenses/atk-1.0', '/widget', -Index: firefox-44.0~a2~hg20151207r291794/browser/base/content/browser.js +Index: firefox-trunk-45.0~a1~hg20151125r274040/browser/base/content/browser.js =================================================================== ---- firefox-44.0~a2~hg20151207r291794.orig/browser/base/content/browser.js 2015-12-08 05:35:46.000000000 +0000 -+++ firefox-44.0~a2~hg20151207r291794/browser/base/content/browser.js 2015-12-09 22:34:37.000000000 +0000 -@@ -5010,6 +5010,8 @@ +--- firefox-trunk-45.0~a1~hg20151125r274040.orig/browser/base/content/browser.js 2015-11-26 00:46:44.677069351 +0000 ++++ firefox-trunk-45.0~a1~hg20151125r274040/browser/base/content/browser.js 2015-11-26 00:46:44.605068876 +0000 +@@ -5006,6 +5006,8 @@ let toolbarNodes = Array.slice(gNavToolbox.childNodes); toolbarNodes = toolbarNodes.concat(gNavToolbox.externalToolbars); toolbarNodes = toolbarNodes.filter(node => node.getAttribute("toolbarname")); @@ -5657,10 +5659,10 @@ Index: firefox-44.0~a2~hg20151207r291794/browser/base/content/browser.js return toolbarNodes; } -Index: firefox-44.0~a2~hg20151207r291794/widget/moz.build +Index: firefox-trunk-45.0~a1~hg20151125r274040/widget/moz.build =================================================================== ---- firefox-44.0~a2~hg20151207r291794.orig/widget/moz.build 2015-12-08 05:37:43.000000000 +0000 -+++ firefox-44.0~a2~hg20151207r291794/widget/moz.build 2015-12-09 22:34:37.000000000 +0000 +--- firefox-trunk-45.0~a1~hg20151125r274040.orig/widget/moz.build 2015-11-26 00:46:44.677069351 +0000 ++++ firefox-trunk-45.0~a1~hg20151125r274040/widget/moz.build 2015-11-26 00:46:44.609068902 +0000 @@ -37,10 +37,12 @@ 'nsITaskbarProgress.idl', ] @@ -5675,10 +5677,10 @@ Index: firefox-44.0~a2~hg20151207r291794/widget/moz.build TEST_DIRS += ['tests'] # Don't build the DSO under the 'build' directory as windows does. -Index: firefox-44.0~a2~hg20151207r291794/modules/libpref/init/all.js +Index: firefox-trunk-45.0~a1~hg20151125r274040/modules/libpref/init/all.js =================================================================== ---- firefox-44.0~a2~hg20151207r291794.orig/modules/libpref/init/all.js 2015-12-08 05:37:24.000000000 +0000 -+++ firefox-44.0~a2~hg20151207r291794/modules/libpref/init/all.js 2015-12-09 22:34:37.000000000 +0000 +--- firefox-trunk-45.0~a1~hg20151125r274040.orig/modules/libpref/init/all.js 2015-11-26 00:46:44.677069351 +0000 ++++ firefox-trunk-45.0~a1~hg20151125r274040/modules/libpref/init/all.js 2015-11-26 00:46:44.609068902 +0000 @@ -217,6 +217,9 @@ pref("browser.sessionhistory.max_total_viewers", -1); @@ -5689,22 +5691,10 @@ Index: firefox-44.0~a2~hg20151207r291794/modules/libpref/init/all.js pref("ui.click_hold_context_menus", false); // Duration of timeout of incremental search in menus (ms). 0 means infinite. pref("ui.menu.incremental_search.timeout", 1000); -Index: firefox-44.0~a2~hg20151207r291794/widget/gtk/nsScreenGtk.cpp +Index: firefox-trunk-45.0~a1~hg20151125r274040/widget/gtk/nsIdleServiceGTK.cpp =================================================================== ---- firefox-44.0~a2~hg20151207r291794.orig/widget/gtk/nsScreenGtk.cpp 2015-12-08 05:37:43.000000000 +0000 -+++ firefox-44.0~a2~hg20151207r291794/widget/gtk/nsScreenGtk.cpp 2015-12-09 22:35:28.665445270 +0000 -@@ -13,6 +13,7 @@ - #include <gtk/gtk.h> - #include <dlfcn.h> - #include "gfxPlatformGtk.h" -+#include "nsIWidget.h" - - static uint32_t sScreenId = 0; - -Index: firefox-44.0~a2~hg20151207r291794/widget/gtk/nsIdleServiceGTK.cpp -=================================================================== ---- firefox-44.0~a2~hg20151207r291794.orig/widget/gtk/nsIdleServiceGTK.cpp 2015-12-08 05:37:43.000000000 +0000 -+++ firefox-44.0~a2~hg20151207r291794/widget/gtk/nsIdleServiceGTK.cpp 2015-12-09 22:36:46.577798732 +0000 +--- firefox-trunk-45.0~a1~hg20151125r274040.orig/widget/gtk/nsIdleServiceGTK.cpp 2015-11-26 00:46:44.677069351 +0000 ++++ firefox-trunk-45.0~a1~hg20151125r274040/widget/gtk/nsIdleServiceGTK.cpp 2015-11-26 00:46:44.609068902 +0000 @@ -13,6 +13,8 @@ #include "prlink.h" #include "mozilla/Logging.h" @@ -5714,3 +5704,15 @@ Index: firefox-44.0~a2~hg20151207r291794/widget/gtk/nsIdleServiceGTK.cpp static PRLogModuleInfo* sIdleLog = nullptr; typedef bool (*_XScreenSaverQueryExtension_fn)(Display* dpy, int* event_base, +Index: firefox-trunk-45.0~a1~hg20151125r274040/widget/gtk/nsScreenGtk.cpp +=================================================================== +--- firefox-trunk-45.0~a1~hg20151125r274040.orig/widget/gtk/nsScreenGtk.cpp 2015-11-26 00:46:44.677069351 +0000 ++++ firefox-trunk-45.0~a1~hg20151125r274040/widget/gtk/nsScreenGtk.cpp 2015-11-26 00:46:44.613068928 +0000 +@@ -13,6 +13,7 @@ + #include <gtk/gtk.h> + #include <dlfcn.h> + #include "gfxPlatformGtk.h" ++#include "nsIWidget.h" + + static uint32_t sScreenId = 0; + |