corysanin/tubestation
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Bug 856361. Part 2: Block data from a non-same-origin media resource entering a MediaStream from a media element. r=cpearce

Browse Source
This commit is contained in:
Robert O'Callahan
2013-07-24 21:55:23 +12:00
parent ff39f1e4c3
commit b943b9dbcf
8 changed files with 66 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
content/media/MediaDecoderStateMachine.cpp
View File

@@ -619,6 +619,11 @@ void MediaDecoderStateMachine::SendStreamData()
if (mState == DECODER_STATE_DECODING_METADATA)
return;
if (!mDecoder->IsSameOriginMedia()) {
printf("MediaDecoderStateMachine::SendStreamData Same-origin check failed (decoder %p)!!!\n", mDecoder.get());
return;
}
// If there's still an audio thread alive, then we can't send any stream
// data yet since both SendStreamData and the audio thread want to be in
// charge of popping the audio queue. We're waiting for the audio thread