зеркало из https://github.com/mozilla/gecko-dev.git
Fixes bug 73905 "CSS/JS documents are not cached" r=pierre, sr=waterson
This commit is contained in:
Родитель
53b3103260
Коммит
aaa5e0e11a
|
@ -1217,19 +1217,8 @@ CSSLoaderImpl::LoadSheet(URLKey& aKey, SheetLoadData* aData)
|
|||
nsCOMPtr<nsILoadGroup> loadGroup;
|
||||
mDocument->GetDocumentLoadGroup(getter_AddRefs(loadGroup));
|
||||
|
||||
PRBool isLocalFile;
|
||||
#ifdef INCLUDE_XUL
|
||||
isLocalFile = (IsChromeURI(urlClone) || IsFileURI(urlClone));
|
||||
#else
|
||||
isLocalFile = IsFileURI(urlClone);
|
||||
#endif
|
||||
nsLoadFlags loadAttributes;
|
||||
if (isLocalFile)
|
||||
loadAttributes = (nsLoadFlags)nsIChannel::LOAD_NORMAL;
|
||||
else
|
||||
loadAttributes = (nsLoadFlags)nsIChannel::FORCE_RELOAD;
|
||||
result = NS_NewStreamLoader(&loader, urlClone, aData, nsnull, loadGroup,
|
||||
nsnull, loadAttributes);
|
||||
nsnull, nsIChannel::LOAD_NORMAL);
|
||||
#ifdef NS_DEBUG
|
||||
mSyncCallback = PR_FALSE;
|
||||
#endif
|
||||
|
|
|
@ -1217,19 +1217,8 @@ CSSLoaderImpl::LoadSheet(URLKey& aKey, SheetLoadData* aData)
|
|||
nsCOMPtr<nsILoadGroup> loadGroup;
|
||||
mDocument->GetDocumentLoadGroup(getter_AddRefs(loadGroup));
|
||||
|
||||
PRBool isLocalFile;
|
||||
#ifdef INCLUDE_XUL
|
||||
isLocalFile = (IsChromeURI(urlClone) || IsFileURI(urlClone));
|
||||
#else
|
||||
isLocalFile = IsFileURI(urlClone);
|
||||
#endif
|
||||
nsLoadFlags loadAttributes;
|
||||
if (isLocalFile)
|
||||
loadAttributes = (nsLoadFlags)nsIChannel::LOAD_NORMAL;
|
||||
else
|
||||
loadAttributes = (nsLoadFlags)nsIChannel::FORCE_RELOAD;
|
||||
result = NS_NewStreamLoader(&loader, urlClone, aData, nsnull, loadGroup,
|
||||
nsnull, loadAttributes);
|
||||
nsnull, nsIChannel::LOAD_NORMAL);
|
||||
#ifdef NS_DEBUG
|
||||
mSyncCallback = PR_FALSE;
|
||||
#endif
|
||||
|
|
Загрузка…
Ссылка в новой задаче