Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2025-02-14 20:22:00 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 1264231 - Part 3: remove loadInfo work-around. r=sicking

Browse Source
This commit is contained in:
Yoshi Huang 2016-07-28 11:45:09 +08:00
parent 66f1364b04
commit a520e75a4d
2 changed files with 0 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
dom/html/HTMLMediaElement.cpp
View File

@ -572,14 +572,6 @@ public:
return;
}
// This is a workaround and it will be fix in bug 1264230.
nsCOMPtr<nsILoadInfo> loadInfo = channel->GetLoadInfo();
if (loadInfo) {
NeckoOriginAttributes originAttrs;
NS_GetOriginAttributes(channel, originAttrs);
loadInfo->SetOriginAttributes(originAttrs);
}
// The listener holds a strong reference to us. This creates a
// reference cycle, once we've set mChannel, which is manually broken
// in the listener's OnStartRequest method after it is finished with

15
image/imgLoader.cpp
View File

@ -851,21 +851,6 @@ NewImageChannel(nsIChannel** aResult,
}
(*aResult)->SetLoadGroup(loadGroup);
// This is a workaround and a real fix in bug 1264231.
if (callbacks) {
nsCOMPtr<nsILoadContext> loadContext = do_GetInterface(callbacks);
if (loadContext) {
nsCOMPtr<nsILoadInfo> loadInfo;
rv = (*aResult)->GetLoadInfo(getter_AddRefs(loadInfo));
NS_ENSURE_SUCCESS(rv, rv);
DocShellOriginAttributes originAttrs;
loadContext->GetOriginAttributes(originAttrs);
NeckoOriginAttributes neckoOriginAttrs;
neckoOriginAttrs.InheritFromDocShellToNecko(originAttrs);
loadInfo->SetOriginAttributes(neckoOriginAttrs);
}
}
return NS_OK;
}