Bug 1228677 - Do not enforce CORS when loading file for MediaResource (r=sicking)
MozReview-Commit-ID: 4PsZZFOTj8a
--- a/dom/media/MediaResource.cpp
+++ b/dom/media/MediaResource.cpp
@@ -1282,25 +1282,16 @@ nsresult FileMediaResource::Open(nsIStre
NS_ENSURE_SUCCESS(rv, rv);
rv = NS_NewLocalFileInputStream(
getter_AddRefs(mInput), file, -1, -1, nsIFileInputStream::SHARE_DELETE);
} else if (IsBlobURI(mURI)) {
rv = NS_GetStreamForBlobURI(mURI, getter_AddRefs(mInput));
}
} else {
-
-#ifdef DEBUG
- {
- nsCOMPtr<nsILoadInfo> loadInfo = mChannel->GetLoadInfo();
- MOZ_ASSERT((loadInfo->GetSecurityMode() &
- nsILoadInfo::SEC_REQUIRE_CORS_DATA_INHERITS) == 0,
- "can not enforce CORS when calling Open2()");
- }
-#endif
rv = mChannel->Open2(getter_AddRefs(mInput));
}
NS_ENSURE_SUCCESS(rv, rv);
mSeekable = do_QueryInterface(mInput);
if (!mSeekable) {
// XXX The file may just be a .url or similar
// shortcut that points to a Web site. We need to fix this by
@@ -1355,32 +1346,28 @@ already_AddRefed<MediaResource> FileMedi
dom::HTMLMediaElement* element = owner->GetMediaElement();
if (!element) {
// The decoder is being shut down, so we can't clone
return nullptr;
}
nsCOMPtr<nsILoadGroup> loadGroup = element->GetDocumentLoadGroup();
NS_ENSURE_TRUE(loadGroup, nullptr);
- nsSecurityFlags securityFlags = element->ShouldCheckAllowOrigin()
- ? nsILoadInfo::SEC_REQUIRE_CORS_DATA_INHERITS
- : nsILoadInfo::SEC_ALLOW_CROSS_ORIGIN_DATA_INHERITS;
-
MOZ_ASSERT(element->IsAnyOfHTMLElements(nsGkAtoms::audio, nsGkAtoms::video));
nsContentPolicyType contentPolicyType = element->IsHTMLElement(nsGkAtoms::audio) ?
nsIContentPolicy::TYPE_INTERNAL_AUDIO : nsIContentPolicy::TYPE_INTERNAL_VIDEO;
nsLoadFlags loadFlags = nsIRequest::LOAD_NORMAL | nsIChannel::LOAD_CLASSIFY_URI;
nsCOMPtr<nsIChannel> channel;
nsresult rv =
NS_NewChannel(getter_AddRefs(channel),
mURI,
element,
- securityFlags,
+ nsILoadInfo::SEC_ALLOW_CROSS_ORIGIN_DATA_INHERITS,
contentPolicyType,
loadGroup,
nullptr, // aCallbacks
loadFlags);
if (NS_FAILED(rv))
return nullptr;