Commit Graph

443902 Commits

Author SHA1 Message Date
Wes Kocher
75ff20f5af Backed out changeset 91d4539e00ce (bug 1207245)
--HG--
rename : mfbt/RefPtr.h => mfbt/nsRefPtr.h
2015-10-07 10:19:19 -07:00
Wes Kocher
30380a5787 Backed out changeset 263526a3368d (bug 1207245) 2015-10-07 10:19:07 -07:00
Wes Kocher
94c9c0fc0d Backed out changeset a45d680f073f (bug 1207245) 2015-10-07 10:19:05 -07:00
Wes Kocher
9d0985e9fd Merge fx-team to central, a=merge 2015-10-07 09:58:09 -07:00
Nathan Froyd
2e4ec377a3 Bug 1207245 - followup - use getter_AddRefs in HelpersD2D.h; r=me; a=bustage 2015-10-07 17:49:17 -04:00
Nathan Froyd
298a90a8e9 Bug 1207245 - followup - include mozilla/RefCounted.h in linker files as well; r=me; a=bustage 2015-10-07 17:22:03 -04:00
Nathan Froyd
89a69c829a Bug 1207245 - part 6 - rename nsRefPtr<T> to RefPtr<T>; r=ehsan; a=Tomcat
The bulk of this commit was generated with a script, executed at the top
level of a typical source code checkout.  The only non-machine-generated
part was modifying MFBT's moz.build to reflect the new naming.

 # The main substitution.
find . -name '*.cpp' -o -name '*.cc' -o -name '*.h' -o -name '*.mm' -o -name '*.idl'| \
    xargs perl -p -i -e '
 s/nsRefPtr\.h/RefPtr\.h/g; # handle includes
 s/nsRefPtr ?</RefPtr</g;   # handle declarations and variables
'

 # Handle a special friend declaration in gfx/layers/AtomicRefCountedWithFinalize.h.
perl -p -i -e 's/::nsRefPtr;/::RefPtr;/' gfx/layers/AtomicRefCountedWithFinalize.h

 # Handle nsRefPtr.h itself, a couple places that define constructors
 # from nsRefPtr, and code generators specially.  We do this here, rather
 # than indiscriminantly s/nsRefPtr/RefPtr/, because that would rename
 # things like nsRefPtrHashtable.
perl -p -i -e 's/nsRefPtr/RefPtr/g' \
     mfbt/nsRefPtr.h \
     xpcom/glue/nsCOMPtr.h \
     xpcom/base/OwningNonNull.h \
     ipc/ipdl/ipdl/lower.py \
     ipc/ipdl/ipdl/builtin.py \
     dom/bindings/Codegen.py \
     python/lldbutils/lldbutils/utils.py

 # In our indiscriminate substitution above, we renamed
 # nsRefPtrGetterAddRefs, the class behind getter_AddRefs.  Fix that up.
find . -name '*.cpp' -o -name '*.h' -o -name '*.idl' | \
    xargs perl -p -i -e 's/nsRefPtrGetterAddRefs/RefPtrGetterAddRefs/g'

if [ -d .git ]; then
    git mv mfbt/nsRefPtr.h mfbt/RefPtr.h
else
    hg mv mfbt/nsRefPtr.h mfbt/RefPtr.h
fi

--HG--
rename : mfbt/nsRefPtr.h => mfbt/RefPtr.h
2015-10-07 16:50:25 -04:00
Nathan Froyd
45f70b7f95 Bug 1207245 - part 6a - call AddRef/Release from nsRefPtr itself, rather than a helper; r=me 2015-10-07 15:32:51 -04:00
Nathan Froyd
8bbfcaea75 Bug 1207245 - part 5 - rename template parameters for nsRefPtrHashtable; r=ehsan
Having a template parameter conflict with a global name is terribly
inconvenient, so let's try to avoid that by renaming the 'RefPtr'
template parameter to something else.
2015-10-07 15:26:30 -04:00
Nathan Froyd
3d6b4b3ce7 Bug 1207245 - part 4 - remove RefPtr.h; r=ehsan
It has been superseded by the availability of nsRefPtr.h.
2015-10-07 15:25:11 -04:00
Nathan Froyd
1f70f620da Bug 1207245 - part 3 - switch all uses of mozilla::RefPtr<T> to nsRefPtr<T>; r=ehsan
This commit was generated using the following script, executed at the
top level of a typical source code checkout.

 # Don't modify select files in mfbt/ because it's not worth trying to
 # tease out the dependencies currently.
 #
 # Don't modify anything in media/gmp-clearkey/0.1/ because those files
 # use their own RefPtr, defined in their own RefCounted.h.
