Commit Graph

444362 Commits

Author SHA1 Message Date
Chris AtLee
de356dc532 Bug 1037056: Add java to flame-kk builds r=rail 2015-10-07 17:24:41 -04:00
B2G Bumper Bot
0bfd920293 Bumping manifests a=b2g-bump 2015-10-07 13:34:55 -07:00
Paolo Amadini
cec3e85a4e Bug 1179961 - Use a lock with a strikethrough for HTTP pages that have password fields in the Control Center. r=ttaubert,bgrins
--HG--
extra : commitid : 9Cv8FpIQva7
extra : rebase_source : f0d10a153b1f054141fd1caaf8423049af79f04e
2015-10-07 20:50:40 +01:00
Brian Grinstead
a520cde0b1 Bug 1212456 - Merge platform-specific aboutCertError.css files into a single shared file;r=paolo
--HG--
rename : browser/themes/osx/aboutCertError.css => browser/themes/shared/aboutCertError.css
extra : commitid : 8E8FNpzEX7I
2015-10-07 13:01:12 -07:00
B2G Bumper Bot
5db1b4301b Bumping manifests a=b2g-bump 2015-10-07 12:24:29 -07:00
Fabrice Desré
c24657023b Bug 1212089 - Cookies API broken on b2g r=billm 2015-10-07 12:05:58 -07:00
B2G Bumper Bot
718b44e010 Bumping manifests a=b2g-bump 2015-10-07 11:53:15 -07:00
Paolo Amadini
0f65d41183 Bug 1193341 - Detect presence of password fields in any subframe, flagging those on insecure connections. r=MattN
--HG--
extra : commitid : H8aypcuVLFX
extra : rebase_source : 73354a24877a4d7dcc6649f3200f9c803a6357fe
2015-10-07 19:51:33 +01:00
B2G Bumper Bot
c5dba289fa Bumping gaia.json for 2 gaia revision(s) a=gaia-bump
========

https://hg.mozilla.org/integration/gaia-central/rev/5785265eed24
Author: Wes Kocher <kwierso@gmail.com>
Desc: Re-land Cwiiis/bug1210737-new-homescreen-startup-opt-order

This reverts commit ea18563744373ebd503e7ba46fd4c7197fb66dd8.

========

https://hg.mozilla.org/integration/gaia-central/rev/dc77aa000d21
Author: Wes Kocher <kwierso@gmail.com>
Desc: Revert "Merge pull request #31910 from gmarty/Bug-1196809-Pick-best-available-icon-for-pinned-sites-on-homescreen" for breaking gij(7)

This reverts commit 8f02e2b33ff13656066137cae70abf6b22b0de99, reversing
changes made to 5ecc0634430e60f730d09b59822b9959c16d8d97.
2015-10-07 11:50:24 -07:00
David Critchley
310ba9b7a3 Bug 1209632 - Removing footer from Loop Standalone, moved Logo to mediaLayoutView. r=Standard8,ui-review=Sevaan 2015-10-07 19:48:28 +01:00
Wes Kocher
c23069f318 Merge m-c to fx-team a=merge
--HG--
rename : mobile/android/config/tooltool-manifests/android/releng.manifest => mobile/android/config/tooltool-manifests/b2gdroid/releng.manifest
extra : rebase_source : 10508628a76cecbf86b54dd2e27fca8c39cfa37b
2015-10-07 11:33:10 -07:00
B2G Bumper Bot
ad01a347ed Bumping manifests a=b2g-bump 2015-10-07 11:28:07 -07:00
B2G Bumper Bot
019f0d9196 Bumping gaia.json for 1 gaia revision(s) a=gaia-bump
========

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

