From cfc46042f98cb2b817fd463282c73dc3657cc59d Mon Sep 17 00:00:00 2001 From: "pierre%netscape.com" Date: Thu, 16 Mar 2000 11:44:00 +0000 Subject: [PATCH] #11859 "Loading remote stylesheet in editor fails". LoadAgentSheet() loads the page asynchronously if an observer if provided. git-svn-id: svn://10.0.0.236/trunk@63156 18797224-902f-48f8-a5cc-f745e15eee43 --- mozilla/content/html/style/src/nsCSSLoader.cpp | 10 ++++++++-- mozilla/layout/html/style/src/nsCSSLoader.cpp | 10 ++++++++-- mozilla/layout/style/nsCSSLoader.cpp | 10 ++++++++-- 3 files changed, 24 insertions(+), 6 deletions(-) diff --git a/mozilla/content/html/style/src/nsCSSLoader.cpp b/mozilla/content/html/style/src/nsCSSLoader.cpp index 75d17490bb5..b242f2e924d 100644 --- a/mozilla/content/html/style/src/nsCSSLoader.cpp +++ b/mozilla/content/html/style/src/nsCSSLoader.cpp @@ -1355,8 +1355,14 @@ CSSLoaderImpl::LoadAgentSheet(nsIURI* aURL, else { NS_ADDREF(data); URLKey key(aURL); - mLoadingSheets.Put(&key, data); - result = ParseSheet(uin, data, aCompleted, aSheet); + if (aObserver == nsnull) { + mLoadingSheets.Put(&key, data); + result = ParseSheet(uin, data, aCompleted, aSheet); + } + else { + result = LoadSheet(key, data); // this may steal pending alternates too + aCompleted = PR_FALSE; + } } NS_RELEASE(uin); } diff --git a/mozilla/layout/html/style/src/nsCSSLoader.cpp b/mozilla/layout/html/style/src/nsCSSLoader.cpp index 75d17490bb5..b242f2e924d 100644 --- a/mozilla/layout/html/style/src/nsCSSLoader.cpp +++ b/mozilla/layout/html/style/src/nsCSSLoader.cpp @@ -1355,8 +1355,14 @@ CSSLoaderImpl::LoadAgentSheet(nsIURI* aURL, else { NS_ADDREF(data); URLKey key(aURL); - mLoadingSheets.Put(&key, data); - result = ParseSheet(uin, data, aCompleted, aSheet); + if (aObserver == nsnull) { + mLoadingSheets.Put(&key, data); + result = ParseSheet(uin, data, aCompleted, aSheet); + } + else { + result = LoadSheet(key, data); // this may steal pending alternates too + aCompleted = PR_FALSE; + } } NS_RELEASE(uin); } diff --git a/mozilla/layout/style/nsCSSLoader.cpp b/mozilla/layout/style/nsCSSLoader.cpp index 75d17490bb5..b242f2e924d 100644 --- a/mozilla/layout/style/nsCSSLoader.cpp +++ b/mozilla/layout/style/nsCSSLoader.cpp @@ -1355,8 +1355,14 @@ CSSLoaderImpl::LoadAgentSheet(nsIURI* aURL, else { NS_ADDREF(data); URLKey key(aURL); - mLoadingSheets.Put(&key, data); - result = ParseSheet(uin, data, aCompleted, aSheet); + if (aObserver == nsnull) { + mLoadingSheets.Put(&key, data); + result = ParseSheet(uin, data, aCompleted, aSheet); + } + else { + result = LoadSheet(key, data); // this may steal pending alternates too + aCompleted = PR_FALSE; + } } NS_RELEASE(uin); }