Commit Graph

485373 Commits

Author SHA1 Message Date
Carsten "Tomcat" Book
119eea6bdd Backed out changeset 9966bbe6b534 (bug 1289976) for assertion failures in MediaDecoder.h 2016-07-30 19:52:46 +02:00
Carsten "Tomcat" Book
b5951bbc7f Backed out changeset 2cb402f74a51 (bug 1289976) 2016-07-30 19:52:32 +02:00
Carsten "Tomcat" Book
eda09c15e0 Backed out changeset 7368d06f677b (bug 1289976) 2016-07-30 19:52:31 +02:00
Carsten "Tomcat" Book
a1b168271d Backed out changeset 93a556b5e244 (bug 1289976) 2016-07-30 19:52:31 +02:00
Carsten "Tomcat" Book
169eb9f17a Backed out changeset bac5f65e6931 (bug 1289976) 2016-07-30 19:52:30 +02:00
Carsten "Tomcat" Book
dfea28ba46 Backed out changeset ce6b4f84c86e (bug 1289976) 2016-07-30 19:52:29 +02:00
Carsten "Tomcat" Book
1938c88013 Backed out changeset cd25be005e38 (bug 1289976) 2016-07-30 19:52:28 +02:00
Carsten "Tomcat" Book
a51910755e Backed out changeset f648be2df9ec (bug 1289976) 2016-07-30 19:52:27 +02:00
Carsten "Tomcat" Book
e880c3527f Backed out changeset 2931db85cc99 (bug 1289976) 2016-07-30 19:52:26 +02:00
Carsten "Tomcat" Book
1f40b92079 Backed out changeset ba01eb85da0a (bug 1289976) 2016-07-30 19:52:25 +02:00
Carsten "Tomcat" Book
fc8e03f0d8 Merge mozilla-central to autoland 2016-07-30 16:49:41 +02:00
Carsten "Tomcat" Book
f08d7afd35 Backed out changeset f60ec9e34d4d (bug 1290625) for causing merge conflict with m-c 2016-07-30 16:49:02 +02:00
Carsten "Tomcat" Book
6b5b36a6ed Backed out changeset c80456e5e3dd (bug 1119778) for causing s4 failures in test_forget_about_site_security_headers.js 2016-07-30 16:09:40 +02:00
Chris Pearce
7261eef5aa Bug 1289942 - Make MediaKeyStatusMap.get() return undefined for unknown keys. r=bz
The spec requires the MediaKeyStatusMap.get(keyId) function to return an 'any'
type, which is undefined for known keys, or a MediaKeyStatus enum value for
known keys.

https://w3c.github.io/encrypted-media/#idl-def-mediakeystatusmap


MozReview-Commit-ID: 3TOFYLacZSc

--HG--
extra : rebase_source : cd067f545cdbd9352ba64fea914128201b458d9c
2016-07-28 14:03:01 +12:00
Iris Hsiao
095be1ae13 Backed out changeset 3ebad6b5ce57 (bug 1290685) per developer's request 2016-08-02 14:39:10 +08:00
Jean-Yves Avenard
7f1f8deb8b Bug 1290710: [ffmpeg] Resync ffvpx with 3.1 branch. r=gerald
Sync at version n3.1.1-6-g86f9228

MozReview-Commit-ID: Qp8OxKkDHu

--HG--
extra : rebase_source : 39367dcc0ed471c65acd611eb1787fed86f261d8
2016-08-01 14:05:13 +10:00
Gregory Szorc
e4c0cab07e Bug 1291070 - Return process exit code properly; r=glandium
Before, we were returning None, which gets converted to 0.
Derp.

Also fix a flake8 failure introduced by 9f5fbb3066c9.

We'll also need to generate a new decision image. But that will
require someone with TC privileges to be around. That can be done
in a separate commit to unblock this from landing and fixing
consumers of run-task that aren't the decision image.

MozReview-Commit-ID: 6XuoIxjDozF

--HG--
extra : rebase_source : 836f4996cb9be24e19504f73792b159f0ffbdbee
2016-08-01 21:44:22 -07:00
JW Wang
1e61811c7e Bug 1289976. Part 10 - Remove the IsShutdown() check from MediaDecoder::UpdateDormantState(). r=kaku
1. It is called from DormantTimerExpired(). The timer is canceled in Shutdown().
2. It is called from NotifyOwnerActivityChanged() which happens before Shutdown().
3. It is called from Play() which happens before Shutdown().
4. It is called from Seek() which happens before Shutdown().

MozReview-Commit-ID: EnKHF61FBXf

