mirror of
https://gitlab.winehq.org/wine/wine-gecko.git
synced 2024-09-13 09:24:08 -07:00
Bug 492931 - Part 1b: Change to ASCII case conversion in content/ where appropriate. r=sicking
This commit is contained in:
parent
a59e8cb2be
commit
d74bad509f
@ -210,10 +210,11 @@ nsDOMAttribute::GetNameAtom(nsIContent* aContent)
|
||||
mNodeInfo->NamespaceID() == kNameSpaceID_None &&
|
||||
aContent->IsInHTMLDocument() &&
|
||||
aContent->IsHTML()) {
|
||||
nsAutoString name;
|
||||
nsString name;
|
||||
mNodeInfo->GetName(name);
|
||||
nsContentUtils::ASCIIToLower(name);
|
||||
nsCOMPtr<nsIAtom> nameAtom = do_GetAtom(name);
|
||||
nsAutoString lowercaseName;
|
||||
nsContentUtils::ASCIIToLower(name, lowercaseName);
|
||||
nsCOMPtr<nsIAtom> nameAtom = do_GetAtom(lowercaseName);
|
||||
nameAtom.swap(result);
|
||||
} else {
|
||||
nsCOMPtr<nsIAtom> nameAtom = mNodeInfo->NameAtom();
|
||||
|
@ -2488,24 +2488,25 @@ nsGenericHTMLElement::GetContentEditable(nsAString& aContentEditable)
|
||||
nsresult
|
||||
nsGenericHTMLElement::SetContentEditable(const nsAString& aContentEditable)
|
||||
{
|
||||
nsString contentEditable;
|
||||
nsContentUtils::ASCIIToLower(aContentEditable, contentEditable);
|
||||
|
||||
if (contentEditable.EqualsLiteral("inherit")) {
|
||||
if (nsContentUtils::EqualsLiteralIgnoreASCIICase(aContentEditable, "inherit")) {
|
||||
UnsetAttr(kNameSpaceID_None, nsGkAtoms::contenteditable, true);
|
||||
|
||||
return NS_OK;
|
||||
}
|
||||
|
||||
if (!contentEditable.EqualsLiteral("true") &&
|
||||
!contentEditable.EqualsLiteral("false")) {
|
||||
return NS_ERROR_DOM_SYNTAX_ERR;
|
||||
if (nsContentUtils::EqualsLiteralIgnoreASCIICase(aContentEditable, "true")) {
|
||||
SetAttr(kNameSpaceID_None, nsGkAtoms::contenteditable, NS_LITERAL_STRING("true"), true);
|
||||
|
||||
return NS_OK;
|
||||
}
|
||||
|
||||
if (nsContentUtils::EqualsLiteralIgnoreASCIICase(aContentEditable, "false")) {
|
||||
SetAttr(kNameSpaceID_None, nsGkAtoms::contenteditable, NS_LITERAL_STRING("false"), true);
|
||||
|
||||
return NS_OK;
|
||||
}
|
||||
|
||||
SetAttr(kNameSpaceID_None, nsGkAtoms::contenteditable, contentEditable,
|
||||
true);
|
||||
|
||||
return NS_OK;
|
||||
return NS_ERROR_DOM_SYNTAX_ERR;
|
||||
}
|
||||
|
||||
nsresult
|
||||
|
@ -44,8 +44,6 @@
|
||||
#include "nsIAtom.h"
|
||||
#include "nsUnicharUtils.h"
|
||||
|
||||
#define TX_ToLowerCase ToLowerCase
|
||||
|
||||
typedef nsCaseInsensitiveStringComparator txCaseInsensitiveStringComparator;
|
||||
|
||||
/**
|
||||
@ -62,7 +60,7 @@ TX_ToLowerCaseAtom(nsIAtom* aAtom)
|
||||
{
|
||||
nsAutoString str;
|
||||
aAtom->ToString(str);
|
||||
TX_ToLowerCase(str);
|
||||
nsContentUtils::ASCIIToLower(str);
|
||||
return do_GetAtom(str);
|
||||
}
|
||||
|
||||
|
@ -938,7 +938,7 @@ txExprParser::resolveQName(const nsAString& aQName,
|
||||
*aPrefix = 0;
|
||||
if (aIsNameTest && aContext->caseInsensitiveNameTests()) {
|
||||
nsAutoString lcname;
|
||||
TX_ToLowerCase(aQName, lcname);
|
||||
nsContentUtils::ASCIIToLower(aQName, lcname);
|
||||
*aLocalName = NS_NewAtom(lcname);
|
||||
}
|
||||
else {
|
||||
|
@ -453,7 +453,7 @@ txXPathNodeUtils::getLocalName(const txXPathNode& aNode, nsAString& aLocalName)
|
||||
// Check for html
|
||||
if (aNode.Content()->NodeInfo()->NamespaceEquals(kNameSpaceID_None) &&
|
||||
aNode.Content()->IsHTML()) {
|
||||
ToUpperCase(aLocalName);
|
||||
nsContentUtils::ASCIIToUpper(aLocalName);
|
||||
}
|
||||
}
|
||||
|
||||
|
@ -160,7 +160,7 @@ txMozillaXMLOutput::attribute(nsIAtom* aPrefix,
|
||||
|
||||
if (mOpenedElementIsHTML && aNsID == kNameSpaceID_None) {
|
||||
nsAutoString lnameStr;
|
||||
TX_ToLowerCase(aLocalName, lnameStr);
|
||||
nsContentUtils::ASCIIToLower(aLocalName, lnameStr);
|
||||
lname = do_GetAtom(lnameStr);
|
||||
}
|
||||
else {
|
||||
@ -499,7 +499,7 @@ txMozillaXMLOutput::startElement(nsIAtom* aPrefix,
|
||||
nsId = kNameSpaceID_XHTML;
|
||||
|
||||
nsAutoString lnameStr;
|
||||
TX_ToLowerCase(aLocalName, lnameStr);
|
||||
nsContentUtils::ASCIIToLower(aLocalName, lnameStr);
|
||||
lname = do_GetAtom(lnameStr);
|
||||
}
|
||||
else {
|
||||
|
Loading…
Reference in New Issue
Block a user