зеркало из https://github.com/mozilla/gecko-dev.git
Bug 1164567 - Grab the principal when we need it in MediaDecodeTask. r=jww
This commit is contained in:
Родитель
a4f7702fb5
Коммит
6fddec8362
|
@ -103,13 +103,6 @@ public:
|
|||
{
|
||||
MOZ_ASSERT(aBuffer);
|
||||
MOZ_ASSERT(NS_IsMainThread());
|
||||
|
||||
nsCOMPtr<nsPIDOMWindow> pWindow = do_QueryInterface(mDecodeJob.mContext->GetParentObject());
|
||||
nsCOMPtr<nsIScriptObjectPrincipal> scriptPrincipal =
|
||||
do_QueryInterface(pWindow);
|
||||
if (scriptPrincipal) {
|
||||
mPrincipal = scriptPrincipal->GetPrincipal();
|
||||
}
|
||||
}
|
||||
|
||||
NS_IMETHOD Run();
|
||||
|
@ -156,7 +149,6 @@ private:
|
|||
uint32_t mLength;
|
||||
WebAudioDecodeJob& mDecodeJob;
|
||||
PhaseEnum mPhase;
|
||||
nsCOMPtr<nsIPrincipal> mPrincipal;
|
||||
nsRefPtr<BufferDecoder> mBufferDecoder;
|
||||
nsRefPtr<MediaDecoderReader> mDecoderReader;
|
||||
MediaInfo mMediaInfo;
|
||||
|
@ -187,9 +179,16 @@ MediaDecodeTask::CreateReader()
|
|||
{
|
||||
MOZ_ASSERT(NS_IsMainThread());
|
||||
|
||||
|
||||
nsCOMPtr<nsIPrincipal> principal;
|
||||
nsCOMPtr<nsIScriptObjectPrincipal> sop = do_QueryInterface(mDecodeJob.mContext->GetParentObject());
|
||||
if (sop) {
|
||||
principal = sop->GetPrincipal();
|
||||
}
|
||||
|
||||
nsRefPtr<BufferMediaResource> resource =
|
||||
new BufferMediaResource(static_cast<uint8_t*> (mBuffer),
|
||||
mLength, mPrincipal, mContentType);
|
||||
mLength, principal, mContentType);
|
||||
|
||||
MOZ_ASSERT(!mBufferDecoder);
|
||||
mBufferDecoder = new BufferDecoder(resource);
|
||||
|
|
Загрузка…
Ссылка в новой задаче