From b333e18f8f4eda3b2289c47ebc7824767e4c150f Mon Sep 17 00:00:00 2001 From: "blakeross%telocity.com" Date: Tue, 7 May 2002 01:33:29 +0000 Subject: [PATCH] 133666 - skin switch on restart not completely performed. r=ben sr=hyatt --- chrome/src/nsChromeRegistry.cpp | 8 ++++---- rdf/chrome/src/nsChromeRegistry.cpp | 8 ++++---- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/chrome/src/nsChromeRegistry.cpp b/chrome/src/nsChromeRegistry.cpp index b04b801d84e..dfe08ce3f91 100644 --- a/chrome/src/nsChromeRegistry.cpp +++ b/chrome/src/nsChromeRegistry.cpp @@ -2925,10 +2925,6 @@ nsresult nsChromeRegistry::LoadProfileDataSource() rv = AddToCompositeDataSource(PR_TRUE); if (NS_FAILED(rv)) return rv; - // We have to flush the chrome cache! - rv = FlushCaches(); - if (NS_FAILED(rv)) return rv; - // XXX this sucks ASS. This is a temporary hack until we get // around to fixing the skin switching bugs. // Select and Remove skins based on a pref set in a previous session. @@ -2943,6 +2939,10 @@ nsresult nsChromeRegistry::LoadProfileDataSource() } } + // We have to flush the chrome cache! + rv = FlushCaches(); + if (NS_FAILED(rv)) return rv; + rv = LoadStyleSheet(getter_AddRefs(mScrollbarSheet), NS_LITERAL_CSTRING("chrome://global/skin/scrollbars.css")); // This must always be the last line of profile initialization! diff --git a/rdf/chrome/src/nsChromeRegistry.cpp b/rdf/chrome/src/nsChromeRegistry.cpp index b04b801d84e..dfe08ce3f91 100644 --- a/rdf/chrome/src/nsChromeRegistry.cpp +++ b/rdf/chrome/src/nsChromeRegistry.cpp @@ -2925,10 +2925,6 @@ nsresult nsChromeRegistry::LoadProfileDataSource() rv = AddToCompositeDataSource(PR_TRUE); if (NS_FAILED(rv)) return rv; - // We have to flush the chrome cache! - rv = FlushCaches(); - if (NS_FAILED(rv)) return rv; - // XXX this sucks ASS. This is a temporary hack until we get // around to fixing the skin switching bugs. // Select and Remove skins based on a pref set in a previous session. @@ -2943,6 +2939,10 @@ nsresult nsChromeRegistry::LoadProfileDataSource() } } + // We have to flush the chrome cache! + rv = FlushCaches(); + if (NS_FAILED(rv)) return rv; + rv = LoadStyleSheet(getter_AddRefs(mScrollbarSheet), NS_LITERAL_CSTRING("chrome://global/skin/scrollbars.css")); // This must always be the last line of profile initialization!