Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-11-29 15:52:07 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 458381. The empty string should represent the null namespace even for the default @namespace rule (no prefix case). r+sr=dbaron

Browse Source
This commit is contained in:
Boris Zbarsky 2008-10-15 16:23:21 -04:00
parent f2cd72a0db
commit df41d1db20
3 changed files with 66 additions and 56 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
layout/style/nsCSSParser.cpp
View File

@ -7740,8 +7740,6 @@ CSSParserImpl::GetNamespaceIdForPrefix(const nsString& aPrefix,
}
// else no declared namespaces
NS_ASSERTION(nameSpaceID != kNameSpaceID_None, "Shouldn't happen!");
if (kNameSpaceID_Unknown == nameSpaceID) { // unknown prefix, dump it
const PRUnichar *params[] = {
aPrefix.get()
@ -7759,12 +7757,10 @@ CSSParserImpl::GetNamespaceIdForPrefix(const nsString& aPrefix,
void
CSSParserImpl::SetDefaultNamespaceOnSelector(nsCSSSelector& aSelector)
{
aSelector.SetNameSpace(kNameSpaceID_Unknown); // wildcard
if (mNameSpaceMap) { // look for default namespace
PRInt32 defaultID = mNameSpaceMap->FindNameSpaceID(nsnull);
if (defaultID != kNameSpaceID_None) {
aSelector.SetNameSpace(defaultID);
}
if (mNameSpaceMap) {
aSelector.SetNameSpace(mNameSpaceMap->FindNameSpaceID(nsnull));
} else {
aSelector.SetNameSpace(kNameSpaceID_Unknown); // wildcard
}
}

104
layout/style/nsCSSStyleSheet.cpp
View File

@ -893,44 +893,59 @@ nsCSSStyleSheetInner::RemoveSheet(nsICSSStyleSheet* aSheet)
}
}
static void
AddNamespaceRuleToMap(nsICSSRule* aRule, nsXMLNameSpaceMap* aMap)
{
#ifdef DEBUG
PRInt32 type;
aRule->GetType(type);
NS_ASSERTION(type == nsICSSRule::NAMESPACE_RULE, "Bogus rule type");
#endif
nsCOMPtr<nsICSSNameSpaceRule> nameSpaceRule = do_QueryInterface(aRule);
nsCOMPtr<nsIAtom> prefix;
nsAutoString urlSpec;
nameSpaceRule->GetPrefix(*getter_AddRefs(prefix));
nameSpaceRule->GetURLSpec(urlSpec);
aMap->AddPrefix(prefix, urlSpec);
}
static PRBool
CreateNameSpace(nsICSSRule* aRule, void* aNameSpacePtr)
{
PRInt32 type = nsICSSRule::UNKNOWN_RULE;
aRule->GetType(type);
if (nsICSSRule::NAMESPACE_RULE == type) {
nsICSSNameSpaceRule* nameSpaceRule = (nsICSSNameSpaceRule*)aRule;
nsXMLNameSpaceMap *nameSpaceMap =
static_cast<nsXMLNameSpaceMap*>(aNameSpacePtr);
nsIAtom* prefix = nsnull;
nsAutoString urlSpec;
nameSpaceRule->GetPrefix(prefix);
nameSpaceRule->GetURLSpec(urlSpec);
nameSpaceMap->AddPrefix(prefix, urlSpec);
AddNamespaceRuleToMap(aRule,
static_cast<nsXMLNameSpaceMap*>(aNameSpacePtr));
return PR_TRUE;
}
// stop if not namespace, import or charset because namespace can't follow anything else
return (((nsICSSRule::CHARSET_RULE == type) ||
(nsICSSRule::IMPORT_RULE)) ? PR_TRUE : PR_FALSE);
// stop if not namespace, import or charset because namespace can't follow
// anything else
return (nsICSSRule::CHARSET_RULE == type || nsICSSRule::IMPORT_RULE == type);
}
void
nsCSSStyleSheetInner::RebuildNameSpaces()
{
if (mNameSpaceMap) {
mNameSpaceMap->Clear();
} else {
mNameSpaceMap = nsXMLNameSpaceMap::Create();
if (!mNameSpaceMap) {
return; // out of memory
}
// Just nuke our existing namespace map, if any
if (NS_SUCCEEDED(CreateNamespaceMap())) {
mOrderedRules.EnumerateForwards(CreateNameSpace, mNameSpaceMap);
}
mOrderedRules.EnumerateForwards(CreateNameSpace, mNameSpaceMap);
}
nsresult
nsCSSStyleSheetInner::CreateNamespaceMap()
{
mNameSpaceMap = nsXMLNameSpaceMap::Create();
NS_ENSURE_TRUE(mNameSpaceMap, NS_ERROR_OUT_OF_MEMORY);
// Override the default namespace map behavior for the null prefix to
// return the wildcard namespace instead of the null namespace.
mNameSpaceMap->AddPrefix(nsnull, kNameSpaceID_Unknown);
return NS_OK;
}
// -------------------------------
// CSS Style Sheet
@ -1370,19 +1385,8 @@ nsCSSStyleSheet::AppendStyleRule(nsICSSRule* aRule)
PRInt32 type = nsICSSRule::UNKNOWN_RULE;
aRule->GetType(type);
if (nsICSSRule::NAMESPACE_RULE == type) {
if (!mInner->mNameSpaceMap) {
mInner->mNameSpaceMap = nsXMLNameSpaceMap::Create();
NS_ENSURE_TRUE(mInner->mNameSpaceMap, NS_ERROR_OUT_OF_MEMORY);
}
nsCOMPtr<nsICSSNameSpaceRule> nameSpaceRule(do_QueryInterface(aRule));
nsCOMPtr<nsIAtom> prefix;
nsAutoString urlSpec;
nameSpaceRule->GetPrefix(*getter_AddRefs(prefix));
nameSpaceRule->GetURLSpec(urlSpec);
mInner->mNameSpaceMap->AddPrefix(prefix, urlSpec);
nsresult rv = RegisterNamespaceRule(aRule);
NS_ENSURE_SUCCESS(rv, rv);
}
}
return NS_OK;
@ -1633,6 +1637,18 @@ nsCSSStyleSheet::SubjectSubsumesInnerPrincipal() const
return NS_OK;
}
nsresult
nsCSSStyleSheet::RegisterNamespaceRule(nsICSSRule* aRule)
{
if (!mInner->mNameSpaceMap) {
nsresult rv = mInner->CreateNamespaceMap();
NS_ENSURE_SUCCESS(rv, rv);
}
AddNamespaceRuleToMap(aRule, mInner->mNameSpaceMap);
return NS_OK;
}
NS_IMETHODIMP
nsCSSStyleSheet::IsModified(PRBool* aSheetModified) const
{
@ -1927,19 +1943,11 @@ nsCSSStyleSheet::InsertRuleInternal(const nsAString& aRule,
PRInt32 type = nsICSSRule::UNKNOWN_RULE;
cssRule->GetType(type);
if (type == nsICSSRule::NAMESPACE_RULE) {
if (!mInner->mNameSpaceMap) {
mInner->mNameSpaceMap = nsXMLNameSpaceMap::Create();
NS_ENSURE_TRUE(mInner->mNameSpaceMap, NS_ERROR_OUT_OF_MEMORY);
}
nsCOMPtr<nsICSSNameSpaceRule> nameSpaceRule(do_QueryInterface(cssRule));
nsCOMPtr<nsIAtom> prefix;
nsAutoString urlSpec;
nameSpaceRule->GetPrefix(*getter_AddRefs(prefix));
nameSpaceRule->GetURLSpec(urlSpec);
mInner->mNameSpaceMap->AddPrefix(prefix, urlSpec);
// XXXbz does this screw up when inserting a namespace rule before
// another namespace rule that binds the same prefix to a different
// namespace?
result = RegisterNamespaceRule(cssRule);
NS_ENSURE_SUCCESS(result, result);
}
// We don't notify immediately for @import rules, but rather when

6
layout/style/nsCSSStyleSheet.h
View File

@ -75,6 +75,9 @@ public:
virtual void RebuildNameSpaces();
// Create a new namespace map
nsresult CreateNamespaceMap();
nsAutoVoidArray mSheets;
nsCOMPtr<nsIURI> mSheetURI; // for error reports, etc.
nsCOMPtr<nsIURI> mOriginalSheetURI; // for GetHref. Can be null.
@ -205,6 +208,9 @@ protected:
// UniversalBrowserWrite.
nsresult SubjectSubsumesInnerPrincipal() const;
// Add the namespace mapping from this @namespace rule to our namespace map
nsresult RegisterNamespaceRule(nsICSSRule* aRule);
protected:
nsString mTitle;
nsCOMPtr<nsMediaList> mMedia;