find . -name '*.cpp' -o -name '*.h' -o -name '*.mm' -o -name '*.idl'| \
    grep -v 'mfbt/RefPtr.h' | \
    grep -v 'mfbt/nsRefPtr.h' | \
    grep -v 'mfbt/RefCounted.h' | \
    grep -v 'media/gmp-clearkey/0.1/' | \
    xargs perl -p -i -e '
 s/mozilla::RefPtr/nsRefPtr/g; # handle declarations in headers
 s/\bRefPtr</nsRefPtr</g; # handle local variables in functions
 s#mozilla/RefPtr.h#mozilla/nsRefPtr.h#; # handle #includes
 s#mfbt/RefPtr.h#mfbt/nsRefPtr.h#;       # handle strange #includes
'

 # |using mozilla::RefPtr;| is OK; |using nsRefPtr;| is invalid syntax.
find . -name '*.cpp' -o -name '*.mm' | xargs sed -i -e '/using nsRefPtr/d'

 # RefPtr.h used |byRef| for dealing with COM-style outparams.
 # nsRefPtr.h uses |getter_AddRefs|.
 # Fixup that mismatch.
find . -name '*.cpp' | \
    xargs perl -p -i -e 's/byRef/getter_AddRefs/g'
2015-10-07 15:05:02 -04:00
Nathan Froyd
11ab62216b Bug 1207245 - part 2 followup - add more mozilla/RefCounted.h includes where appropriate; r=me 2015-10-07 15:04:07 -04:00
Carsten "Tomcat" Book
58e0d2ac7d Backed out 6 changesets (bug 1132203) for e10s-dt2 test failures
Backed out changeset d6e2d567d8c3 (bug 1132203)
Backed out changeset 8a90df6a9ae7 (bug 1132203)
Backed out changeset 0677c5169e05 (bug 1132203)
Backed out changeset f3023ebc9881 (bug 1132203)
Backed out changeset f00c53c8ffd4 (bug 1132203)
Backed out changeset 2a6416177736 (bug 1132203)

--HG--
extra : rebase_source : 90d20637f825c7fbd144cb5a8beb2962064c157d
2015-10-07 15:35:31 +02:00
Carsten "Tomcat" Book
36183f8b9f merge fx-team to mozilla-central a=merge 2015-10-07 11:44:06 +02:00
B2G Bumper Bot
d8541746fb Bumping manifests a=b2g-bump 2015-10-06 19:39:52 -07:00
B2G Bumper Bot
4ac257334b Bumping gaia.json for 4 gaia revision(s) a=gaia-bump
========

https://hg.mozilla.org/integration/gaia-central/rev/c00c454a571f
Author: Kevin Grandon <kevingrandon@yahoo.com>
Desc: Merge pull request #31992 from KevinGrandon/bug_1207435_carrier_web_components

Bug 1207435 - Port carrier switches to use web components

========

https://hg.mozilla.org/integration/gaia-central/rev/434d2c28734d
Author: Kevin Grandon <kevingrandon@yahoo.com>
Desc: Bug 1207435 - Port carrier switches to use web components r=gasolin

========

https://hg.mozilla.org/integration/gaia-central/rev/1cfab836f09e
Author: Yi-Fan Liao <yliao@mozilla.com>
Desc: Merge pull request #32260 from begeeben/1211767_use_the_same_naming

Bug 1211767 - [smart-system] Use the same naming for Firefox Account files as the ones in apps/system, r=ferjm

========

https://hg.mozilla.org/integration/gaia-central/rev/1b77776e845b
Author: yifan <yliao@mozilla.com>
Desc: Bug 1211767 - [smart-system] Use the same naming for Firefox Account files as the ones in apps/system
2015-10-06 19:37:01 -07:00
Wes Kocher
b89687d936 Backed out changeset 3f9ca060b8d0 (bug 1197010) for android build failures 2015-10-06 16:18:13 -07:00
Reuben Morais
94f2455f3b Bug 1197010 - Implement Android backend for createMessageCursor/createThreadCursor. r=snorp 2015-10-06 19:40:38 -03:00
B2G Bumper Bot
40e821a651 Bumping manifests a=b2g-bump 2015-10-06 12:22:13 -07:00
B2G Bumper Bot
a9fcc25b4b Bumping gaia.json for 2 gaia revision(s) a=gaia-bump
========

