diff --git a/mozilla/content/xul/content/src/nsXULElement.cpp b/mozilla/content/xul/content/src/nsXULElement.cpp index e7aee5b1685..43c6a1b67eb 100644 --- a/mozilla/content/xul/content/src/nsXULElement.cpp +++ b/mozilla/content/xul/content/src/nsXULElement.cpp @@ -2329,7 +2329,7 @@ nsXULElement::SetAttr(nsINodeInfo* aNodeInfo, if (tag == nsXULAtoms::window && aNodeInfo->Equals(nsXULAtoms::hidechrome)) { nsAutoString val(aValue); - HideWindowChrome(val.EqualsIgnoreCase("true")); + HideWindowChrome(val.Equals(NS_LITERAL_STRING("true"))); } // XXX need to check if they're changing an event handler: if so, then we need @@ -3785,7 +3785,7 @@ nsXULElement::GetHidden(PRBool* aResult) *aResult = PR_FALSE; nsAutoString val; GetAttribute(NS_LITERAL_STRING("hidden"), val); - if (val.EqualsIgnoreCase("true")) + if (val.Equals(NS_LITERAL_STRING("true"))) *aResult = PR_TRUE; return NS_OK; } @@ -3806,7 +3806,7 @@ nsXULElement::GetCollapsed(PRBool* aResult) *aResult = PR_FALSE; nsAutoString val; GetAttribute(NS_LITERAL_STRING("collapsed"), val); - if (val.EqualsIgnoreCase("true")) + if (val.Equals(NS_LITERAL_STRING("true"))) *aResult = PR_TRUE; return NS_OK; } @@ -3827,7 +3827,7 @@ nsXULElement::GetAllowEvents(PRBool* aResult) *aResult = PR_FALSE; nsAutoString val; GetAttribute(NS_LITERAL_STRING("allowevents"), val); - if (val.EqualsIgnoreCase("true")) + if (val.Equals(NS_LITERAL_STRING("true"))) *aResult = PR_TRUE; return NS_OK; } diff --git a/mozilla/content/xul/content/src/nsXULPopupListener.cpp b/mozilla/content/xul/content/src/nsXULPopupListener.cpp index 74058edf5c0..191235a85d4 100644 --- a/mozilla/content/xul/content/src/nsXULPopupListener.cpp +++ b/mozilla/content/xul/content/src/nsXULPopupListener.cpp @@ -496,9 +496,9 @@ XULPopupListenerImpl::LaunchPopup(PRInt32 aClientX, PRInt32 aClientY) mElement->GetAttribute(type, identifier); if (identifier.IsEmpty()) { - if (type.EqualsIgnoreCase("popup")) + if (type.Equals(NS_LITERAL_STRING("popup"))) mElement->GetAttribute(NS_LITERAL_STRING("menu"), identifier); - else if (type.EqualsIgnoreCase("context")) + else if (type.Equals(NS_LITERAL_STRING("context"))) mElement->GetAttribute(NS_LITERAL_STRING("contextmenu"), identifier); if (identifier.IsEmpty()) return rv; diff --git a/mozilla/content/xul/document/src/nsXULContentSink.cpp b/mozilla/content/xul/document/src/nsXULContentSink.cpp index 7568a903132..56c03bf1eff 100644 --- a/mozilla/content/xul/document/src/nsXULContentSink.cpp +++ b/mozilla/content/xul/document/src/nsXULContentSink.cpp @@ -1368,12 +1368,10 @@ XULContentSinkImpl::OpenScript(const PRUnichar** aAttributes, nsAutoString src; while (*aAttributes) { const nsDependentString key(aAttributes[0]); - if (key.Equals(NS_LITERAL_STRING("src"), - nsCaseInsensitiveStringComparator())) { + if (key.Equals(NS_LITERAL_STRING("src"))) { src.Assign(aAttributes[1]); } - else if (key.Equals(NS_LITERAL_STRING("type"), - nsCaseInsensitiveStringComparator())) { + else if (key.Equals(NS_LITERAL_STRING("type"))) { nsAutoString type(aAttributes[1]); nsAutoString mimeType; nsAutoString params; @@ -1399,8 +1397,7 @@ XULContentSinkImpl::OpenScript(const PRUnichar** aAttributes, jsVersionString = JS_VersionToString(jsVersion); } } - else if (key.Equals(NS_LITERAL_STRING("language"), - nsCaseInsensitiveStringComparator())) { + else if (key.Equals(NS_LITERAL_STRING("language"))) { nsAutoString lang(aAttributes[1]); isJavaScript = nsParserUtils::IsJavaScriptLanguage(lang, &jsVersionString); } diff --git a/mozilla/content/xul/document/src/nsXULDocument.cpp b/mozilla/content/xul/document/src/nsXULDocument.cpp index ff156438366..158ef678b2d 100644 --- a/mozilla/content/xul/document/src/nsXULDocument.cpp +++ b/mozilla/content/xul/document/src/nsXULDocument.cpp @@ -3822,7 +3822,7 @@ nsXULDocument::OverlayForwardReference::Merge(nsIContent* aTargetNode, // Element in the overlay has the 'removeelement' attribute set // so remove it from the actual document. if (attr == nsXULAtoms::removeelement && - value.EqualsIgnoreCase("true")) { + value.Equals(NS_LITERAL_STRING("true"))) { rv = RemoveElement(aTargetNode->GetParent(), aTargetNode); if (NS_FAILED(rv)) return rv; diff --git a/mozilla/content/xul/templates/src/nsXULSortService.cpp b/mozilla/content/xul/templates/src/nsXULSortService.cpp index e4071f11fff..6bf643bae62 100644 --- a/mozilla/content/xul/templates/src/nsXULSortService.cpp +++ b/mozilla/content/xul/templates/src/nsXULSortService.cpp @@ -401,7 +401,7 @@ XULSortServiceImpl::GetSortColumnInfo(nsIContent *tree, nsAString &sortResource, if (NS_SUCCEEDED(rv = tree->GetAttr(kNameSpaceID_None, nsXULAtoms::sortActive, value)) && (rv == NS_CONTENT_ATTR_HAS_VALUE)) { - if (value.EqualsIgnoreCase("true")) + if (value.Equals(NS_LITERAL_STRING("true"))) { if (NS_SUCCEEDED(rv = tree->GetAttr(kNameSpaceID_None, nsXULAtoms::sortResource, sortResource)) && (rv == NS_CONTENT_ATTR_HAS_VALUE)) @@ -415,7 +415,7 @@ XULSortServiceImpl::GetSortColumnInfo(nsIContent *tree, nsAString &sortResource, if (NS_SUCCEEDED(rv = tree->GetAttr(kNameSpaceID_None, nsXULAtoms::sortSeparators, value)) && (rv == NS_CONTENT_ATTR_HAS_VALUE)) { - if (value.EqualsIgnoreCase("true")) + if (value.Equals(NS_LITERAL_STRING("true"))) { inbetweenSeparatorSort = PR_TRUE; } @@ -1194,7 +1194,7 @@ XULSortServiceImpl::SortContainer(nsIContent *container, sortPtr sortInfo, // if it's a container, find its treechildren nodes, and sort those if (NS_FAILED(rv = parentNode->GetAttr(kNameSpaceID_None, nsXULAtoms::container, value)) || - (rv != NS_CONTENT_ATTR_HAS_VALUE) || (!value.EqualsIgnoreCase("true"))) + (rv != NS_CONTENT_ATTR_HAS_VALUE) || !value.Equals(NS_LITERAL_STRING("true"))) continue; numChildren = parentNode->GetChildCount(); @@ -1433,7 +1433,7 @@ XULSortServiceImpl::InsertContainerNode(nsIRDFCompositeDataSource *db, nsRDFSort } if (NS_SUCCEEDED(rv = root->GetAttr(kNameSpaceID_None, nsXULAtoms::sortStaticsLast, valueStr)) - && (rv == NS_CONTENT_ATTR_HAS_VALUE) && (valueStr.EqualsIgnoreCase("true"))) + && (rv == NS_CONTENT_ATTR_HAS_VALUE) && valueStr.Equals(NS_LITERAL_STRING("true"))) { // indicate that static XUL comes after RDF-generated content by making negative staticCount = -staticCount; @@ -1548,11 +1548,11 @@ XULSortServiceImpl::Sort(nsIDOMNode* node, const nsAString& sortResource, const nsAutoString value; if (NS_SUCCEEDED(rv = dbNode->GetAttr(kNameSpaceID_None, nsXULAtoms::sortActive, value)) && (rv == NS_CONTENT_ATTR_HAS_VALUE) - && (value.EqualsIgnoreCase("true"))) + && value.Equals(NS_LITERAL_STRING("true"))) { if (NS_SUCCEEDED(rv = dbNode->GetAttr(kNameSpaceID_None, nsXULAtoms::sortResource, value)) && (rv == NS_CONTENT_ATTR_HAS_VALUE) - && (value.Equals(sortResource, nsCaseInsensitiveStringComparator()))) + && (value.Equals(sortResource))) { if (NS_SUCCEEDED(rv = dbNode->GetAttr(kNameSpaceID_None, nsXULAtoms::sortDirection, value)) && (rv == NS_CONTENT_ATTR_HAS_VALUE)) diff --git a/mozilla/layout/xul/base/src/nsBoxFrame.cpp b/mozilla/layout/xul/base/src/nsBoxFrame.cpp index 030c35db304..1dcdc27d63b 100644 --- a/mozilla/layout/xul/base/src/nsBoxFrame.cpp +++ b/mozilla/layout/xul/base/src/nsBoxFrame.cpp @@ -299,9 +299,9 @@ void nsBoxFrame::UpdateMouseThrough() if (mContent) { nsAutoString value; if (NS_CONTENT_ATTR_HAS_VALUE == mContent->GetAttr(kNameSpaceID_None, nsXULAtoms::mousethrough, value)) { - if (value.EqualsIgnoreCase("never")) + if (value.Equals(NS_LITERAL_STRING("never"))) mMouseThrough = never; - else if (value.EqualsIgnoreCase("always")) + else if (value.Equals(NS_LITERAL_STRING("always"))) mMouseThrough = always; } @@ -378,10 +378,10 @@ nsBoxFrame::GetInitialDebug(PRBool& aDebug) if (NS_CONTENT_ATTR_HAS_VALUE == content->GetAttr(kNameSpaceID_None, nsXULAtoms::debug, value)) { - if (value.EqualsIgnoreCase("true")) { + if (value.Equals(NS_LITERAL_STRING("true"))) { aDebug = PR_TRUE; return PR_TRUE; - } else if (value.EqualsIgnoreCase("false")) { + } else if (value.Equals(NS_LITERAL_STRING("false"))) { aDebug = PR_FALSE; return PR_TRUE; } @@ -402,10 +402,10 @@ nsBoxFrame::GetInitialHAlignment(nsBoxFrame::Halignment& aHalign) if (NS_CONTENT_ATTR_HAS_VALUE == content->GetAttr(kNameSpaceID_None, nsHTMLAtoms::align, value)) { // XXXdwh Everything inside this if statement is deprecated code. - if (value.EqualsIgnoreCase("left")) { + if (value.Equals(NS_LITERAL_STRING("left"))) { aHalign = nsBoxFrame::hAlign_Left; return PR_TRUE; - } else if (value.EqualsIgnoreCase("right")) { + } else if (value.Equals(NS_LITERAL_STRING("right"))) { aHalign = nsBoxFrame::hAlign_Right; return PR_TRUE; } @@ -419,13 +419,13 @@ nsBoxFrame::GetInitialHAlignment(nsBoxFrame::Halignment& aHalign) res = content->GetAttr(kNameSpaceID_None, nsXULAtoms::pack, value); else res = content->GetAttr(kNameSpaceID_None, nsHTMLAtoms::align, value); if (res == NS_CONTENT_ATTR_HAS_VALUE) { - if (value.EqualsIgnoreCase("start")) { + if (value.Equals(NS_LITERAL_STRING("start"))) { aHalign = nsBoxFrame::hAlign_Left; return PR_TRUE; - } else if (value.EqualsIgnoreCase("center")) { + } else if (value.Equals(NS_LITERAL_STRING("center"))) { aHalign = nsBoxFrame::hAlign_Center; return PR_TRUE; - } else if (value.EqualsIgnoreCase("end")) { + } else if (value.Equals(NS_LITERAL_STRING("end"))) { aHalign = nsBoxFrame::hAlign_Right; return PR_TRUE; } @@ -484,16 +484,16 @@ nsBoxFrame::GetInitialVAlignment(nsBoxFrame::Valignment& aValign) return PR_FALSE; if (NS_CONTENT_ATTR_HAS_VALUE == content->GetAttr(kNameSpaceID_None, nsHTMLAtoms::valign, value)) { - if (value.EqualsIgnoreCase("top")) { + if (value.Equals(NS_LITERAL_STRING("top"))) { aValign = nsBoxFrame::vAlign_Top; return PR_TRUE; - } else if (value.EqualsIgnoreCase("baseline")) { + } else if (value.Equals(NS_LITERAL_STRING("baseline"))) { aValign = nsBoxFrame::vAlign_BaseLine; return PR_TRUE; - } else if (value.EqualsIgnoreCase("middle")) { + } else if (value.Equals(NS_LITERAL_STRING("middle"))) { aValign = nsBoxFrame::vAlign_Middle; return PR_TRUE; - } else if (value.EqualsIgnoreCase("bottom")) { + } else if (value.Equals(NS_LITERAL_STRING("bottom"))) { aValign = nsBoxFrame::vAlign_Bottom; return PR_TRUE; } @@ -507,16 +507,16 @@ nsBoxFrame::GetInitialVAlignment(nsBoxFrame::Valignment& aValign) res = content->GetAttr(kNameSpaceID_None, nsHTMLAtoms::align, value); else res = content->GetAttr(kNameSpaceID_None, nsXULAtoms::pack, value); if (res == NS_CONTENT_ATTR_HAS_VALUE) { - if (value.EqualsIgnoreCase("start")) { + if (value.Equals(NS_LITERAL_STRING("start"))) { aValign = nsBoxFrame::vAlign_Top; return PR_TRUE; - } else if (value.EqualsIgnoreCase("center")) { + } else if (value.Equals(NS_LITERAL_STRING("center"))) { aValign = nsBoxFrame::vAlign_Middle; return PR_TRUE; - } else if (value.EqualsIgnoreCase("baseline")) { + } else if (value.Equals(NS_LITERAL_STRING("baseline"))) { aValign = nsBoxFrame::vAlign_BaseLine; return PR_TRUE; - } else if (value.EqualsIgnoreCase("end")) { + } else if (value.Equals(NS_LITERAL_STRING("end"))) { aValign = nsBoxFrame::vAlign_Bottom; return PR_TRUE; } @@ -589,9 +589,9 @@ nsBoxFrame::GetInitialOrientation(PRBool& aIsHorizontal) // Now see if we have an attribute. The attribute overrides // the style system value. if (NS_CONTENT_ATTR_HAS_VALUE == content->GetAttr(kNameSpaceID_None, nsXULAtoms::orient, value)) { - if (value.EqualsIgnoreCase("vertical")) + if (value.Equals(NS_LITERAL_STRING("vertical"))) aIsHorizontal = PR_FALSE; - else if (value.EqualsIgnoreCase("horizontal")) + else if (value.Equals(NS_LITERAL_STRING("horizontal"))) aIsHorizontal = PR_TRUE; } } @@ -622,11 +622,11 @@ nsBoxFrame::GetInitialDirection(PRBool& aIsNormal) // Now see if we have an attribute. The attribute overrides // the style system value. if (NS_CONTENT_ATTR_HAS_VALUE == content->GetAttr(kNameSpaceID_None, nsXULAtoms::dir, value)) { - if (value.EqualsIgnoreCase("reverse")) + if (value.Equals(NS_LITERAL_STRING("reverse"))) aIsNormal = !aIsNormal; // Invert our direction. - else if (value.EqualsIgnoreCase("ltr")) + else if (value.Equals(NS_LITERAL_STRING("ltr"))) aIsNormal = PR_TRUE; - else if (value.EqualsIgnoreCase("rtl")) + else if (value.Equals(NS_LITERAL_STRING("rtl"))) aIsNormal = PR_FALSE; } } @@ -647,7 +647,7 @@ nsBoxFrame::GetInitialEqualSize(PRBool& aEqualSize) if (NS_CONTENT_ATTR_HAS_VALUE == content->GetAttr(kNameSpaceID_None, nsXULAtoms::equalsize, value)) { - if (value.EqualsIgnoreCase("always")) { + if (value.Equals(NS_LITERAL_STRING("always"))) { aEqualSize = PR_TRUE; return PR_TRUE; } @@ -671,7 +671,7 @@ nsBoxFrame::GetInitialAutoStretch(PRBool& aStretch) // Check the align attribute. if (NS_CONTENT_ATTR_HAS_VALUE == content->GetAttr(kNameSpaceID_None, nsHTMLAtoms::align, value)) { - aStretch = value.EqualsIgnoreCase("stretch"); + aStretch = value.Equals(NS_LITERAL_STRING("stretch")); return PR_TRUE; } diff --git a/mozilla/layout/xul/base/src/nsImageBoxFrame.cpp b/mozilla/layout/xul/base/src/nsImageBoxFrame.cpp index b01046d3342..12addab066e 100644 --- a/mozilla/layout/xul/base/src/nsImageBoxFrame.cpp +++ b/mozilla/layout/xul/base/src/nsImageBoxFrame.cpp @@ -399,9 +399,9 @@ nsImageBoxFrame::UpdateLoadFlags() { nsAutoString loadPolicy; mContent->GetAttr(kNameSpaceID_None, nsXULAtoms::validate, loadPolicy); - if (loadPolicy.EqualsIgnoreCase("always")) + if (loadPolicy.Equals(NS_LITERAL_STRING("always"))) mLoadFlags = nsIRequest::VALIDATE_ALWAYS; - else if (loadPolicy.EqualsIgnoreCase("never")) + else if (loadPolicy.Equals(NS_LITERAL_STRING("never"))) mLoadFlags = nsIRequest::VALIDATE_NEVER|nsIRequest::LOAD_FROM_CACHE; else mLoadFlags = nsIRequest::LOAD_NORMAL; diff --git a/mozilla/layout/xul/base/src/nsLeafBoxFrame.cpp b/mozilla/layout/xul/base/src/nsLeafBoxFrame.cpp index e3a3e27cdb0..9d66f7826b3 100644 --- a/mozilla/layout/xul/base/src/nsLeafBoxFrame.cpp +++ b/mozilla/layout/xul/base/src/nsLeafBoxFrame.cpp @@ -151,9 +151,9 @@ void nsLeafBoxFrame::UpdateMouseThrough() if (mContent) { nsAutoString value; if (NS_CONTENT_ATTR_HAS_VALUE == mContent->GetAttr(kNameSpaceID_None, nsXULAtoms::mousethrough, value)) { - if (value.EqualsIgnoreCase("never")) + if (value.Equals(NS_LITERAL_STRING("never"))) mMouseThrough = never; - else if (value.EqualsIgnoreCase("always")) + else if (value.Equals(NS_LITERAL_STRING("always"))) mMouseThrough = always; } diff --git a/mozilla/layout/xul/base/src/nsMenuFrame.cpp b/mozilla/layout/xul/base/src/nsMenuFrame.cpp index 03b26b23fb2..c744b442049 100644 --- a/mozilla/layout/xul/base/src/nsMenuFrame.cpp +++ b/mozilla/layout/xul/base/src/nsMenuFrame.cpp @@ -946,8 +946,8 @@ nsMenuFrame::IsSizedToPopup(nsIContent* aContent, PRBool aRequireAlways) else { nsAutoString sizedToPopup; aContent->GetAttr(kNameSpaceID_None, nsXULAtoms::sizetopopup, sizedToPopup); - sizeToPopup = (sizedToPopup.EqualsIgnoreCase("always") || - (!aRequireAlways && sizedToPopup.EqualsIgnoreCase("pref"))); + sizeToPopup = sizedToPopup.Equals(NS_LITERAL_STRING("always")) || + !aRequireAlways && sizedToPopup.Equals(NS_LITERAL_STRING("pref")); } return sizeToPopup; diff --git a/mozilla/layout/xul/base/src/nsMenuPopupFrame.cpp b/mozilla/layout/xul/base/src/nsMenuPopupFrame.cpp index 989ad5e1a31..bf1a61e27ee 100644 --- a/mozilla/layout/xul/base/src/nsMenuPopupFrame.cpp +++ b/mozilla/layout/xul/base/src/nsMenuPopupFrame.cpp @@ -1407,7 +1407,7 @@ NS_IMETHODIMP nsMenuPopupFrame::ConsumeOutsideClicks(PRBool& aConsumeOutsideClic // Don't consume outside clicks for autocomplete widget nsAutoString typeString; parentContent->GetAttr(kNameSpaceID_None, nsHTMLAtoms::type, typeString); - if (typeString.EqualsIgnoreCase("autocomplete")) + if (typeString.Equals(NS_LITERAL_STRING("autocomplete"))) aConsumeOutsideClicks = PR_FALSE; } } diff --git a/mozilla/layout/xul/base/src/nsResizerFrame.cpp b/mozilla/layout/xul/base/src/nsResizerFrame.cpp index 0adb07d3d45..a2a22e20a7a 100644 --- a/mozilla/layout/xul/base/src/nsResizerFrame.cpp +++ b/mozilla/layout/xul/base/src/nsResizerFrame.cpp @@ -272,35 +272,35 @@ nsResizerFrame::EvalDirection(nsAutoString& aText,eDirection& aDir) { PRBool aResult = PR_TRUE; - if( aText.EqualsIgnoreCase("topleft") ) + if( aText.Equals( NS_LITERAL_STRING("topleft") ) ) { aDir = topleft; } - else if( aText.EqualsIgnoreCase("top") ) + else if( aText.Equals( NS_LITERAL_STRING("top") ) ) { aDir = top; } - else if( aText.EqualsIgnoreCase("topright") ) + else if( aText.Equals( NS_LITERAL_STRING("topright") ) ) { aDir = topright; } - else if( aText.EqualsIgnoreCase("left") ) + else if( aText.Equals( NS_LITERAL_STRING("left") ) ) { aDir = left; } - else if( aText.EqualsIgnoreCase("right") ) + else if( aText.Equals( NS_LITERAL_STRING("right") ) ) { aDir = right; } - else if( aText.EqualsIgnoreCase("bottomleft") ) + else if( aText.Equals( NS_LITERAL_STRING("bottomleft") ) ) { aDir = bottomleft; } - else if( aText.EqualsIgnoreCase("bottom") ) + else if( aText.Equals( NS_LITERAL_STRING("bottom") ) ) { aDir = bottom; } - else if( aText.EqualsIgnoreCase("bottomright") ) + else if( aText.Equals( NS_LITERAL_STRING("bottomright") ) ) { aDir = bottomright; } diff --git a/mozilla/layout/xul/base/src/nsSplitterFrame.cpp b/mozilla/layout/xul/base/src/nsSplitterFrame.cpp index 250d966307c..ba513b271b3 100644 --- a/mozilla/layout/xul/base/src/nsSplitterFrame.cpp +++ b/mozilla/layout/xul/base/src/nsSplitterFrame.cpp @@ -186,7 +186,7 @@ nsSplitterFrameInner::GetResizeBefore() nsString value; mOuter->GetContent()->GetAttr(kNameSpaceID_None, nsXULAtoms::resizebefore, value); - if (value.EqualsIgnoreCase("farthest")) + if (value.Equals(NS_LITERAL_STRING("farthest"))) return Farthest; else return Closest; @@ -204,9 +204,9 @@ nsSplitterFrameInner::GetResizeAfter() nsString value; mOuter->GetContent()->GetAttr(kNameSpaceID_None, nsXULAtoms::resizeafter, value); - if (value.EqualsIgnoreCase("farthest")) + if (value.Equals(NS_LITERAL_STRING("farthest"))) return Farthest; - else if (value.EqualsIgnoreCase("grow")) + else if (value.Equals(NS_LITERAL_STRING("grow"))) return Grow; else return Closest; @@ -218,9 +218,9 @@ nsSplitterFrameInner::GetState() nsString value; mOuter->GetContent()->GetAttr(kNameSpaceID_None, nsXULAtoms::state, value); - if (value.EqualsIgnoreCase("dragging")) + if (value.Equals(NS_LITERAL_STRING("dragging"))) return Dragging; - else if (value.EqualsIgnoreCase("collapsed")) + else if (value.Equals(NS_LITERAL_STRING("collapsed"))) return Collapsed; else return Open; @@ -961,9 +961,9 @@ nsSplitterFrameInner::GetCollapseDirection() nsString value; if (NS_CONTENT_ATTR_HAS_VALUE == mOuter->mContent->GetAttr(kNameSpaceID_None, nsXULAtoms::collapse, value)) { - if (value.EqualsIgnoreCase("before")) + if (value.Equals(NS_LITERAL_STRING("before"))) return Before; - else if (value.EqualsIgnoreCase("after")) + else if (value.Equals(NS_LITERAL_STRING("after"))) return After; else return None; diff --git a/mozilla/layout/xul/base/src/nsTextBoxFrame.cpp b/mozilla/layout/xul/base/src/nsTextBoxFrame.cpp index 1b077c8259d..647d3b444c3 100644 --- a/mozilla/layout/xul/base/src/nsTextBoxFrame.cpp +++ b/mozilla/layout/xul/base/src/nsTextBoxFrame.cpp @@ -237,11 +237,13 @@ nsTextBoxFrame::UpdateAttributes(nsIPresContext* aPresContext, mContent->GetAttr(kNameSpaceID_None, nsXULAtoms::crop, value); CroppingStyle cropType; - if (value.EqualsIgnoreCase(CROP_LEFT) || value.EqualsIgnoreCase(CROP_START)) + if (value.Equals(NS_LITERAL_STRING(CROP_LEFT)) || + value.Equals(NS_LITERAL_STRING(CROP_START))) cropType = CropLeft; - else if (value.EqualsIgnoreCase(CROP_CENTER)) + else if (value.Equals(NS_LITERAL_STRING(CROP_CENTER))) cropType = CropCenter; - else if (value.EqualsIgnoreCase(CROP_RIGHT) || value.EqualsIgnoreCase(CROP_END)) + else if (value.Equals(NS_LITERAL_STRING(CROP_RIGHT)) || + value.Equals(NS_LITERAL_STRING(CROP_END))) cropType = CropRight; else cropType = CropNone; diff --git a/mozilla/layout/xul/base/src/tree/src/nsTreeBodyFrame.cpp b/mozilla/layout/xul/base/src/tree/src/nsTreeBodyFrame.cpp index c1155fb66ca..86fdfd23af9 100644 --- a/mozilla/layout/xul/base/src/tree/src/nsTreeBodyFrame.cpp +++ b/mozilla/layout/xul/base/src/tree/src/nsTreeBodyFrame.cpp @@ -224,9 +224,10 @@ nsTreeColumn::nsTreeColumn(nsIContent* aColElement, nsIFrame* aFrame) mCropStyle = 0; nsAutoString crop; mColElement->GetAttr(kNameSpaceID_None, nsXULAtoms::crop, crop); - if (crop.EqualsIgnoreCase("center")) + if (crop.Equals(NS_LITERAL_STRING("center"))) mCropStyle = 1; - else if (crop.EqualsIgnoreCase("left") || crop.EqualsIgnoreCase("start")) + else if (crop.Equals(NS_LITERAL_STRING("left")) || + crop.Equals(NS_LITERAL_STRING("start"))) mCropStyle = 2; // Cache our text alignment policy. @@ -243,7 +244,7 @@ nsTreeColumn::nsTreeColumn(nsIContent* aColElement, nsIFrame* aFrame) mIsPrimaryCol = PR_FALSE; nsAutoString primary; mColElement->GetAttr(kNameSpaceID_None, nsXULAtoms::primary, primary); - if (primary.EqualsIgnoreCase("true")) + if (primary.Equals(NS_LITERAL_STRING("true"))) mIsPrimaryCol = PR_TRUE; // Figure out if we're a cycling column (one that doesn't cause a selection @@ -251,16 +252,16 @@ nsTreeColumn::nsTreeColumn(nsIContent* aColElement, nsIFrame* aFrame) mIsCyclerCol = PR_FALSE; nsAutoString cycler; mColElement->GetAttr(kNameSpaceID_None, nsXULAtoms::cycler, cycler); - if (cycler.EqualsIgnoreCase("true")) + if (cycler.Equals(NS_LITERAL_STRING("true"))) mIsCyclerCol = PR_TRUE; // Figure out our column type. Default type is text. mType = eText; nsAutoString type; mColElement->GetAttr(kNameSpaceID_None, nsHTMLAtoms::type, type); - if (type.EqualsIgnoreCase("checkbox")) + if (type.Equals(NS_LITERAL_STRING("checkbox"))) mType = eCheckbox; - else if (type.EqualsIgnoreCase("progressmeter")) + else if (type.Equals(NS_LITERAL_STRING("progressmeter"))) mType = eProgressMeter; // Cache our index. @@ -833,7 +834,7 @@ NS_IMETHODIMP nsTreeBodyFrame::GetKeyColumnIndex(PRInt32 *_retval) for (nsTreeColumn* currCol = mColumns; currCol; currCol = currCol->GetNext()) { // Skip hidden column currCol->GetElement()->GetAttr(kNameSpaceID_None, nsHTMLAtoms::hidden, attr); - if (attr.EqualsIgnoreCase("true")) + if (attr.Equals(NS_LITERAL_STRING("true"))) continue; // Skip non-text column