Commit Graph

444185 Commits

Author SHA1 Message Date
Wes Kocher
1d2db38d82 Backed out changeset fe1ed0ded678 (bug 1211974) for robocop orange 2015-10-07 11:45:59 -07:00
Francois Marier
5adc75d084 Bug 1208629 - Properly support data: and blob: URIs with an integrity atribute. r=ckerschb 2015-10-07 11:27:19 -07:00
Bill McCloskey
1b725eb6bc Back out bug 1191143 - Cancel CPOWs from both sides 2015-10-07 11:15:11 -07:00
Bill McCloskey
47202f14e8 Back out bug 1191145 - Stop blocking scripts in CPOW IPCs 2015-10-07 11:15:11 -07:00
Bill McCloskey
4abd7ee5d1 Back out bug 967873 - Make browser_relatedTabs.js not race in e10s 2015-10-07 11:15:11 -07:00
Bill McCloskey
b1e89d97be Back out bug 967873 - Start TabView when starting tests that might lazily load it 2015-10-07 11:15:11 -07:00
Bill McCloskey
1b6da7ed71 Back out bug 967873 - Test changes for async removeTab 2015-10-07 11:15:11 -07:00
Bill McCloskey
52c2848330 Back out bug 967873 - Allow RemotePrompt to be closed while it's being opened 2015-10-07 11:15:11 -07:00
Bill McCloskey
919ed9ae86 Back out bug 967873 - browser_onbeforeunload_navigation.js fix for e10s 2015-10-07 11:15:11 -07:00
Bill McCloskey
33e126ac4f Back out bug 967873 - Ignore content process DOMWillOpenModalDialog event in e10s 2015-10-07 11:15:11 -07:00
Bill McCloskey
c5d5457154 Back out bug 967873 - Proxy nsDocumentViewer::PermitUnload to the child process 2015-10-07 11:15:11 -07:00
Wes Kocher
ad8e897290 Merge m-c to inbound, a=merge 2015-10-07 11:09:47 -07:00
Wes Kocher
5dc7315e7b Merge b2ginbound to central, a=merge 2015-10-07 11:04:26 -07:00
Daniel Holbert
90a1ef8084 Bug 1210575 part 4: Prevent CSS parser from invoking CSSUnprefixingService if native webkit prefix support is enabled. r=heycam 2015-10-07 11:02:50 -07:00
Daniel Holbert
0597726127 Bug 1210575 part 3: Refactor CSS gradient-parsing code to use a flags bitfield instead of multiple bool args for customizing behavior. r=heycam 2015-10-07 11:02:50 -07:00
Daniel Holbert
cc6ae36a1c Bug 1210575 part 2: Refactor out the body of a long compound "if" expression into a helper function, IsFunctionTokenValidForBackgroundImage. r=heycam 2015-10-07 11:02:50 -07:00
Daniel Holbert
49ed25ea69 Bug 1210575 part 1: Rename CSS parser function "ParseWebkitPrefixedGradient()" to be more specific, now that we'll have several ways of parsing these expressions. r=heycam
(This patch renames the function to "ParseWebkitPrefixedGradientWithService", indicating that this is the version that calls out to the CSSUnprefixingService.)
2015-10-07 11:02:37 -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
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
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