--HG--
extra : rebase_source : 04df59b6722c8340e5163a00eb916442799cfcf1
2016-07-27 10:56:46 +08:00
JW Wang
6c38af47f2 Bug 1289976. Part 10 - Remove the IsShutdown() check from MediaDecoder::UpdateDormantState(). r=kaku
1. It is called from DormantTimerExpired(). The timer is canceled in Shutdown().
2. It is called from NotifyOwnerActivityChanged() which happens before Shutdown().
3. It is called from Play() which happens before Shutdown().
4. It is called from Seek() which happens before Shutdown().

MozReview-Commit-ID: EnKHF61FBXf

--HG--
extra : rebase_source : 04df59b6722c8340e5163a00eb916442799cfcf1
2016-07-27 10:56:46 +08:00
JW Wang
62af9d2687 Bug 1289976. Part 9 - Remove the IsShutdown() check from MediaDecoder::StartDormantTimer(). r=kaku
We don't need to check IsShutdown() which is a subset of |mPlayState != PLAY_STATE_PAUSED && !IsEnded()|.

MozReview-Commit-ID: BjYoLOLuPfC

--HG--
extra : rebase_source : 0d04b30a8bf955faed4907f77f0da29e0ccc011d
2016-07-27 10:52:01 +08:00
JW Wang
661f07a5d4 Bug 1289976. Part 8 - Remove the IsShutdown() check from UpdateReadyState(). The callback is disconnected by the watch manager in Shutdown(). r=kaku
MozReview-Commit-ID: xVSWdj1Q0y

--HG--
extra : rebase_source : 948f622c399e1c072b4c15730a7a8c5fbd2ec696
2016-07-27 10:59:23 +08:00
JW Wang
6ca3a55b72 Bug 1289976. Part 9 - Remove the IsShutdown() check from MediaDecoder::StartDormantTimer(). r=kaku
We don't need to check IsShutdown() which is a subset of |mPlayState != PLAY_STATE_PAUSED && !IsEnded()|.

MozReview-Commit-ID: BjYoLOLuPfC

--HG--
extra : rebase_source : 0d04b30a8bf955faed4907f77f0da29e0ccc011d
2016-07-27 10:52:01 +08:00
JW Wang
85e1a73473 Bug 1289976. Part 8 - Remove the IsShutdown() check from UpdateReadyState(). The callback is disconnected by the watch manager in Shutdown(). r=kaku
MozReview-Commit-ID: xVSWdj1Q0y

--HG--
extra : rebase_source : 948f622c399e1c072b4c15730a7a8c5fbd2ec696
2016-07-27 10:59:23 +08:00
JW Wang
7bdd2a6dd4 Bug 1289976. Part 7 - Remove the IsShutdown() check from MediaDecoder::Seek(). r=kaku
1. It is called from DurationChanged() which returns early when IsShutdown() is true.
2. It is called from Play() when IsEnded() is true.

MozReview-Commit-ID: Ixy5OMZHxIm

--HG--
extra : rebase_source : 4cd7229084c6af8b7123ee6c85156ef4932308f3
2016-07-27 10:49:14 +08:00
JW Wang
31dcc3816b Bug 1289976. Part 7 - Remove the IsShutdown() check from MediaDecoder::Seek(). r=kaku
1. It is called from DurationChanged() which returns early when IsShutdown() is true.
2. It is called from Play() when IsEnded() is true.

MozReview-Commit-ID: Ixy5OMZHxIm

--HG--
extra : rebase_source : 4cd7229084c6af8b7123ee6c85156ef4932308f3
2016-07-27 10:49:14 +08:00
JW Wang
194e23bdb4 Bug 1289976. Part 6 - Remove the IsShutdown() check from MediaDecoder::RemoveMediaTracks(). r=kaku
1. It is called from ChangeState() when IsEnded() is true.
2. It is called from OnMetadataUpdate(). The callback is disconnected in Shutdown().

MozReview-Commit-ID: 8m4jtcl91hT

--HG--
extra : rebase_source : 0988128ec6d05f07ab7b072cc70a9c2970c829c5
2016-07-27 10:44:43 +08:00
JW Wang
f3ffeca57a Bug 1289976. Part 6 - Remove the IsShutdown() check from MediaDecoder::RemoveMediaTracks(). r=kaku
1. It is called from ChangeState() when IsEnded() is true.
2. It is called from OnMetadataUpdate(). The callback is disconnected in Shutdown().

MozReview-Commit-ID: 8m4jtcl91hT

