Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-11-25 05:41:12 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 931249 - Patch 1.1 - Set baseURI when script is obtained from cache. r=khuey

Browse Source 
--HG--
extra : rebase_source : f8bd9b047518b3e5e220eddc3eab1f0918b83f6b
This commit is contained in:
Nikhil Marathe 2015-03-18 16:14:30 -07:00
parent 238374c507
commit e0c3f020d5
1 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
dom/workers/ScriptLoader.cpp
View File

@ -973,6 +973,7 @@ private:
DataReceivedFromCache(uint32_t aIndex, const uint8_t* aString,
uint32_t aStringLen)
{
AssertIsOnMainThread();
MOZ_ASSERT(aIndex < mLoadInfos.Length());
ScriptLoadInfo& loadInfo = mLoadInfos[aIndex];
MOZ_ASSERT(loadInfo.mCacheStatus == ScriptLoadInfo::Cached);
@ -982,11 +983,18 @@ private:
MOZ_ASSERT(!loadInfo.mScriptTextBuf);
DebugOnly<nsresult> rv =
nsresult rv =
nsScriptLoader::ConvertToUTF16(nullptr, aString, aStringLen,
NS_LITERAL_STRING("UTF-8"), parentDoc,
loadInfo.mScriptTextBuf,
loadInfo.mScriptTextLength);
if (NS_SUCCEEDED(rv) && IsMainWorkerScript()) {
nsCOMPtr<nsIURI> finalURI;
rv = NS_NewURI(getter_AddRefs(finalURI), loadInfo.mFullURL, nullptr, nullptr);
if (NS_SUCCEEDED(rv)) {
mWorkerPrivate->SetBaseURI(finalURI);
}
}
if (NS_SUCCEEDED(rv)) {
DataReceived();