From 72047ef03e63b50f35bf39bdcf8cd0f47c51cdec Mon Sep 17 00:00:00 2001 From: "darin%netscape.com" Date: Wed, 4 Apr 2001 07:20:46 +0000 Subject: [PATCH] Fixes bug 73905 "CSS/JS documents are not cached" r=pierre, sr=waterson git-svn-id: svn://10.0.0.236/trunk@91265 18797224-902f-48f8-a5cc-f745e15eee43 --- mozilla/content/html/style/src/nsCSSLoader.cpp | 13 +------------ mozilla/layout/style/nsCSSLoader.cpp | 13 +------------ 2 files changed, 2 insertions(+), 24 deletions(-) diff --git a/mozilla/content/html/style/src/nsCSSLoader.cpp b/mozilla/content/html/style/src/nsCSSLoader.cpp index c1c60d3a96a..e9f19697d7e 100644 --- a/mozilla/content/html/style/src/nsCSSLoader.cpp +++ b/mozilla/content/html/style/src/nsCSSLoader.cpp @@ -1217,19 +1217,8 @@ CSSLoaderImpl::LoadSheet(URLKey& aKey, SheetLoadData* aData) nsCOMPtr 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 diff --git a/mozilla/layout/style/nsCSSLoader.cpp b/mozilla/layout/style/nsCSSLoader.cpp index c1c60d3a96a..e9f19697d7e 100644 --- a/mozilla/layout/style/nsCSSLoader.cpp +++ b/mozilla/layout/style/nsCSSLoader.cpp @@ -1217,19 +1217,8 @@ CSSLoaderImpl::LoadSheet(URLKey& aKey, SheetLoadData* aData) nsCOMPtr 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