https://hg.mozilla.org/integration/gaia-central/rev/fe5e8fd768fc
Author: gasolin <gasolin@gmail.com>
Desc: Merge pull request #32262 from gasolin/issue-1184109

Bug 1184109 - replace Wifi 2.25x icon to fix the alignment issue, r=yzen

========

https://hg.mozilla.org/integration/gaia-central/rev/5143e3fa445f
Author: gasolin <gasolin@gmail.com>
Desc: Bug 1184109 - replace Wifi 2.25x icon to fix the alignment issue, r=yzen
2015-10-06 12:21:47 -07:00
Wes Kocher
e4f622fce4 Merge m-c to b2ginbound, a=merge 2015-10-06 12:17:21 -07:00
Wes Kocher
5f0050425a Merge b2ginbound to central, a=merge 2015-10-06 12:14:33 -07:00
Wes Kocher
994dc98801 Merge fx-team to central, a=merge 2015-10-06 12:07:33 -07:00
B2G Bumper Bot
a61722ef3f Bumping manifests a=b2g-bump 2015-10-06 11:33:18 -07:00
B2G Bumper Bot
0e3665f1e1 Bumping gaia.json for 4 gaia revision(s) a=gaia-bump
========

https://hg.mozilla.org/integration/gaia-central/rev/3e842953bc82
Author: Francisco Jordano <arcturus@ardeenelinfierno.com>
Desc: Merge pull request #32265 from arcturus/bug-1211582

Bug 1211582 Performance regression in contacts: dont add iframe, as i…

========

https://hg.mozilla.org/integration/gaia-central/rev/1f06e61db7f6
Author: Francisco Jordano <fjordano@mozilla.com>
Desc: Bug 1211582 Performance regression in contacts: dont add iframe, as it's injected on demand, but get the proper reference to the content document r=ferjm

========

https://hg.mozilla.org/integration/gaia-central/rev/8ac3bc2e4ab6
Author: No-Jun Park <npark@mozilla.com>
Desc: Merge pull request #32268 from npark-mozilla/1211904

Bug 1211904 - Imagecompare: point music tests to music-oga properly

========

https://hg.mozilla.org/integration/gaia-central/rev/eff0d09970e7
Author: No-Jun Park <npark@mozilla.com>
Desc: Bug 1211904 - Imagecompare: point music tests to music-oga properly
:
2015-10-06 11:30:26 -07:00
B2G Bumper Bot
36120e6180 Bumping manifests a=b2g-bump 2015-10-06 11:03:17 -07:00
B2G Bumper Bot
fe238e8312 Bumping gaia.json for 2 gaia revision(s) a=gaia-bump
========

https://hg.mozilla.org/integration/gaia-central/rev/5a2f16f6805e
Author: Martijn <martijn.martijn@gmail.com>
Desc: Merge pull request #32264 from mwargers/1211854

Bug 1211854 - Rewrite CardsView as a PageRegion

========

https://hg.mozilla.org/integration/gaia-central/rev/00eb7b748f66
Author: Martijn Wargers <mwargers@mozilla.com>
Desc: Bug 1211854 - Rewrite CardsView as a PageRegion
2015-10-06 11:00:25 -07:00
B2G Bumper Bot
0d8ca63f02 Bumping manifests a=b2g-bump 2015-10-06 10:38:26 -07:00
B2G Bumper Bot
9ee4ef67a6 Bumping gaia.json for 2 gaia revision(s) a=gaia-bump
========

https://hg.mozilla.org/integration/gaia-central/rev/00a594b76579
Author: Gareth Aye <gaye@mozilla.com>
Desc: Merge pull request #32271 from lissyx/bug1211083

Bug 1211083 - Also delete firefox/ in really-clean r=gaye

========

https://hg.mozilla.org/integration/gaia-central/rev/81b125b60f47
Author: Alexandre Lissy <lissyx+github@lissyx.dyndns.org>
Desc: Bug 1211083 - Also delete firefox/ in really-clean r=gaye
2015-10-06 10:35:35 -07:00
B2G Bumper Bot
22ddd99c88 Bumping manifests a=b2g-bump 2015-10-06 10:08:12 -07:00
B2G Bumper Bot
cab08402e8 Bumping gaia.json for 3 gaia revision(s) a=gaia-bump
========

