Bommels05/Mozilla
Bommels05/Mozilla
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

46599 (nsCSSLoader should check for local file before passing FORCE_RELOAD)

Browse Source 
git-svn-id: svn://10.0.0.236/trunk@75637 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
pierre%netscape.com 2000-08-05 04:39:43 +00:00
parent 43328ae9b9
commit 1dc88b3a49
3 changed files with 69 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
mozilla/content/html/style/src/nsCSSLoader.cpp
View File

@ -787,6 +787,20 @@ static PRBool IsChromeURI(nsIURI* aURI)
}
#endif
static PRBool IsFileURI(nsIURI* aURI)
{
nsresult rv;
nsXPIDLCString protocol;
rv = aURI->GetScheme(getter_Copies(protocol));
if (NS_SUCCEEDED(rv)) {
if (PL_strcmp(protocol, "file") == 0) {
return PR_TRUE;
}
}
return PR_FALSE;
}
nsresult
CSSLoaderImpl::SheetComplete(nsICSSStyleSheet* aSheet, SheetLoadData* aLoadData)
{
@ -1227,8 +1241,16 @@ 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 = (isLocalFile ? nsIChannel::LOAD_NORMAL
: nsIChannel::FORCE_RELOAD);
result = NS_NewStreamLoader(&loader, urlClone, aData, nsnull, loadGroup,
nsnull, nsIChannel::FORCE_RELOAD);
nsnull, loadAttributes);
#ifdef NS_DEBUG
mSyncCallback = PR_FALSE;
#endif

24
mozilla/layout/html/style/src/nsCSSLoader.cpp
View File

@ -787,6 +787,20 @@ static PRBool IsChromeURI(nsIURI* aURI)
}
#endif
static PRBool IsFileURI(nsIURI* aURI)
{
nsresult rv;
nsXPIDLCString protocol;
rv = aURI->GetScheme(getter_Copies(protocol));
if (NS_SUCCEEDED(rv)) {
if (PL_strcmp(protocol, "file") == 0) {
return PR_TRUE;
}
}
return PR_FALSE;
}
nsresult
CSSLoaderImpl::SheetComplete(nsICSSStyleSheet* aSheet, SheetLoadData* aLoadData)
{
@ -1227,8 +1241,16 @@ 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 = (isLocalFile ? nsIChannel::LOAD_NORMAL
: nsIChannel::FORCE_RELOAD);
result = NS_NewStreamLoader(&loader, urlClone, aData, nsnull, loadGroup,
nsnull, nsIChannel::FORCE_RELOAD);
nsnull, loadAttributes);
#ifdef NS_DEBUG
mSyncCallback = PR_FALSE;
#endif

24
mozilla/layout/style/nsCSSLoader.cpp
View File

@ -787,6 +787,20 @@ static PRBool IsChromeURI(nsIURI* aURI)
}
#endif
static PRBool IsFileURI(nsIURI* aURI)
{
nsresult rv;
nsXPIDLCString protocol;
rv = aURI->GetScheme(getter_Copies(protocol));
if (NS_SUCCEEDED(rv)) {
if (PL_strcmp(protocol, "file") == 0) {
return PR_TRUE;
}
}
return PR_FALSE;
}
nsresult
CSSLoaderImpl::SheetComplete(nsICSSStyleSheet* aSheet, SheetLoadData* aLoadData)
{
@ -1227,8 +1241,16 @@ 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 = (isLocalFile ? nsIChannel::LOAD_NORMAL
: nsIChannel::FORCE_RELOAD);
result = NS_NewStreamLoader(&loader, urlClone, aData, nsnull, loadGroup,
nsnull, nsIChannel::FORCE_RELOAD);
nsnull, loadAttributes);
#ifdef NS_DEBUG
mSyncCallback = PR_FALSE;
#endif