--HG--
extra : rebase_source : 0988128ec6d05f07ab7b072cc70a9c2970c829c5
2016-07-27 10:44:43 +08:00
JW Wang
c4b1ec5baf Bug 1289976. Part 5 - Remove the IsShutdown() check from MediaDecoder::Pause(). r=kaku
1. Pause() is called from HTMLMediaElement and happens before Shutdown().
2. Pause() is called from SetPlaybackRate() which is called from HTMLMediaElement.

MozReview-Commit-ID: DDr7Bg8jkF2

--HG--
extra : rebase_source : 8b8a4fdc914d0bce7572d9a1ccb0f530bdba062c
2016-07-27 10:42:20 +08:00
JW Wang
a2d26a630a Bug 1289976. Part 5 - Remove the IsShutdown() check from MediaDecoder::Pause(). r=kaku
1. Pause() is called from HTMLMediaElement and happens before Shutdown().
2. Pause() is called from SetPlaybackRate() which is called from HTMLMediaElement.

MozReview-Commit-ID: DDr7Bg8jkF2

--HG--
extra : rebase_source : 8b8a4fdc914d0bce7572d9a1ccb0f530bdba062c
2016-07-27 10:42:20 +08:00
JW Wang
97dff3f268 Bug 1289976. Part 4 - Remove the IsShutdown() check from MediaDecoder::NotifyOwnerActivityChanged() which happens before Shutdown(). r=kaku
MozReview-Commit-ID: 9tWLW4JE0Uv

--HG--
extra : rebase_source : 9f33359f5d8833a8f90319303a96cf029460f3ac
2016-07-27 10:38:25 +08:00
JW Wang
348c35b5dd Bug 1289976. Part 4 - Remove the IsShutdown() check from MediaDecoder::NotifyOwnerActivityChanged() which happens before Shutdown(). r=kaku
MozReview-Commit-ID: 9tWLW4JE0Uv

--HG--
extra : rebase_source : 9f33359f5d8833a8f90319303a96cf029460f3ac
2016-07-27 10:38:25 +08:00
JW Wang
d2d8295bf6 Bug 1289976. Part 3 - Remove the IsShutdown() check from MediaDecoder::FireTimeUpdate(). r=kaku
FireTimeUpdate() is only called from UpdateLogicalPositionInternal() which returns early when IsShutdown() is true.

MozReview-Commit-ID: 4GZwrI85aXj

--HG--
extra : rebase_source : 9d7cbd571fd794369c833723ea5fc50a26380e51
2016-07-27 10:36:09 +08:00
JW Wang
00ce40fb6c Bug 1289976. Part 3 - Remove the IsShutdown() check from MediaDecoder::FireTimeUpdate(). r=kaku
FireTimeUpdate() is only called from UpdateLogicalPositionInternal() which returns early when IsShutdown() is true.

MozReview-Commit-ID: 4GZwrI85aXj

--HG--
extra : rebase_source : 9d7cbd571fd794369c833723ea5fc50a26380e51
2016-07-27 10:36:09 +08:00
JW Wang
294fff9de7 Bug 1289976. Part 2 - Remove the IsShutdown() check from MediaDecoder::DumpDebugInfo() which happens before Shutdown(). r=kaku
MozReview-Commit-ID: HU3ybjFZMsE

--HG--
extra : rebase_source : 15d9adb47be449fdaca6a37587e70ff4f1d013bf
2016-07-27 10:33:50 +08:00
JW Wang
61a6cb705b Bug 1289976. Part 2 - Remove the IsShutdown() check from MediaDecoder::DumpDebugInfo() which happens before Shutdown(). r=kaku
MozReview-Commit-ID: HU3ybjFZMsE

--HG--
extra : rebase_source : 15d9adb47be449fdaca6a37587e70ff4f1d013bf
2016-07-27 10:33:50 +08:00
JW Wang
a9482dfc9c Bug 1289976. Part 1 - Remove the IsShutdown() check from MediaDecoder::ConstructMediaTracks(). r=kaku
1. ConstructMediaTracks() is called from ChangeState() when |mPlayState == PLAY_STATE_PLAYING|.
2. ConstructMediaTracks() is called from MetadataLoaded() which asserts |!IsShutdown()|.

MozReview-Commit-ID: 6OaPYcCOCii

--HG--
extra : rebase_source : 9db9e841fe8a0d797a39cd527abf4f4e95b67131
2016-07-27 10:31:14 +08:00
JW Wang
0a748cd015 Bug 1289976. Part 1 - Remove the IsShutdown() check from MediaDecoder::ConstructMediaTracks(). r=kaku
1. ConstructMediaTracks() is called from ChangeState() when |mPlayState == PLAY_STATE_PLAYING|.
2. ConstructMediaTracks() is called from MetadataLoaded() which asserts |!IsShutdown()|.