https://hg.mozilla.org/integration/gaia-central/rev/32ae3240869f
Author: Yura Zenevich <yura.zenevich@gmail.com>
Desc: Merge pull request #32243 from yzen/bug-1210284

Bug 1210284 - hiding achievements for 2.5

========

https://hg.mozilla.org/integration/gaia-central/rev/72f7bb63a7fa
Author: Yura Zenevich <yzenevich@mozilla.com>
Desc: Bug 1210284 - hiding achievements for 2.5. r=gasolin, timdream

========

https://hg.mozilla.org/integration/gaia-central/rev/8abe157b54a4
Author: Wes Kocher <kwierso@gmail.com>
Desc: Revert "Merge pull request #32238 from Cwiiis/bug1210737-new-homescreen-startup-opt-order" for gij(7) failures

This reverts commit 882697838fa66da51c0a90a4f658f95b578d788b, reversing
changes made to 7de63eb140861ffcb5865fdca5f2fa1ba9f6d8c9.
2015-10-06 10:05:20 -07:00
B2G Bumper Bot
6aa3059552 Bumping manifests a=b2g-bump 2015-10-06 08:35:21 -07:00
B2G Bumper Bot
7b695d3fe1 Bumping gaia.json for 4 gaia revision(s) a=gaia-bump
========

https://hg.mozilla.org/integration/gaia-central/rev/81fac00e111e
Author: Johan Lorenzo <jlorenzo@mozilla.com>
Desc: Merge pull request #32165 from JohanLorenzo/bug-1210047

Bug 1210047 - test_system_notification_bar.py : TimeoutException: Tim…

========

https://hg.mozilla.org/integration/gaia-central/rev/42bc056ea1f5
Author: Johan Lorenzo <jlorenzo@mozilla.com>
Desc: Bug 1210047 - test_system_notification_bar.py : TimeoutException: TimeoutException: Timed out after 10.1 seconds

========

https://hg.mozilla.org/integration/gaia-central/rev/223492be5ae7
Author: Johan Lorenzo <jlorenzo@mozilla.com>
Desc: Merge pull request #32136 from JohanLorenzo/bug-1209562

Bug 1209562 - test_fmradio_frequency_dialer.py : UnicodeEncodeError: …

========

https://hg.mozilla.org/integration/gaia-central/rev/f4e00e25c130
Author: Johan Lorenzo <jlorenzo@mozilla.com>
Desc: Bug 1209562 - test_fmradio_frequency_dialer.py : UnicodeEncodeError: 'decimal' codec can't encode character u'\u2068' in position 0: invalid decimal Unicode string
2015-10-06 08:30:37 -07:00
B2G Bumper Bot
ce10c801c8 Bumping manifests a=b2g-bump 2015-10-06 08:13:58 -07:00
B2G Bumper Bot
3170c8d8f1 Bumping gaia.json for 2 gaia revision(s) a=gaia-bump
========

https://hg.mozilla.org/integration/gaia-central/rev/ea4a112483b2
Author: Michael Henretty <michael.henretty@gmail.com>
Desc: Merge pull request #30325 from mikehenrty/bug-1166075-permission-shb

Bug 1166075 - Use regular software home button for permission prompt …

========

https://hg.mozilla.org/integration/gaia-central/rev/c14c386b88fe
Author: Michael Henretty <michael.henretty@gmail.com>
Desc: Bug 1166075 - Use regular software home button for permission prompt in fullscreen mode
2015-10-06 08:10:14 -07:00
Mark Banner
a06648dbfd Bug 1208047 - Close the dropdown menu for sharing on Loop's conversation window as soon as an item is clicked, rather than leaving it open in a potentially confusing state. r=mikedeboer 2015-10-06 16:05:50 +01:00
Brian Grinstead
6d0bc49563 Bug 1211017 - Show URL as the title in worker toolboxes;r=ejpbruel
--HG--
extra : commitid : GRkbqjQHCQG
2015-10-06 08:04:36 -07:00
B2G Bumper Bot
61fa0807ad Bumping manifests a=b2g-bump 2015-10-06 07:58:40 -07:00
B2G Bumper Bot
efcd3469b4 Bumping gaia.json for 4 gaia revision(s) a=gaia-bump
========

https://hg.mozilla.org/integration/gaia-central/rev/8c9b3c40fc5e
Author: Yura Zenevich <yura.zenevich@gmail.com>
Desc: Merge pull request #32210 from yzen/bug-1209062-callscreen

Bug 1209062 - making sure that the phone number is first announced on…

