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

Make stylesheet service sheets apply dynamically. Bug 335689, r+sr=dbaron

Browse Source 
git-svn-id: svn://10.0.0.236/trunk@199502 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
bzbarsky%mit.edu
2006-06-08 14:32:20 +00:00
parent a79f1d865e
commit 0e81ab301b
7 changed files with 147 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
mozilla/layout/base/nsStyleSheetService.cpp
View File

@@ -49,6 +49,7 @@
#include "nsICategoryManager.h"
#include "nsISupportsPrimitives.h"
#include "nsNetUtil.h"
#include "nsIObserverService.h"
static NS_DEFINE_CID(kCSSLoaderCID, NS_CSS_LOADER_CID);
@@ -96,7 +97,7 @@ nsStyleSheetService::RegisterFromEnumerator(nsICategoryManager *aManager,
nsCOMPtr<nsIURI> uri;
NS_NewURI(getter_AddRefs(uri), spec);
if (uri)
LoadAndRegisterSheet(uri, aSheetType);
LoadAndRegisterSheetInternal(uri, aSheetType);
}
}
@@ -142,6 +143,26 @@ nsStyleSheetService::Init()
NS_IMETHODIMP
nsStyleSheetService::LoadAndRegisterSheet(nsIURI *aSheetURI,
PRUint32 aSheetType)
{
nsresult rv = LoadAndRegisterSheetInternal(aSheetURI, aSheetType);
if (NS_SUCCEEDED(rv)) {
const char* message = (aSheetType == AGENT_SHEET) ?
"agent-sheet-added" : "user-sheet-added";
nsCOMPtr<nsIObserverService> serv =
do_GetService("@mozilla.org/observer-service;1");
if (serv) {
// We're guaranteed that the new sheet is the last sheet in
// mSheets[aSheetType]
const nsCOMArray<nsIStyleSheet> & sheets = mSheets[aSheetType];
serv->NotifyObservers(sheets[sheets.Count() - 1], message, nsnull);
}
}
return rv;
}
nsresult
nsStyleSheetService::LoadAndRegisterSheetInternal(nsIURI *aSheetURI,
PRUint32 aSheetType)
{
NS_ENSURE_ARG(aSheetType == AGENT_SHEET || aSheetType == USER_SHEET);
NS_ENSURE_ARG_POINTER(aSheetURI);
@@ -151,9 +172,11 @@ nsStyleSheetService::LoadAndRegisterSheet(nsIURI *aSheetURI,
nsresult rv = loader->LoadSheetSync(aSheetURI, getter_AddRefs(sheet));
NS_ENSURE_SUCCESS(rv, rv);
mSheets[aSheetType].AppendObject(sheet);
if (!mSheets[aSheetType].AppendObject(sheet)) {
rv = NS_ERROR_OUT_OF_MEMORY;
}
return NS_OK;
return rv;
}
NS_IMETHODIMP
@@ -177,7 +200,16 @@ nsStyleSheetService::UnregisterSheet(nsIURI *sheetURI, PRUint32 aSheetType)
PRInt32 foundIndex = FindSheetByURI(mSheets[aSheetType], sheetURI);
NS_ENSURE_TRUE(foundIndex >= 0, NS_ERROR_INVALID_ARG);
nsCOMPtr<nsIStyleSheet> sheet = mSheets[aSheetType][foundIndex];
mSheets[aSheetType].RemoveObjectAt(foundIndex);
const char* message = (aSheetType == AGENT_SHEET) ?
"agent-sheet-removed" : "user-sheet-removed";
nsCOMPtr<nsIObserverService> serv =
do_GetService("@mozilla.org/observer-service;1");
if (serv) {
serv->NotifyObservers(sheet, message, nsnull);
}
return NS_OK;
}