MozReview-Commit-ID: 6OaPYcCOCii

--HG--
extra : rebase_source : 9db9e841fe8a0d797a39cd527abf4f4e95b67131
2016-07-27 10:31:14 +08:00
JW Wang
50617e1091 Bug 1290338. Part 2 - don't call back to owner functions if the watcher is destroyed. r=bholley
MozReview-Commit-ID: FQkJYtLTBNQ

--HG--
extra : rebase_source : c947ed2de25426815f5260be9b550dfa99f88950
2016-07-29 11:30:16 +08:00
JW Wang
48675814bd Bug 1290338. Part 1 - add a gtest to test WatchManager::Shutdown(). r=bholley
MozReview-Commit-ID: CJ3JJU2zLUF

--HG--
extra : rebase_source : 2495a541366c5baedec3eddf135e2507589824c6
2016-07-29 11:26:41 +08:00
Alastor Wu
f7465c56c4 Bug 1290510 - add nightly flag for media control. r=sebastian
MozReview-Commit-ID: EWEpERiy4WQ

--HG--
extra : rebase_source : 955aab7368f4d2623ccd9089daa94c0beefa975c
2016-08-01 18:27:42 +08:00
Wes Kocher
64fba0f0c0 Merge m-c to autoland, a=merge 2016-08-01 17:50:27 -07:00
Wes Kocher
507d36210b Backed out 3 changesets (bug 1213990) for failing a mochitest a=backout
Backed out changeset 846ac5ddba37 (bug 1213990)
Backed out changeset 26bab9c6a89c (bug 1213990)
Backed out changeset 12d7193f1310 (bug 1213990)
2016-08-01 16:56:18 -07:00
Andrew Swan
44326f4fae Bug 1213990 Clear storage when webextension is uninstalled r=kmag
MozReview-Commit-ID: BeMOxOCSeru

--HG--
extra : rebase_source : 389e8ab2f444b615e8b1f558b3f9a588b77f3512
2016-07-28 10:01:09 -07:00
Andrew Swan
27dcca4f5e Bug 1213990 Convert getExtensionUUID to UUIDMap r=kmag
MozReview-Commit-ID: 9VVNa0pjx8g

--HG--
extra : rebase_source : befb02708aabf093320d4c6fcd5f70c0b117b087
2016-07-28 10:00:51 -07:00
JW Wang
65db31d2a5 Bug 1289649 - HTMLMediaElement should clear mDecoder when XPCOM shutdown begins. r=gerald
MozReview-Commit-ID: A3ECReCgiD7

--HG--
extra : rebase_source : 452e156b9ecb449f311bd47f0afcc3a4bd03e10e
2016-07-27 10:26:21 +08:00
eyim
084d1d4163 Bug 1289873 - correction made for compositing failure ids in failure path not showing up r=BenWa
MozReview-Commit-ID: CRIJwplDBYS

--HG--
extra : rebase_source : 904fedf86ae1ed489138eb99a2b4c3f34967f369
2016-07-29 11:41:33 -04:00
Botond Ballo
36779c6cc3 Bug 1289608 - Define XrayWrapper<...>::singleton for all instantiations, instead of defining specializations for specific ones. r=bholley
MozReview-Commit-ID: GecaSstpxRQ

--HG--
extra : rebase_source : 30e95b590a18dee92a588d2cb4e8b44808bbe11a
2016-07-29 16:40:08 -04:00
Botond Ballo
34d65c1f90 Bug 1289608 - Provide explicit instantiation declarations for the various instantiations of XrapWrapper. r=bholley
MozReview-Commit-ID: 6rS9JJ1Ba9R

--HG--
extra : rebase_source : 29a69c5b0068bc2e948e007d656ef7b7d4efb13d
2016-07-29 16:39:14 -04:00
Alastor Wu
4bb0811eb6 Bug 1288971 - notify audio playback changed by media element's play(). r=baku
Notify audible-changing when resuming audio by MediaElement::play() instead of control interface.

MozReview-Commit-ID: 10a1npQ46Th

--HG--
extra : rebase_source : 16cce6782a132a2aab4ad66dc216d6237fc2ba9f
2016-07-29 19:26:56 +08:00
Jan-Ivar Bruaroey
dd02c97e85 Bug 1290625 - Make libcubeb mutex recurse again, to avoid deadlock when getting microphone. r=achronop
MozReview-Commit-ID: AvYa8ylsdOf

--HG--
extra : rebase_source : 51d340d1607c78002fda6c665932fb966c66a298
2016-07-29 20:03:35 -04:00