========

https://hg.mozilla.org/integration/gaia-central/rev/5b516f14e583
Author: Yura Zenevich <yzenevich@mozilla.com>
Desc: Bug 1209062 - making sure that the phone number is first announced on callscreen.

========

https://hg.mozilla.org/integration/gaia-central/rev/e479ce20cf96
Author: Yura Zenevich <yura.zenevich@gmail.com>
Desc: Merge pull request #32239 from yzen/bug-1209062-appchrome

Bug 1209062 - making sure that current app's appChrome, if visible, i…

========

https://hg.mozilla.org/integration/gaia-central/rev/6ecae1f23214
Author: Yura Zenevich <yzenevich@mozilla.com>
Desc: Bug 1209062 - making sure that current app's appChrome, if visible, is owned by the statusbar.
2015-10-06 07:50:14 -07:00
B2G Bumper Bot
e31265c971 Bumping manifests a=b2g-bump 2015-10-06 07:14:00 -07:00
B2G Bumper Bot
ea6ea1feff Bumping gaia.json for 2 gaia revision(s) a=gaia-bump
========

https://hg.mozilla.org/integration/gaia-central/rev/b51675a48203
Author: No-Jun Park <npark@mozilla.com>
Desc: Merge pull request #32250 from npark-mozilla/1211679

Bug 1211679 - Set Gaia UI Test to use marionette-client = 1.0.0 and marionette-driver = 1.0.0

========

https://hg.mozilla.org/integration/gaia-central/rev/2d1820681639
Author: No-Jun Park <npark@mozilla.com>
Desc: Bug 1211679 - Set Gaia UI Test to use marionette-client = 1.0.0 and marionette-driver = 1.0.0
2015-10-06 07:05:30 -07:00
B2G Bumper Bot
b333b92277 Bumping manifests a=b2g-bump 2015-10-06 06:38:32 -07:00
B2G Bumper Bot
6909b92d8e Bumping gaia.json for 2 gaia revision(s) a=gaia-bump
========

https://hg.mozilla.org/integration/gaia-central/rev/246dd972d608
Author: Chris Lord <chrislord.net@gmail.com>
Desc: Merge pull request #32238 from Cwiiis/bug1210737-new-homescreen-startup-opt-order

Bug 1210737 - Return metadata progressively. r=gmarty

========

https://hg.mozilla.org/integration/gaia-central/rev/41bcfe26a4c1
Author: Chris Lord <chrislord.net@gmail.com>
Desc: Bug 1210737 - Return metadata progressively. r=gmarty
2015-10-06 06:35:35 -07:00
B2G Bumper Bot
5dafc37ea8 Bumping manifests a=b2g-bump 2015-10-06 06:13:37 -07:00
B2G Bumper Bot
da636a97fa Bumping gaia.json for 1 gaia revision(s) a=gaia-bump
========

https://hg.mozilla.org/integration/gaia-central/rev/b4085f51e089
Author: BavarianTomcat <tomcat@mozilla.com>
Desc: Revert "Bug 1187330 - You can't have engineering apps with the spark distro" for breaking builds

This reverts commit f94285f9fbce75f9a2a8c86d0b22b63aca734789.
2015-10-06 06:10:13 -07:00
B2G Bumper Bot
17dd6267a5 Bumping manifests a=b2g-bump 2015-10-06 05:28:16 -07:00
B2G Bumper Bot
104f9b7d3d Bumping gaia.json for 2 gaia revision(s) a=gaia-bump
========

https://hg.mozilla.org/integration/gaia-central/rev/f2cd679509c4
Author: Martijn <martijn.martijn@gmail.com>
Desc: Merge pull request #32251 from mwargers/1211621

Bug 1211621 - Fix failures in tests in wait_for_cards_view

========

https://hg.mozilla.org/integration/gaia-central/rev/ad8c78229c52
Author: Martijn Wargers <mwargers@mozilla.com>
Desc: Bug 1211621 - Fix failures in tests in wait_for_cards_view
2015-10-06 05:25:22 -07:00
B2G Bumper Bot
b97df0d1ee Bumping manifests a=b2g-bump 2015-10-06 03:27:50 -07:00
Carsten "Tomcat" Book
918e7c76b4 Merge m-c to b2g-i 2015-10-06 12:24:42 +02:00
Carsten "Tomcat" Book
f21f41d902 Merge m-c to mozilla-inbound 2015-10-06 12:21:45 +02:00