This reverts commit 5ecc0634430e60f730d09b59822b9959c16d8d97, reversing
changes made to b99837aa2294348317bcae68acabe71d9a83d774.
2015-10-07 11:25:16 -07:00
Mark Banner
219eacc1d3 Bug 1212272 - 'make dist' for the Loop standalone doesn't update the css and supplementary files properly. r=dmose. NPOTB DONTBUILD 2015-10-07 19:20:03 +01:00
Wes Kocher
400e33f154 Merge m-c to b2ginbound, a=merge 2015-10-07 11:11:10 -07:00
Wes Kocher
5dc7315e7b Merge b2ginbound to central, a=merge 2015-10-07 11:04:26 -07:00
Wes Kocher
399a23b6c1 Merge inbound to m-c a=merge 2015-10-07 10:29:41 -07:00
Wes Kocher
6fa349a0de Backed out changeset bfb9436756a0 (bug 1207245) so I can merge inbound a=backout 2015-10-07 10:19:43 -07:00
Wes Kocher
92eaf64910 Backed out changeset 1f51d1614b9a (bug 1207245) 2015-10-07 10:19:31 -07:00
Wes Kocher
d22315fbb5 Backed out changeset ddcc05491282 (bug 1207245) 2015-10-07 10:19:27 -07:00
Wes Kocher
c953b66104 Backed out changeset 93828e13ad63 (bug 1207245) 2015-10-07 10:19:24 -07:00
Wes Kocher
fdc0a2fed6 Backed out changeset bcc1bcac2320 (bug 1207245) 2015-10-07 10:19:21 -07:00
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
Allison Naaktgeboren
4bff588846 Bug 1201325 - remove nightly only flag from savedsearch feature.r=? 2015-10-07 09:49:19 -07:00
B2G Bumper Bot
0097b6b46f Bumping manifests a=b2g-bump 2015-10-07 06:38:03 -07: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
B2G Bumper Bot
05bab2b204 Bumping gaia.json for 2 gaia revision(s) a=gaia-bump
========

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

Bug 1212007 - making sure that pin dialog is trully hidden from a11y …

========

https://hg.mozilla.org/integration/gaia-central/rev/5cef5d5dafae
Author: Yura Zenevich <yzenevich@mozilla.com>
Desc: Bug 1212007 - making sure that pin dialog is trully hidden from a11y when it has hidden style.
2015-10-07 06:35:11 -07:00
Carsten "Tomcat" Book
08997000eb Backed out 2 changesets (bug 1202902) to recking bug 1202902 to be able to reopen inbound on a CLOSED TREE
Backed out changeset 647025383676 (bug 1202902)
Backed out changeset d70c7fe532c6 (bug 1202902)
2015-10-07 14:03:21 +02:00
Sebastian Hengst
cdcff6d0a7 Backed out changeset c6b267589d0d (bug 1202902) for Mulet Reftest, W3C Platform Test and other failures. r=backout a=backout on a CLOSED TREE 2015-10-07 13:36:26 +02:00
Carsten "Tomcat" Book
36183f8b9f merge fx-team to mozilla-central a=merge 2015-10-07 11:44:06 +02:00
JW Wang
a890d8c667 Bug 1146482 - remove MediaDecoder::mReentrantMonitor which is not used anymore. r=jya. 2015-10-07 14:53:22 +08:00
Shu-yu Guo
a83ec92261 Bug 1212183 - Fix DOM getter optimizations in the JITs. 2015-10-06 19:49:06 -07:00
Xidorn Quan
eba013fd82 Bug 1187801 part 4 - Add test for iframe fullscreen flag. r=smaug
--HG--
extra : source : 3abe23b442edf1db41892ce620ca02fb09f2ac0b
2015-10-08 17:47:39 +11:00
Xidorn Quan
f6fe1e11ba Bug 1187801 part 3 - Add iframe fullscreen flag and stop auto-rollback when this flag presents. r=smaug
--HG--
extra : source : f7801f9c5b8e65862ead640f7b07ad87a40c9345
2015-10-08 17:47:39 +11:00
Xidorn Quan
2d891027c2 Bug 1187801 part 2 - Put clearing fullscreen state on element into an independent function. r=smaug
--HG--
extra : source : d461799695d7fe5325066d4134d0a57eac407627
2015-10-08 17:47:39 +11:00
Xidorn Quan
7ea7355828 Bug 1187801 part 1 - Rewrite nsDocument::RestorePreviousFullScreenState() to unify logic of reverting element in parent document. r=smaug
--HG--
extra : source : 05122469be2b1c792d19bf2fee7abb2a9cfa9d4d
2015-10-08 17:47:39 +11: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