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