From 4e651390ef622aac46099b96e29be2e802404e04 Mon Sep 17 00:00:00 2001 From: "timeless%mozdev.org" Date: Tue, 26 Dec 2006 17:47:52 +0000 Subject: [PATCH] Bug 355300 There should be only one nsGkAtoms creature r=dbaron --- content/base/src/nsContentList.cpp | 7 +- content/base/src/nsContentSink.cpp | 16 +- content/base/src/nsContentSink.h | 316 +++---- content/base/src/nsContentUtils.cpp | 16 +- content/base/src/nsCopySupport.cpp | 8 +- content/base/src/nsDOMDocumentType.cpp | 3 +- content/base/src/nsDocument.cpp | 37 +- content/base/src/nsDocumentEncoder.cpp | 70 +- content/base/src/nsDocumentFragment.cpp | 2 +- content/base/src/nsFrameLoader.cpp | 16 +- content/base/src/nsGenericElement.cpp | 15 +- content/base/src/nsHTMLContentSerializer.cpp | 245 +++--- content/base/src/nsNodeInfoManager.cpp | 6 +- content/base/src/nsObjectLoadingContent.cpp | 13 +- content/base/src/nsPlainTextSerializer.cpp | 20 +- content/base/src/nsScriptLoader.cpp | 6 +- content/base/src/nsXMLContentSerializer.cpp | 77 +- content/base/src/nsXMLNameSpaceMap.cpp | 4 +- content/events/src/nsDOMEvent.cpp | 86 +- content/events/src/nsEventListenerManager.cpp | 31 +- content/events/src/nsEventStateManager.cpp | 74 +- content/events/src/nsXMLEventsElement.cpp | 10 +- content/events/src/nsXMLEventsManager.cpp | 39 +- content/html/content/src/nsFormSubmission.cpp | 12 +- .../html/content/src/nsGenericHTMLElement.cpp | 268 +++--- .../html/content/src/nsGenericHTMLElement.h | 28 +- .../html/content/src/nsHTMLAnchorElement.cpp | 22 +- .../html/content/src/nsHTMLAreaElement.cpp | 18 +- content/html/content/src/nsHTMLAtoms.h | 1 - content/html/content/src/nsHTMLBRElement.cpp | 8 +- .../html/content/src/nsHTMLBodyElement.cpp | 65 +- .../html/content/src/nsHTMLButtonElement.cpp | 14 +- .../html/content/src/nsHTMLCanvasElement.cpp | 20 +- content/html/content/src/nsHTMLDivElement.cpp | 26 +- .../html/content/src/nsHTMLFontElement.cpp | 32 +- .../html/content/src/nsHTMLFormElement.cpp | 20 +- .../html/content/src/nsHTMLFrameElement.cpp | 12 +- .../content/src/nsHTMLFrameSetElement.cpp | 20 +- content/html/content/src/nsHTMLHRElement.cpp | 32 +- .../html/content/src/nsHTMLHeadingElement.cpp | 4 +- .../html/content/src/nsHTMLIFrameElement.cpp | 28 +- .../html/content/src/nsHTMLImageElement.cpp | 29 +- .../html/content/src/nsHTMLInputElement.cpp | 90 +- content/html/content/src/nsHTMLLIElement.cpp | 10 +- .../html/content/src/nsHTMLLabelElement.cpp | 10 +- .../html/content/src/nsHTMLLegendElement.cpp | 10 +- .../html/content/src/nsHTMLLinkElement.cpp | 34 +- content/html/content/src/nsHTMLMapElement.cpp | 4 +- .../html/content/src/nsHTMLOListElement.cpp | 22 +- .../content/src/nsHTMLOptGroupElement.cpp | 10 +- .../html/content/src/nsHTMLOptionElement.cpp | 27 +- .../content/src/nsHTMLParagraphElement.cpp | 4 +- content/html/content/src/nsHTMLPreElement.cpp | 26 +- .../html/content/src/nsHTMLScriptElement.cpp | 4 +- .../html/content/src/nsHTMLSelectElement.cpp | 26 +- .../html/content/src/nsHTMLSharedElement.cpp | 56 +- .../html/content/src/nsHTMLSpanElement.cpp | 10 +- .../html/content/src/nsHTMLStyleElement.cpp | 22 +- .../content/src/nsHTMLTableCaptionElement.cpp | 8 +- .../content/src/nsHTMLTableCellElement.cpp | 56 +- .../content/src/nsHTMLTableColElement.cpp | 32 +- .../html/content/src/nsHTMLTableElement.cpp | 120 +-- .../content/src/nsHTMLTableRowElement.cpp | 30 +- .../content/src/nsHTMLTableSectionElement.cpp | 28 +- .../content/src/nsHTMLTextAreaElement.cpp | 22 +- .../html/document/src/nsHTMLContentSink.cpp | 24 +- content/html/document/src/nsHTMLDocument.cpp | 49 +- .../src/nsHTMLFragmentContentSink.cpp | 18 +- content/html/document/src/nsImageDocument.cpp | 20 +- content/html/document/src/nsMediaDocument.cpp | 6 +- .../html/document/src/nsPluginDocument.cpp | 18 +- content/svg/content/src/nsSVGAngle.cpp | 14 +- content/svg/content/src/nsSVGAtoms.h | 1 - .../svg/content/src/nsSVGClipPathElement.cpp | 8 +- content/svg/content/src/nsSVGElement.cpp | 166 ++-- .../svg/content/src/nsSVGElementFactory.cpp | 104 +-- content/svg/content/src/nsSVGFeatures.cpp | 4 +- .../svg/content/src/nsSVGFilterElement.cpp | 12 +- content/svg/content/src/nsSVGFilters.cpp | 73 +- .../svg/content/src/nsSVGGradientElement.cpp | 20 +- .../svg/content/src/nsSVGGraphicElement.cpp | 4 +- content/svg/content/src/nsSVGImageElement.cpp | 8 +- content/svg/content/src/nsSVGLength.cpp | 38 +- .../svg/content/src/nsSVGMarkerElement.cpp | 16 +- content/svg/content/src/nsSVGMaskElement.cpp | 10 +- .../svg/content/src/nsSVGPatternElement.cpp | 18 +- content/svg/content/src/nsSVGPolyElement.cpp | 2 +- content/svg/content/src/nsSVGSVGElement.cpp | 18 +- .../svg/content/src/nsSVGScriptElement.cpp | 6 +- .../svg/content/src/nsSVGStylableElement.cpp | 4 +- content/svg/content/src/nsSVGStyleElement.cpp | 36 +- .../svg/content/src/nsSVGSymbolElement.cpp | 6 +- content/svg/content/src/nsSVGTSpanElement.cpp | 10 +- content/svg/content/src/nsSVGTextElement.cpp | 10 +- .../svg/content/src/nsSVGTextPathElement.cpp | 16 +- .../content/src/nsSVGTransformListParser.cpp | 26 +- content/svg/content/src/nsSVGUseElement.cpp | 58 +- content/xbl/src/nsXBLBinding.cpp | 31 +- content/xbl/src/nsXBLContentSink.cpp | 121 ++- content/xbl/src/nsXBLPrototypeBinding.cpp | 62 +- content/xbl/src/nsXBLPrototypeHandler.cpp | 25 +- content/xbl/src/nsXBLService.cpp | 22 +- content/xbl/src/nsXBLWindowHandler.cpp | 6 +- content/xml/content/src/nsXMLCDATASection.cpp | 2 +- content/xml/content/src/nsXMLElement.cpp | 17 +- .../src/nsXMLProcessingInstruction.cpp | 2 +- content/xml/content/src/nsXMLStylesheetPI.cpp | 2 +- content/xml/document/src/nsXMLContentSink.cpp | 67 +- .../document/src/nsXMLFragmentContentSink.cpp | 8 +- content/xtf/src/nsXTFElementWrapper.cpp | 7 +- content/xul/content/src/nsXULAtoms.h | 1 - content/xul/content/src/nsXULElement.cpp | 187 ++-- content/xul/content/src/nsXULElement.h | 4 +- .../xul/content/src/nsXULPopupListener.cpp | 8 +- content/xul/document/src/nsXULContentSink.cpp | 20 +- content/xul/document/src/nsXULDocument.cpp | 93 +- .../xul/templates/src/nsXULContentBuilder.cpp | 69 +- .../xul/templates/src/nsXULContentUtils.cpp | 8 +- .../templates/src/nsXULTemplateBuilder.cpp | 92 +- .../src/nsXULTemplateQueryProcessorRDF.cpp | 50 +- .../xul/templates/src/nsXULTreeBuilder.cpp | 55 +- layout/base/nsBidiPresUtils.cpp | 48 +- layout/base/nsCSSFrameConstructor.cpp | 828 +++++++++--------- layout/base/nsCSSRendering.cpp | 29 +- layout/base/nsDisplayList.cpp | 4 +- layout/base/nsFrameManager.cpp | 19 +- layout/base/nsFrameTraversal.cpp | 8 +- layout/base/nsImageLoader.cpp | 2 +- layout/base/nsLayoutAtoms.h | 5 +- layout/base/nsLayoutUtils.cpp | 6 +- layout/base/nsPresContext.cpp | 10 +- layout/base/nsPresContext.h | 2 +- layout/base/nsPresShell.cpp | 23 +- layout/build/nsContentDLF.cpp | 8 +- layout/forms/nsButtonFrameRenderer.cpp | 8 +- layout/forms/nsComboboxControlFrame.cpp | 23 +- layout/forms/nsFieldSetFrame.cpp | 7 +- layout/forms/nsFileControlFrame.cpp | 28 +- layout/forms/nsFormControlFrame.cpp | 4 +- layout/forms/nsGfxButtonControlFrame.cpp | 5 +- layout/forms/nsHTMLButtonControlFrame.cpp | 13 +- layout/forms/nsImageControlFrame.cpp | 11 +- layout/forms/nsIsIndexFrame.cpp | 12 +- layout/forms/nsLegendFrame.cpp | 5 +- layout/forms/nsListControlFrame.cpp | 25 +- layout/forms/nsSelectsAreaFrame.cpp | 2 +- layout/forms/nsTextControlFrame.cpp | 51 +- layout/generic/nsAbsoluteContainingBlock.h | 4 +- layout/generic/nsAreaFrame.cpp | 14 +- layout/generic/nsBRFrame.cpp | 5 +- layout/generic/nsBidiFrames.cpp | 4 +- layout/generic/nsBlockFrame.cpp | 115 ++- layout/generic/nsBlockReflowContext.cpp | 6 +- layout/generic/nsBlockReflowState.cpp | 13 +- layout/generic/nsBulletFrame.cpp | 7 +- layout/generic/nsColumnSetFrame.cpp | 2 +- layout/generic/nsContainerFrame.cpp | 14 +- layout/generic/nsFirstLetterFrame.cpp | 3 +- layout/generic/nsFrame.cpp | 119 ++- layout/generic/nsFrameFrame.cpp | 19 +- layout/generic/nsFrameSetFrame.cpp | 33 +- layout/generic/nsGfxScrollFrame.cpp | 46 +- layout/generic/nsHTMLCanvasFrame.cpp | 2 +- layout/generic/nsHTMLContainerFrame.cpp | 2 +- layout/generic/nsHTMLFrame.cpp | 7 +- layout/generic/nsHTMLReflowState.cpp | 57 +- layout/generic/nsIFrame.h | 6 +- layout/generic/nsImageFrame.cpp | 19 +- layout/generic/nsImageMap.cpp | 27 +- layout/generic/nsInlineFrame.cpp | 21 +- layout/generic/nsLineLayout.cpp | 33 +- layout/generic/nsObjectFrame.cpp | 27 +- layout/generic/nsPageContentFrame.cpp | 3 +- layout/generic/nsPageFrame.cpp | 6 +- layout/generic/nsPlaceholderFrame.cpp | 2 +- layout/generic/nsPlaceholderFrame.h | 6 +- layout/generic/nsSelection.cpp | 35 +- layout/generic/nsSimplePageSequence.cpp | 7 +- layout/generic/nsSpacerFrame.cpp | 8 +- layout/generic/nsTextFrame.cpp | 35 +- layout/generic/nsTextTransformer.cpp | 2 +- layout/generic/nsViewportFrame.cpp | 4 +- layout/generic/nsViewportFrame.h | 4 +- .../base/src/nsMathMLContainerFrame.cpp | 18 +- layout/mathml/base/src/nsMathMLFrame.cpp | 56 +- layout/mathml/base/src/nsMathMLTokenFrame.cpp | 26 +- .../mathml/base/src/nsMathMLmactionFrame.cpp | 12 +- .../mathml/base/src/nsMathMLmfencedFrame.cpp | 6 +- layout/mathml/base/src/nsMathMLmfracFrame.cpp | 10 +- .../base/src/nsMathMLmmultiscriptsFrame.cpp | 8 +- layout/mathml/base/src/nsMathMLmoFrame.cpp | 32 +- layout/mathml/base/src/nsMathMLmoverFrame.cpp | 6 +- .../mathml/base/src/nsMathMLmpaddedFrame.cpp | 8 +- layout/mathml/base/src/nsMathMLmrowFrame.cpp | 8 +- .../mathml/base/src/nsMathMLmspaceFrame.cpp | 6 +- .../mathml/base/src/nsMathMLmstyleFrame.cpp | 2 +- layout/mathml/base/src/nsMathMLmsubFrame.cpp | 2 +- .../mathml/base/src/nsMathMLmsubsupFrame.cpp | 4 +- layout/mathml/base/src/nsMathMLmsupFrame.cpp | 2 +- .../mathml/base/src/nsMathMLmtableFrame.cpp | 78 +- .../mathml/base/src/nsMathMLmunderFrame.cpp | 6 +- .../base/src/nsMathMLmunderoverFrame.cpp | 10 +- layout/mathml/content/src/nsMathMLAtoms.h | 1 - layout/printing/nsPrintEngine.cpp | 12 +- layout/style/nsCSSLoader.cpp | 4 +- layout/style/nsCSSRuleProcessor.cpp | 32 +- layout/style/nsCSSStyleSheet.cpp | 2 +- layout/style/nsComputedDOMStyle.cpp | 96 +- layout/style/nsHTMLStyleSheet.cpp | 24 +- layout/style/nsInspectorCSSUtils.cpp | 2 +- layout/style/nsStyleUtil.cpp | 8 +- layout/svg/base/src/nsSVGClipPathFrame.cpp | 6 +- layout/svg/base/src/nsSVGFilterFrame.cpp | 18 +- .../svg/base/src/nsSVGForeignObjectFrame.cpp | 3 +- layout/svg/base/src/nsSVGGFrame.cpp | 2 +- .../base/src/nsSVGGenericContainerFrame.cpp | 2 +- layout/svg/base/src/nsSVGGlyphFrame.cpp | 10 +- layout/svg/base/src/nsSVGGradientFrame.cpp | 6 +- layout/svg/base/src/nsSVGImageFrame.cpp | 4 +- layout/svg/base/src/nsSVGInnerSVGFrame.cpp | 4 +- layout/svg/base/src/nsSVGMarkerFrame.cpp | 4 +- layout/svg/base/src/nsSVGMaskFrame.cpp | 4 +- layout/svg/base/src/nsSVGOuterSVGFrame.cpp | 4 +- .../svg/base/src/nsSVGPathGeometryFrame.cpp | 4 +- layout/svg/base/src/nsSVGPatternFrame.cpp | 9 +- layout/svg/base/src/nsSVGTSpanFrame.cpp | 2 +- .../svg/base/src/nsSVGTextContainerFrame.cpp | 2 +- layout/svg/base/src/nsSVGTextFrame.cpp | 2 +- layout/svg/base/src/nsSVGTextPathFrame.cpp | 4 +- layout/svg/base/src/nsSVGUseFrame.cpp | 4 +- layout/tables/BasicTableLayoutStrategy.cpp | 2 +- layout/tables/nsTableCellFrame.cpp | 15 +- layout/tables/nsTableColFrame.cpp | 7 +- layout/tables/nsTableColGroupFrame.cpp | 15 +- layout/tables/nsTableFrame.cpp | 105 ++- layout/tables/nsTableOuterFrame.cpp | 24 +- layout/tables/nsTablePainter.cpp | 2 +- layout/tables/nsTableRowFrame.cpp | 15 +- layout/tables/nsTableRowGroupFrame.cpp | 29 +- layout/xul/base/src/nsBox.cpp | 22 +- layout/xul/base/src/nsBoxFrame.cpp | 138 ++- layout/xul/base/src/nsButtonBoxFrame.cpp | 7 +- layout/xul/base/src/nsDeckFrame.cpp | 6 +- layout/xul/base/src/nsDocElementBoxFrame.cpp | 10 +- layout/xul/base/src/nsImageBoxFrame.cpp | 17 +- layout/xul/base/src/nsLeafBoxFrame.cpp | 9 +- layout/xul/base/src/nsListBoxBodyFrame.cpp | 35 +- layout/xul/base/src/nsListBoxLayout.cpp | 6 +- layout/xul/base/src/nsListBoxObject.cpp | 4 +- layout/xul/base/src/nsListItemFrame.cpp | 6 +- layout/xul/base/src/nsMenuBarFrame.cpp | 13 +- layout/xul/base/src/nsMenuFrame.cpp | 130 ++- layout/xul/base/src/nsMenuPopupFrame.cpp | 69 +- .../xul/base/src/nsNativeScrollbarFrame.cpp | 26 +- layout/xul/base/src/nsPopupBoxObject.cpp | 11 +- layout/xul/base/src/nsPopupSetFrame.cpp | 48 +- layout/xul/base/src/nsProgressMeterFrame.cpp | 13 +- layout/xul/base/src/nsResizerFrame.cpp | 7 +- layout/xul/base/src/nsRootBoxFrame.cpp | 12 +- .../xul/base/src/nsScrollbarButtonFrame.cpp | 23 +- layout/xul/base/src/nsScrollbarFrame.cpp | 4 +- layout/xul/base/src/nsSliderFrame.cpp | 52 +- layout/xul/base/src/nsSplitterFrame.cpp | 67 +- layout/xul/base/src/nsStackLayout.cpp | 7 +- layout/xul/base/src/nsTextBoxFrame.cpp | 27 +- layout/xul/base/src/nsTitleBarFrame.cpp | 7 +- layout/xul/base/src/nsXULTooltipListener.cpp | 18 +- .../xul/base/src/tree/src/nsTreeBodyFrame.cpp | 91 +- .../xul/base/src/tree/src/nsTreeBoxObject.cpp | 6 +- .../xul/base/src/tree/src/nsTreeColFrame.cpp | 7 +- .../xul/base/src/tree/src/nsTreeColumns.cpp | 51 +- .../base/src/tree/src/nsTreeContentView.cpp | 281 +++--- .../xul/base/src/tree/src/nsTreeSelection.cpp | 6 +- layout/xul/base/src/tree/src/nsTreeUtils.cpp | 18 +- 274 files changed, 4014 insertions(+), 4151 deletions(-) diff --git a/content/base/src/nsContentList.cpp b/content/base/src/nsContentList.cpp index 5006fcd4cf79..945abda2d79a 100644 --- a/content/base/src/nsContentList.cpp +++ b/content/base/src/nsContentList.cpp @@ -52,7 +52,6 @@ #include "nsContentUtils.h" #include "nsLayoutAtoms.h" -#include "nsHTMLAtoms.h" // XXX until atoms get factored into nsLayoutAtoms // Form related includes #include "nsIDOMHTMLFormElement.h" @@ -302,7 +301,7 @@ nsContentList::nsContentList(nsINode* aRootNode, mFuncMayDependOnAttr(PR_FALSE) { NS_ASSERTION(mRootNode, "Must have root"); - if (nsLayoutAtoms::_asterix == mMatchAtom) { + if (nsGkAtoms::_asterix == mMatchAtom) { mMatchAll = PR_TRUE; } else { @@ -412,9 +411,9 @@ nsContentList::NamedItem(const nsAString& aName, PRBool aDoFlush) nsIContent *content = mElements[i]; // XXX Should this pass eIgnoreCase? if (content && - (content->AttrValueIs(kNameSpaceID_None, nsHTMLAtoms::name, + (content->AttrValueIs(kNameSpaceID_None, nsGkAtoms::name, name, eCaseMatters) || - content->AttrValueIs(kNameSpaceID_None, nsHTMLAtoms::id, + content->AttrValueIs(kNameSpaceID_None, nsGkAtoms::id, name, eCaseMatters))) { return content; } diff --git a/content/base/src/nsContentSink.cpp b/content/base/src/nsContentSink.cpp index 560fd11234f6..44fc8e0f8e4e 100644 --- a/content/base/src/nsContentSink.cpp +++ b/content/base/src/nsContentSink.cpp @@ -63,7 +63,7 @@ #include "nsIScrollableView.h" #include "nsIContentViewer.h" #include "nsIAtom.h" -#include "nsHTMLAtoms.h" +#include "nsGkAtoms.h" #include "nsIDOMWindowInternal.h" #include "nsIPrincipal.h" #include "nsIScriptGlobalObject.h" @@ -300,7 +300,7 @@ nsContentSink::ProcessHTTPHeaders(nsIChannel* aChannel) nsresult rv = httpchannel->GetResponseHeader(NS_LITERAL_CSTRING("link"), linkHeader); if (NS_SUCCEEDED(rv) && !linkHeader.IsEmpty()) { - ProcessHeaderData(nsHTMLAtoms::link, + ProcessHeaderData(nsGkAtoms::link, NS_ConvertASCIItoUTF16(linkHeader)); } @@ -316,7 +316,7 @@ nsContentSink::ProcessHeaderData(nsIAtom* aHeader, const nsAString& aValue, mDocument->SetHeaderData(aHeader, aValue); - if (aHeader == nsHTMLAtoms::setcookie) { + if (aHeader == nsGkAtoms::setcookie) { // Note: Necko already handles cookies set via the channel. We can't just // call SetCookie on the channel because we want to do some security checks // here and want to use the prompt associated to our current window, not @@ -357,10 +357,10 @@ nsContentSink::ProcessHeaderData(nsIAtom* aHeader, const nsAString& aValue, return rv; } } - else if (aHeader == nsHTMLAtoms::link) { + else if (aHeader == nsGkAtoms::link) { rv = ProcessLinkHeader(aContent, aValue); } - else if (aHeader == nsHTMLAtoms::msthemecompatible) { + else if (aHeader == nsGkAtoms::msthemecompatible) { // Disable theming for the presshell if the value is no. // XXXbz don't we want to support this as an HTTP header too? nsAutoString value(aValue); @@ -373,7 +373,7 @@ nsContentSink::ProcessHeaderData(nsIAtom* aHeader, const nsAString& aValue, } // Don't report "refresh" headers back to necko, since our document handles // them - else if (aHeader != nsHTMLAtoms::refresh && mParser) { + else if (aHeader != nsGkAtoms::refresh && mParser) { // we also need to report back HTTP-EQUIV headers to the channel // so that it can process things like pragma: no-cache or other // cache-control headers. Ideally this should also be the way for @@ -662,10 +662,10 @@ nsContentSink::ProcessMETATag(nsIContent* aContent) // set any HTTP-EQUIV data into document's header data as well as url nsAutoString header; - aContent->GetAttr(kNameSpaceID_None, nsHTMLAtoms::httpEquiv, header); + aContent->GetAttr(kNameSpaceID_None, nsGkAtoms::httpEquiv, header); if (!header.IsEmpty()) { nsAutoString result; - aContent->GetAttr(kNameSpaceID_None, nsHTMLAtoms::content, result); + aContent->GetAttr(kNameSpaceID_None, nsGkAtoms::content, result); if (!result.IsEmpty()) { ToLowerCase(header); nsCOMPtr fieldAtom(do_GetAtom(header)); diff --git a/content/base/src/nsContentSink.h b/content/base/src/nsContentSink.h index f0cc81da5b8f..1b9dacdfc5a7 100644 --- a/content/base/src/nsContentSink.h +++ b/content/base/src/nsContentSink.h @@ -52,7 +52,7 @@ #include "nsCOMArray.h" #include "nsString.h" #include "nsAutoPtr.h" -#include "nsHTMLAtoms.h" +#include "nsGkAtoms.h" #include "nsTHashtable.h" #include "nsHashKeys.h" @@ -133,171 +133,171 @@ protected: // Thanks to Mark Pilgrim and Sam Ruby for the initial whitelist // static nsIAtom** const kDefaultAllowedTags [] = { - &nsHTMLAtoms::a, - &nsHTMLAtoms::abbr, - &nsHTMLAtoms::acronym, - &nsHTMLAtoms::address, - &nsHTMLAtoms::area, - &nsHTMLAtoms::b, - &nsHTMLAtoms::bdo, - &nsHTMLAtoms::big, - &nsHTMLAtoms::blockquote, - &nsHTMLAtoms::br, - &nsHTMLAtoms::button, - &nsHTMLAtoms::caption, - &nsHTMLAtoms::center, - &nsHTMLAtoms::cite, - &nsHTMLAtoms::code, - &nsHTMLAtoms::col, - &nsHTMLAtoms::colgroup, - &nsHTMLAtoms::dd, - &nsHTMLAtoms::del, - &nsHTMLAtoms::dfn, - &nsHTMLAtoms::dir, - &nsHTMLAtoms::div, - &nsHTMLAtoms::dl, - &nsHTMLAtoms::dt, - &nsHTMLAtoms::em, - &nsHTMLAtoms::fieldset, - &nsHTMLAtoms::font, - &nsHTMLAtoms::form, - &nsHTMLAtoms::h1, - &nsHTMLAtoms::h2, - &nsHTMLAtoms::h3, - &nsHTMLAtoms::h4, - &nsHTMLAtoms::h5, - &nsHTMLAtoms::h6, - &nsHTMLAtoms::hr, - &nsHTMLAtoms::i, - &nsHTMLAtoms::img, - &nsHTMLAtoms::input, - &nsHTMLAtoms::ins, - &nsHTMLAtoms::kbd, - &nsHTMLAtoms::label, - &nsHTMLAtoms::legend, - &nsHTMLAtoms::li, - &nsHTMLAtoms::listing, - &nsHTMLAtoms::map, - &nsHTMLAtoms::menu, - &nsHTMLAtoms::nobr, - &nsHTMLAtoms::ol, - &nsHTMLAtoms::optgroup, - &nsHTMLAtoms::option, - &nsHTMLAtoms::p, - &nsHTMLAtoms::pre, - &nsHTMLAtoms::q, - &nsHTMLAtoms::s, - &nsHTMLAtoms::samp, - &nsHTMLAtoms::select, - &nsHTMLAtoms::small, - &nsHTMLAtoms::span, - &nsHTMLAtoms::strike, - &nsHTMLAtoms::strong, - &nsHTMLAtoms::sub, - &nsHTMLAtoms::sup, - &nsHTMLAtoms::table, - &nsHTMLAtoms::tbody, - &nsHTMLAtoms::td, - &nsHTMLAtoms::textarea, - &nsHTMLAtoms::tfoot, - &nsHTMLAtoms::th, - &nsHTMLAtoms::thead, - &nsHTMLAtoms::tr, - &nsHTMLAtoms::tt, - &nsHTMLAtoms::u, - &nsHTMLAtoms::ul, - &nsHTMLAtoms::var + &nsGkAtoms::a, + &nsGkAtoms::abbr, + &nsGkAtoms::acronym, + &nsGkAtoms::address, + &nsGkAtoms::area, + &nsGkAtoms::b, + &nsGkAtoms::bdo, + &nsGkAtoms::big, + &nsGkAtoms::blockquote, + &nsGkAtoms::br, + &nsGkAtoms::button, + &nsGkAtoms::caption, + &nsGkAtoms::center, + &nsGkAtoms::cite, + &nsGkAtoms::code, + &nsGkAtoms::col, + &nsGkAtoms::colgroup, + &nsGkAtoms::dd, + &nsGkAtoms::del, + &nsGkAtoms::dfn, + &nsGkAtoms::dir, + &nsGkAtoms::div, + &nsGkAtoms::dl, + &nsGkAtoms::dt, + &nsGkAtoms::em, + &nsGkAtoms::fieldset, + &nsGkAtoms::font, + &nsGkAtoms::form, + &nsGkAtoms::h1, + &nsGkAtoms::h2, + &nsGkAtoms::h3, + &nsGkAtoms::h4, + &nsGkAtoms::h5, + &nsGkAtoms::h6, + &nsGkAtoms::hr, + &nsGkAtoms::i, + &nsGkAtoms::img, + &nsGkAtoms::input, + &nsGkAtoms::ins, + &nsGkAtoms::kbd, + &nsGkAtoms::label, + &nsGkAtoms::legend, + &nsGkAtoms::li, + &nsGkAtoms::listing, + &nsGkAtoms::map, + &nsGkAtoms::menu, + &nsGkAtoms::nobr, + &nsGkAtoms::ol, + &nsGkAtoms::optgroup, + &nsGkAtoms::option, + &nsGkAtoms::p, + &nsGkAtoms::pre, + &nsGkAtoms::q, + &nsGkAtoms::s, + &nsGkAtoms::samp, + &nsGkAtoms::select, + &nsGkAtoms::small, + &nsGkAtoms::span, + &nsGkAtoms::strike, + &nsGkAtoms::strong, + &nsGkAtoms::sub, + &nsGkAtoms::sup, + &nsGkAtoms::table, + &nsGkAtoms::tbody, + &nsGkAtoms::td, + &nsGkAtoms::textarea, + &nsGkAtoms::tfoot, + &nsGkAtoms::th, + &nsGkAtoms::thead, + &nsGkAtoms::tr, + &nsGkAtoms::tt, + &nsGkAtoms::u, + &nsGkAtoms::ul, + &nsGkAtoms::var }; static nsIAtom** const kDefaultAllowedAttributes [] = { - &nsHTMLAtoms::abbr, - &nsHTMLAtoms::accept, - &nsHTMLAtoms::acceptcharset, - &nsHTMLAtoms::accesskey, - &nsHTMLAtoms::action, - &nsHTMLAtoms::align, - &nsHTMLAtoms::alt, - &nsHTMLAtoms::autocomplete, - &nsHTMLAtoms::axis, - &nsHTMLAtoms::background, - &nsHTMLAtoms::bgcolor, - &nsHTMLAtoms::border, - &nsHTMLAtoms::cellpadding, - &nsHTMLAtoms::cellspacing, - &nsHTMLAtoms::_char, - &nsHTMLAtoms::charoff, - &nsHTMLAtoms::charset, - &nsHTMLAtoms::checked, - &nsHTMLAtoms::cite, - &nsHTMLAtoms::_class, - &nsHTMLAtoms::clear, - &nsHTMLAtoms::cols, - &nsHTMLAtoms::colspan, - &nsHTMLAtoms::color, - &nsHTMLAtoms::compact, - &nsHTMLAtoms::coords, - &nsHTMLAtoms::datetime, - &nsHTMLAtoms::dir, - &nsHTMLAtoms::disabled, - &nsHTMLAtoms::enctype, - &nsHTMLAtoms::_for, - &nsHTMLAtoms::frame, - &nsHTMLAtoms::headers, - &nsHTMLAtoms::height, - &nsHTMLAtoms::href, - &nsHTMLAtoms::hreflang, - &nsHTMLAtoms::hspace, - &nsHTMLAtoms::id, - &nsHTMLAtoms::ismap, - &nsHTMLAtoms::label, - &nsHTMLAtoms::lang, - &nsHTMLAtoms::longdesc, - &nsHTMLAtoms::maxlength, - &nsHTMLAtoms::media, - &nsHTMLAtoms::method, - &nsHTMLAtoms::multiple, - &nsHTMLAtoms::name, - &nsHTMLAtoms::nohref, - &nsHTMLAtoms::noshade, - &nsHTMLAtoms::nowrap, - &nsHTMLAtoms::pointSize, - &nsHTMLAtoms::prompt, - &nsHTMLAtoms::readonly, - &nsHTMLAtoms::rel, - &nsHTMLAtoms::rev, - &nsHTMLAtoms::role, - &nsHTMLAtoms::rows, - &nsHTMLAtoms::rowspan, - &nsHTMLAtoms::rules, - &nsHTMLAtoms::scope, - &nsHTMLAtoms::selected, - &nsHTMLAtoms::shape, - &nsHTMLAtoms::size, - &nsHTMLAtoms::span, - &nsHTMLAtoms::src, - &nsHTMLAtoms::start, - &nsHTMLAtoms::summary, - &nsHTMLAtoms::tabindex, - &nsHTMLAtoms::target, - &nsHTMLAtoms::title, - &nsHTMLAtoms::type, - &nsHTMLAtoms::usemap, - &nsHTMLAtoms::valign, - &nsHTMLAtoms::value, - &nsHTMLAtoms::vspace, - &nsHTMLAtoms::width + &nsGkAtoms::abbr, + &nsGkAtoms::accept, + &nsGkAtoms::acceptcharset, + &nsGkAtoms::accesskey, + &nsGkAtoms::action, + &nsGkAtoms::align, + &nsGkAtoms::alt, + &nsGkAtoms::autocomplete, + &nsGkAtoms::axis, + &nsGkAtoms::background, + &nsGkAtoms::bgcolor, + &nsGkAtoms::border, + &nsGkAtoms::cellpadding, + &nsGkAtoms::cellspacing, + &nsGkAtoms::_char, + &nsGkAtoms::charoff, + &nsGkAtoms::charset, + &nsGkAtoms::checked, + &nsGkAtoms::cite, + &nsGkAtoms::_class, + &nsGkAtoms::clear, + &nsGkAtoms::cols, + &nsGkAtoms::colspan, + &nsGkAtoms::color, + &nsGkAtoms::compact, + &nsGkAtoms::coords, + &nsGkAtoms::datetime, + &nsGkAtoms::dir, + &nsGkAtoms::disabled, + &nsGkAtoms::enctype, + &nsGkAtoms::_for, + &nsGkAtoms::frame, + &nsGkAtoms::headers, + &nsGkAtoms::height, + &nsGkAtoms::href, + &nsGkAtoms::hreflang, + &nsGkAtoms::hspace, + &nsGkAtoms::id, + &nsGkAtoms::ismap, + &nsGkAtoms::label, + &nsGkAtoms::lang, + &nsGkAtoms::longdesc, + &nsGkAtoms::maxlength, + &nsGkAtoms::media, + &nsGkAtoms::method, + &nsGkAtoms::multiple, + &nsGkAtoms::name, + &nsGkAtoms::nohref, + &nsGkAtoms::noshade, + &nsGkAtoms::nowrap, + &nsGkAtoms::pointSize, + &nsGkAtoms::prompt, + &nsGkAtoms::readonly, + &nsGkAtoms::rel, + &nsGkAtoms::rev, + &nsGkAtoms::role, + &nsGkAtoms::rows, + &nsGkAtoms::rowspan, + &nsGkAtoms::rules, + &nsGkAtoms::scope, + &nsGkAtoms::selected, + &nsGkAtoms::shape, + &nsGkAtoms::size, + &nsGkAtoms::span, + &nsGkAtoms::src, + &nsGkAtoms::start, + &nsGkAtoms::summary, + &nsGkAtoms::tabindex, + &nsGkAtoms::target, + &nsGkAtoms::title, + &nsGkAtoms::type, + &nsGkAtoms::usemap, + &nsGkAtoms::valign, + &nsGkAtoms::value, + &nsGkAtoms::vspace, + &nsGkAtoms::width }; // URIs action, href, src, longdesc, usemap, cite static PRBool IsAttrURI(nsIAtom *aName) { - return (aName == nsHTMLAtoms::action || - aName == nsHTMLAtoms::href || - aName == nsHTMLAtoms::src || - aName == nsHTMLAtoms::longdesc || - aName == nsHTMLAtoms::usemap || - aName == nsHTMLAtoms::cite || - aName == nsHTMLAtoms::background); + return (aName == nsGkAtoms::action || + aName == nsGkAtoms::href || + aName == nsGkAtoms::src || + aName == nsGkAtoms::longdesc || + aName == nsGkAtoms::usemap || + aName == nsGkAtoms::cite || + aName == nsGkAtoms::background); } #endif // _nsContentSink_h_ diff --git a/content/base/src/nsContentUtils.cpp b/content/base/src/nsContentUtils.cpp index e46a2e31f00b..fc9d2de9d99b 100644 --- a/content/base/src/nsContentUtils.cpp +++ b/content/base/src/nsContentUtils.cpp @@ -90,9 +90,8 @@ #include "nsIDOMHTMLFormElement.h" #include "nsIForm.h" #include "nsIFormControl.h" -#include "nsHTMLAtoms.h" -#include "nsISupportsPrimitives.h" #include "nsLayoutAtoms.h" +#include "nsISupportsPrimitives.h" #include "imgIDecoderObserver.h" #include "imgIRequest.h" #include "imgIContainer.h" @@ -132,7 +131,6 @@ static NS_DEFINE_CID(kXTFServiceCID, NS_XTFSERVICE_CID); #include "nsXBLPrototypeBinding.h" #include "nsEscape.h" #include "nsICharsetConverterManager.h" -#include "nsXULAtoms.h" #include "nsIEventListenerManager.h" #include "nsAttrName.h" #include "nsIDOMUserDataHandler.h" @@ -1655,7 +1653,7 @@ nsContentUtils::GenerateStateKey(nsIContent* aContent, // Append the control name nsAutoString name; - aContent->GetAttr(kNameSpaceID_None, nsHTMLAtoms::name, name); + aContent->GetAttr(kNameSpaceID_None, nsGkAtoms::name, name); KeyAppendString(name, aKey); } } @@ -1725,7 +1723,7 @@ nsContentUtils::BelongsInForm(nsIDOMHTMLFormElement *aForm, return PR_TRUE; } - if (content->Tag() == nsHTMLAtoms::form && + if (content->Tag() == nsGkAtoms::form && content->IsNodeOfType(nsINode::eHTML)) { // The child is contained within a form, but not the right form // so we ignore it. @@ -1830,7 +1828,7 @@ nsContentUtils::LookupNamespaceURI(nsIContent* aNamespaceResolver, NS_ENSURE_TRUE(name, NS_ERROR_OUT_OF_MEMORY); } else { - name = nsLayoutAtoms::xmlns; + name = nsGkAtoms::xmlns; } // Trace up the content parent chain looking for the namespace // declaration that declares aNamespacePrefix. @@ -2144,7 +2142,7 @@ nsContentUtils::GetXLinkURI(nsIContent* aContent) nsGkAtoms::simple, eCaseMatters)) { nsAutoString value; // Check that we have a URI - if (aContent->GetAttr(kNameSpaceID_XLink, nsHTMLAtoms::href, value)) { + if (aContent->GetAttr(kNameSpaceID_XLink, nsGkAtoms::href, value)) { // Resolve it relative to aContent's base URI. nsCOMPtr baseURI = aContent->GetBaseURI(); @@ -2278,7 +2276,7 @@ nsContentUtils::GetEventArgNames(PRInt32 aNameSpaceID, // nsJSEventListener is what does the arg magic for onerror, and it does // not seem to take the namespace into account. So we let onerror in all // namespaces get the 3 arg names. - if (aEventName == nsLayoutAtoms::onerror) { + if (aEventName == nsGkAtoms::onerror) { SET_EVENT_ARG_NAMES(gOnErrorNames); } else if (aNameSpaceID == kNameSpaceID_SVG) { SET_EVENT_ARG_NAMES(gSVGEventNames); @@ -2869,7 +2867,7 @@ PRBool nsContentUtils::HasNonEmptyAttr(nsIContent* aContent, PRInt32 aNameSpaceID, nsIAtom* aName) { - static nsIContent::AttrValuesArray strings[] = {&nsXULAtoms::_empty, nsnull}; + static nsIContent::AttrValuesArray strings[] = {&nsGkAtoms::_empty, nsnull}; return aContent->FindAttrValueIn(aNameSpaceID, aName, strings, eCaseMatters) == nsIContent::ATTR_VALUE_NO_MATCH; } diff --git a/content/base/src/nsCopySupport.cpp b/content/base/src/nsCopySupport.cpp index dd5165b9d2b2..a8ce56d5c0c9 100644 --- a/content/base/src/nsCopySupport.cpp +++ b/content/base/src/nsCopySupport.cpp @@ -60,7 +60,7 @@ #include "nsIDOMElement.h" #include "nsIDOMDocument.h" #include "nsIHTMLDocument.h" -#include "nsHTMLAtoms.h" +#include "nsGkAtoms.h" // image copy stuff #include "nsIImageLoadingContent.h" @@ -329,14 +329,14 @@ nsresult nsCopySupport::IsPlainTextContext(nsISelection *aSel, nsIDocument *aDoc nsIAtom *atom = selContent->Tag(); - if (atom == nsHTMLAtoms::input || - atom == nsHTMLAtoms::textarea) + if (atom == nsGkAtoms::input || + atom == nsGkAtoms::textarea) { *aIsPlainTextContext = PR_TRUE; break; } - if (atom == nsHTMLAtoms::body) + if (atom == nsGkAtoms::body) { // check for moz prewrap style on body. If it's there we are // in a plaintext editor. This is pretty cheezy but I haven't diff --git a/content/base/src/nsDOMDocumentType.cpp b/content/base/src/nsDOMDocumentType.cpp index 52fad89585ce..876ba1406eb5 100644 --- a/content/base/src/nsDOMDocumentType.cpp +++ b/content/base/src/nsDOMDocumentType.cpp @@ -48,7 +48,6 @@ #include "nsDOMString.h" #include "nsIDOM3Node.h" #include "nsNodeInfoManager.h" -#include "nsLayoutAtoms.h" #include "nsIDocument.h" #include "nsIXPConnect.h" #include "nsIDOMDocument.h" @@ -86,7 +85,7 @@ NS_NewDOMDocumentType(nsIDOMDocumentType** aDocType, } nsCOMPtr ni; - rv = nimgr->GetNodeInfo(nsLayoutAtoms::documentTypeNodeName, nsnull, + rv = nimgr->GetNodeInfo(nsGkAtoms::documentTypeNodeName, nsnull, kNameSpaceID_None, getter_AddRefs(ni)); NS_ENSURE_SUCCESS(rv, rv); diff --git a/content/base/src/nsDocument.cpp b/content/base/src/nsDocument.cpp index 572787e5ed5f..8baaa3703ecb 100644 --- a/content/base/src/nsDocument.cpp +++ b/content/base/src/nsDocument.cpp @@ -111,7 +111,7 @@ #include "nsPIDOMWindow.h" #include "nsIDOMElement.h" -#include "nsXULAtoms.h" +#include "nsGkAtoms.h" // for radio group stuff #include "nsIDOMHTMLInputElement.h" @@ -124,7 +124,6 @@ static NS_DEFINE_CID(kDOMEventGroupCID, NS_DOMEVENTGROUP_CID); -#include "nsHTMLAtoms.h" #include "nsIDOMUserDataHandler.h" #include "nsScriptEventManager.h" #include "nsIDOMXPathEvaluator.h" @@ -1498,12 +1497,12 @@ nsDocument::SetHeaderData(nsIAtom* aHeaderField, const nsAString& aData) } } - if (aHeaderField == nsHTMLAtoms::headerContentLanguage) { + if (aHeaderField == nsGkAtoms::headerContentLanguage) { CopyUTF16toUTF8(aData, mContentLanguage); } // Set the default script-type on the root element. - if (aHeaderField == nsHTMLAtoms::headerContentScriptType) { + if (aHeaderField == nsGkAtoms::headerContentScriptType) { nsIContent *root = GetRootContent(); if (root) { // Get the script-type ID for this value. @@ -1518,7 +1517,7 @@ nsDocument::SetHeaderData(nsIAtom* aHeaderField, const nsAString& aData) } } - if (aHeaderField == nsHTMLAtoms::headerDefaultStyle) { + if (aHeaderField == nsGkAtoms::headerDefaultStyle) { // switch alternate style sheets based on default // XXXldb What if we don't have all the sheets yet? Should this use // the DOM API for preferred stylesheet set that's "coming soon"? @@ -1545,7 +1544,7 @@ nsDocument::SetHeaderData(nsIAtom* aHeaderField, const nsAString& aData) } } - if (aHeaderField == nsHTMLAtoms::refresh) { + if (aHeaderField == nsGkAtoms::refresh) { // We get into this code before we have a script global yet, so get to // our container via mDocumentContainer. nsCOMPtr refresher = do_QueryReferent(mDocumentContainer); @@ -3239,21 +3238,21 @@ nsDocument::GetBoxObjectFor(nsIDOMElement* aElement, nsIBoxObject** aResult) nsCAutoString contractID("@mozilla.org/layout/xul-boxobject"); if (namespaceID == kNameSpaceID_XUL) { - if (tag == nsXULAtoms::browser || - tag == nsXULAtoms::editor || - tag == nsXULAtoms::iframe) + if (tag == nsGkAtoms::browser || + tag == nsGkAtoms::editor || + tag == nsGkAtoms::iframe) contractID += "-container"; - else if (tag == nsXULAtoms::menu) + else if (tag == nsGkAtoms::menu) contractID += "-menu"; - else if (tag == nsXULAtoms::popup || - tag == nsXULAtoms::menupopup || - tag == nsXULAtoms::tooltip) + else if (tag == nsGkAtoms::popup || + tag == nsGkAtoms::menupopup || + tag == nsGkAtoms::tooltip) contractID += "-popup"; - else if (tag == nsXULAtoms::tree) + else if (tag == nsGkAtoms::tree) contractID += "-tree"; - else if (tag == nsXULAtoms::listbox) + else if (tag == nsGkAtoms::listbox) contractID += "-listbox"; - else if (tag == nsXULAtoms::scrollbox) + else if (tag == nsGkAtoms::scrollbox) contractID += "-scrollbox"; } contractID += ";1"; @@ -4719,7 +4718,7 @@ nsDocument::RetrieveRelevantHeaders(nsIChannel *aChannel) nsCAutoString contentDisp; rv = partChannel->GetContentDisposition(contentDisp); if (NS_SUCCEEDED(rv) && !contentDisp.IsEmpty()) { - SetHeaderData(nsHTMLAtoms::headerContentDisposition, + SetHeaderData(nsGkAtoms::headerContentDisposition, NS_ConvertASCIItoUTF16(contentDisp)); } } @@ -5170,7 +5169,7 @@ nsDocument::OnPageShow(PRBool aPersisted) if (aPersisted && mRootContent) { // Send out notifications that our elements are attached. nsRefPtr links = NS_GetContentList(mRootContent, - nsHTMLAtoms::link, + nsGkAtoms::link, kNameSpaceID_Unknown); if (links) { @@ -5195,7 +5194,7 @@ nsDocument::OnPageHide(PRBool aPersisted) // but only if this is not a full unload. if (aPersisted && mRootContent) { nsRefPtr links = NS_GetContentList(mRootContent, - nsHTMLAtoms::link, + nsGkAtoms::link, kNameSpaceID_Unknown); if (links) { diff --git a/content/base/src/nsDocumentEncoder.cpp b/content/base/src/nsDocumentEncoder.cpp index 0d39fa525a42..69fa703d80c9 100644 --- a/content/base/src/nsDocumentEncoder.cpp +++ b/content/base/src/nsDocumentEncoder.cpp @@ -65,7 +65,7 @@ #include "nsIDOMRange.h" #include "nsIDOMDocument.h" #include "nsICharsetConverterManager.h" -#include "nsHTMLAtoms.h" +#include "nsGkAtoms.h" #include "nsIContent.h" #include "nsIEnumerator.h" #include "nsISelectionPrivate.h" @@ -1112,13 +1112,13 @@ nsHTMLCopyEncoder::SetSelection(nsISelection* aSelection) { // checking for selection inside a plaintext form widget nsIAtom *atom = selContent->Tag(); - if (atom == nsHTMLAtoms::input || - atom == nsHTMLAtoms::textarea) + if (atom == nsGkAtoms::input || + atom == nsGkAtoms::textarea) { mIsTextWidget = PR_TRUE; break; } - else if (atom == nsHTMLAtoms::body) + else if (atom == nsGkAtoms::body) { // check for moz prewrap style on body. If it's there we are // in a plaintext editor. This is pretty cheezy but I haven't @@ -1260,32 +1260,32 @@ nsHTMLCopyEncoder::IncludeInContext(nsIDOMNode *aNode) nsIAtom *tag = content->Tag(); - return (tag == nsHTMLAtoms::b || - tag == nsHTMLAtoms::i || - tag == nsHTMLAtoms::u || - tag == nsHTMLAtoms::a || - tag == nsHTMLAtoms::tt || - tag == nsHTMLAtoms::s || - tag == nsHTMLAtoms::big || - tag == nsHTMLAtoms::small || - tag == nsHTMLAtoms::strike || - tag == nsHTMLAtoms::em || - tag == nsHTMLAtoms::strong || - tag == nsHTMLAtoms::dfn || - tag == nsHTMLAtoms::code || - tag == nsHTMLAtoms::cite || - tag == nsHTMLAtoms::variable || - tag == nsHTMLAtoms::abbr || - tag == nsHTMLAtoms::font || - tag == nsHTMLAtoms::script || - tag == nsHTMLAtoms::span || - tag == nsHTMLAtoms::pre || - tag == nsHTMLAtoms::h1 || - tag == nsHTMLAtoms::h2 || - tag == nsHTMLAtoms::h3 || - tag == nsHTMLAtoms::h4 || - tag == nsHTMLAtoms::h5 || - tag == nsHTMLAtoms::h6); + return (tag == nsGkAtoms::b || + tag == nsGkAtoms::i || + tag == nsGkAtoms::u || + tag == nsGkAtoms::a || + tag == nsGkAtoms::tt || + tag == nsGkAtoms::s || + tag == nsGkAtoms::big || + tag == nsGkAtoms::small || + tag == nsGkAtoms::strike || + tag == nsGkAtoms::em || + tag == nsGkAtoms::strong || + tag == nsGkAtoms::dfn || + tag == nsGkAtoms::code || + tag == nsGkAtoms::cite || + tag == nsGkAtoms::variable || + tag == nsGkAtoms::abbr || + tag == nsGkAtoms::font || + tag == nsGkAtoms::script || + tag == nsGkAtoms::span || + tag == nsGkAtoms::pre || + tag == nsGkAtoms::h1 || + tag == nsGkAtoms::h2 || + tag == nsGkAtoms::h3 || + tag == nsGkAtoms::h4 || + tag == nsGkAtoms::h5 || + tag == nsGkAtoms::h6); } @@ -1582,7 +1582,7 @@ nsHTMLCopyEncoder::GetChildAt(nsIDOMNode *aParent, PRInt32 aOffset) PRBool nsHTMLCopyEncoder::IsMozBR(nsIDOMNode* aNode) { - if (IsTag(aNode, nsHTMLAtoms::br)) + if (IsTag(aNode, nsGkAtoms::br)) { nsCOMPtr elem = do_QueryInterface(aNode); if (elem) @@ -1628,11 +1628,11 @@ nsHTMLCopyEncoder::IsRoot(nsIDOMNode* aNode) if (aNode) { if (mIsTextWidget) - return (IsTag(aNode, nsHTMLAtoms::div)); + return (IsTag(aNode, nsGkAtoms::div)); else - return (IsTag(aNode, nsHTMLAtoms::body) || - IsTag(aNode, nsHTMLAtoms::td) || - IsTag(aNode, nsHTMLAtoms::th)); + return (IsTag(aNode, nsGkAtoms::body) || + IsTag(aNode, nsGkAtoms::td) || + IsTag(aNode, nsGkAtoms::th)); } return PR_FALSE; } diff --git a/content/base/src/nsDocumentFragment.cpp b/content/base/src/nsDocumentFragment.cpp index fda9d63fe53f..7293ad2477d1 100644 --- a/content/base/src/nsDocumentFragment.cpp +++ b/content/base/src/nsDocumentFragment.cpp @@ -166,7 +166,7 @@ NS_NewDocumentFragment(nsIDOMDocumentFragment** aInstancePtrResult, nsCOMPtr nodeInfo; nsresult rv = - aNodeInfoManager->GetNodeInfo(nsLayoutAtoms::documentFragmentNodeName, + aNodeInfoManager->GetNodeInfo(nsGkAtoms::documentFragmentNodeName, nsnull, kNameSpaceID_None, getter_AddRefs(nodeInfo)); NS_ENSURE_SUCCESS(rv, rv); diff --git a/content/base/src/nsFrameLoader.cpp b/content/base/src/nsFrameLoader.cpp index 270905ec0e28..f58a622fd987 100644 --- a/content/base/src/nsFrameLoader.cpp +++ b/content/base/src/nsFrameLoader.cpp @@ -70,7 +70,7 @@ #include "nsIURL.h" #include "nsNetUtil.h" -#include "nsHTMLAtoms.h" +#include "nsGkAtoms.h" #include "nsINameSpaceManager.h" // Bug 136580: Limit to the number of nested content frames that can have the @@ -314,13 +314,13 @@ nsFrameLoader::EnsureDocShell() PRInt32 namespaceID = mOwnerContent->GetNameSpaceID(); if (namespaceID == kNameSpaceID_XHTML) { - mOwnerContent->GetAttr(kNameSpaceID_None, nsHTMLAtoms::id, frameName); + mOwnerContent->GetAttr(kNameSpaceID_None, nsGkAtoms::id, frameName); } else { - mOwnerContent->GetAttr(kNameSpaceID_None, nsHTMLAtoms::name, frameName); + mOwnerContent->GetAttr(kNameSpaceID_None, nsGkAtoms::name, frameName); // XXX if no NAME then use ID, after a transition period this will be // changed so that XUL only uses ID too (bug 254284). if (frameName.IsEmpty() && namespaceID == kNameSpaceID_XUL) { - mOwnerContent->GetAttr(kNameSpaceID_None, nsHTMLAtoms::id, frameName); + mOwnerContent->GetAttr(kNameSpaceID_None, nsGkAtoms::id, frameName); } } @@ -347,7 +347,7 @@ nsFrameLoader::EnsureDocShell() PRBool isContent = PR_FALSE; if (mOwnerContent->IsNodeOfType(nsINode::eXUL)) { - mOwnerContent->GetAttr(kNameSpaceID_None, nsHTMLAtoms::type, value); + mOwnerContent->GetAttr(kNameSpaceID_None, nsGkAtoms::type, value); } // we accept "content" and "content-xxx" values. @@ -449,10 +449,10 @@ nsFrameLoader::GetURL(nsString& aURI) { aURI.Truncate(); - if (mOwnerContent->Tag() == nsHTMLAtoms::object) { - mOwnerContent->GetAttr(kNameSpaceID_None, nsHTMLAtoms::data, aURI); + if (mOwnerContent->Tag() == nsGkAtoms::object) { + mOwnerContent->GetAttr(kNameSpaceID_None, nsGkAtoms::data, aURI); } else { - mOwnerContent->GetAttr(kNameSpaceID_None, nsHTMLAtoms::src, aURI); + mOwnerContent->GetAttr(kNameSpaceID_None, nsGkAtoms::src, aURI); } } diff --git a/content/base/src/nsGenericElement.cpp b/content/base/src/nsGenericElement.cpp index b3ebdc788437..e1cc2f3c9787 100644 --- a/content/base/src/nsGenericElement.cpp +++ b/content/base/src/nsGenericElement.cpp @@ -95,7 +95,6 @@ #include "nsIDOMNSDocument.h" #include "nsLayoutAtoms.h" -#include "nsHTMLAtoms.h" #include "nsContentUtils.h" #include "nsIJSContextStack.h" @@ -412,7 +411,7 @@ nsNode3Tearoff::AreNodesEqual(nsIContent* aContent1, return PR_FALSE; } - if (aContent1->Tag() == nsLayoutAtoms::documentTypeNodeName) { + if (aContent1->Tag() == nsGkAtoms::documentTypeNodeName) { nsCOMPtr docType1 = do_QueryInterface(aContent1); nsCOMPtr docType2 = do_QueryInterface(aContent2); @@ -580,7 +579,7 @@ nsNode3Tearoff::LookupPrefix(const nsAString& aNamespaceURI, aNamespaceURI, eCaseMatters)) { // If the localName is "xmlns", the prefix we output should be // null. - if (name->LocalName() != nsLayoutAtoms::xmlns) { + if (name->LocalName() != nsGkAtoms::xmlns) { name->LocalName()->ToString(aPrefix); } @@ -1860,7 +1859,7 @@ nsGenericElement::UnbindFromTree(PRBool aDeep, PRBool aNullParent) // anonymous content that the document is changing. document->BindingManager()->ChangeDocumentFor(this, document, nsnull); - if (HasAttr(kNameSpaceID_XLink, nsHTMLAtoms::href)) { + if (HasAttr(kNameSpaceID_XLink, nsGkAtoms::href)) { document->ForgetLink(this); } @@ -2105,7 +2104,7 @@ nsGenericElement::GetBaseURI() const // Now check for an xml:base attr nsAutoString value; - GetAttr(kNameSpaceID_XML, nsHTMLAtoms::base, value); + GetAttr(kNameSpaceID_XML, nsGkAtoms::base, value); if (value.IsEmpty()) { // No xml:base, so we just use the parent's base URL nsIURI *base = nsnull; @@ -3153,7 +3152,7 @@ nsGenericElement::SetAttr(PRInt32 aNamespaceID, nsIAtom* aName, "Don't call SetAttr with unknown namespace"); nsIDocument* doc = GetCurrentDoc(); - if (kNameSpaceID_XLink == aNamespaceID && nsHTMLAtoms::href == aName) { + if (kNameSpaceID_XLink == aNamespaceID && nsGkAtoms::href == aName) { // XLink URI(s) might be changing. Drop the link from the map. If it // is still style relevant it will be re-added by // nsStyleUtil::IsSimpleXlink. Make sure to keep the style system @@ -3288,7 +3287,7 @@ nsGenericElement::SetAttrAndNotify(PRInt32 aNamespaceID, } if (aNamespaceID == kNameSpaceID_XMLEvents && - aName == nsHTMLAtoms::event && mNodeInfo->GetDocument()) { + aName == nsGkAtoms::event && mNodeInfo->GetDocument()) { mNodeInfo->GetDocument()->AddXMLEventsContent(this); } @@ -3448,7 +3447,7 @@ nsGenericElement::UnsetAttr(PRInt32 aNameSpaceID, nsIAtom* aName, nsIDocument *document = GetCurrentDoc(); mozAutoDocUpdate updateBatch(document, UPDATE_CONTENT_MODEL, aNotify); if (document) { - if (kNameSpaceID_XLink == aNameSpaceID && nsHTMLAtoms::href == aName) { + if (kNameSpaceID_XLink == aNameSpaceID && nsGkAtoms::href == aName) { // XLink URI might be changing. document->ForgetLink(this); } diff --git a/content/base/src/nsHTMLContentSerializer.cpp b/content/base/src/nsHTMLContentSerializer.cpp index 12e2715cb27e..8cbc5a697eee 100644 --- a/content/base/src/nsHTMLContentSerializer.cpp +++ b/content/base/src/nsHTMLContentSerializer.cpp @@ -56,7 +56,6 @@ #include "nsIServiceManager.h" #include "nsIDocumentEncoder.h" #include "nsLayoutAtoms.h" -#include "nsHTMLAtoms.h" #include "nsIURI.h" #include "nsNetUtil.h" #include "nsEscape.h" @@ -440,8 +439,8 @@ nsHTMLContentSerializer::AppendDocumentStart(nsIDOMDocument *aDocument, PRBool nsHTMLContentSerializer::IsJavaScript(nsIAtom* aAttrNameAtom, const nsAString& aValueString) { - if (aAttrNameAtom == nsHTMLAtoms::href || - aAttrNameAtom == nsHTMLAtoms::src) { + if (aAttrNameAtom == nsGkAtoms::href || + aAttrNameAtom == nsGkAtoms::src) { static const char kJavaScript[] = "javascript"; PRInt32 pos = aValueString.FindChar(':'); if (pos < (PRInt32)(sizeof kJavaScript - 1)) @@ -456,24 +455,24 @@ nsHTMLContentSerializer::IsJavaScript(nsIAtom* aAttrNameAtom, const nsAString& a } PRBool result = - (aAttrNameAtom == nsLayoutAtoms::onblur) || (aAttrNameAtom == nsLayoutAtoms::onchange) - || (aAttrNameAtom == nsLayoutAtoms::onclick) || (aAttrNameAtom == nsLayoutAtoms::ondblclick) - || (aAttrNameAtom == nsLayoutAtoms::onfocus) || (aAttrNameAtom == nsLayoutAtoms::onkeydown) - || (aAttrNameAtom == nsLayoutAtoms::onkeypress) || (aAttrNameAtom == nsLayoutAtoms::onkeyup) - || (aAttrNameAtom == nsLayoutAtoms::onload) || (aAttrNameAtom == nsLayoutAtoms::onmousedown) - || (aAttrNameAtom == nsLayoutAtoms::onpageshow) || (aAttrNameAtom == nsLayoutAtoms::onpagehide) - || (aAttrNameAtom == nsLayoutAtoms::onmousemove) || (aAttrNameAtom == nsLayoutAtoms::onmouseout) - || (aAttrNameAtom == nsLayoutAtoms::onmouseover) || (aAttrNameAtom == nsLayoutAtoms::onmouseup) - || (aAttrNameAtom == nsLayoutAtoms::onreset) || (aAttrNameAtom == nsLayoutAtoms::onselect) - || (aAttrNameAtom == nsLayoutAtoms::onsubmit) || (aAttrNameAtom == nsLayoutAtoms::onunload) - || (aAttrNameAtom == nsLayoutAtoms::onabort) || (aAttrNameAtom == nsLayoutAtoms::onerror) - || (aAttrNameAtom == nsLayoutAtoms::onpaint) || (aAttrNameAtom == nsLayoutAtoms::onresize) - || (aAttrNameAtom == nsLayoutAtoms::onscroll) || (aAttrNameAtom == nsLayoutAtoms::onbroadcast) - || (aAttrNameAtom == nsLayoutAtoms::onclose) || (aAttrNameAtom == nsLayoutAtoms::oncontextmenu) - || (aAttrNameAtom == nsLayoutAtoms::oncommand) || (aAttrNameAtom == nsLayoutAtoms::oncommandupdate) - || (aAttrNameAtom == nsLayoutAtoms::ondragdrop) || (aAttrNameAtom == nsLayoutAtoms::ondragenter) - || (aAttrNameAtom == nsLayoutAtoms::ondragexit) || (aAttrNameAtom == nsLayoutAtoms::ondraggesture) - || (aAttrNameAtom == nsLayoutAtoms::ondragover) || (aAttrNameAtom == nsLayoutAtoms::oninput); + (aAttrNameAtom == nsGkAtoms::onblur) || (aAttrNameAtom == nsGkAtoms::onchange) + || (aAttrNameAtom == nsGkAtoms::onclick) || (aAttrNameAtom == nsGkAtoms::ondblclick) + || (aAttrNameAtom == nsGkAtoms::onfocus) || (aAttrNameAtom == nsGkAtoms::onkeydown) + || (aAttrNameAtom == nsGkAtoms::onkeypress) || (aAttrNameAtom == nsGkAtoms::onkeyup) + || (aAttrNameAtom == nsGkAtoms::onload) || (aAttrNameAtom == nsGkAtoms::onmousedown) + || (aAttrNameAtom == nsGkAtoms::onpageshow) || (aAttrNameAtom == nsGkAtoms::onpagehide) + || (aAttrNameAtom == nsGkAtoms::onmousemove) || (aAttrNameAtom == nsGkAtoms::onmouseout) + || (aAttrNameAtom == nsGkAtoms::onmouseover) || (aAttrNameAtom == nsGkAtoms::onmouseup) + || (aAttrNameAtom == nsGkAtoms::onreset) || (aAttrNameAtom == nsGkAtoms::onselect) + || (aAttrNameAtom == nsGkAtoms::onsubmit) || (aAttrNameAtom == nsGkAtoms::onunload) + || (aAttrNameAtom == nsGkAtoms::onabort) || (aAttrNameAtom == nsGkAtoms::onerror) + || (aAttrNameAtom == nsGkAtoms::onpaint) || (aAttrNameAtom == nsGkAtoms::onresize) + || (aAttrNameAtom == nsGkAtoms::onscroll) || (aAttrNameAtom == nsGkAtoms::onbroadcast) + || (aAttrNameAtom == nsGkAtoms::onclose) || (aAttrNameAtom == nsGkAtoms::oncontextmenu) + || (aAttrNameAtom == nsGkAtoms::oncommand) || (aAttrNameAtom == nsGkAtoms::oncommandupdate) + || (aAttrNameAtom == nsGkAtoms::ondragdrop) || (aAttrNameAtom == nsGkAtoms::ondragenter) + || (aAttrNameAtom == nsGkAtoms::ondragexit) || (aAttrNameAtom == nsGkAtoms::ondraggesture) + || (aAttrNameAtom == nsGkAtoms::ondragover) || (aAttrNameAtom == nsGkAtoms::oninput); return result; } @@ -482,7 +481,7 @@ nsHTMLContentSerializer::EscapeURI(const nsAString& aURI, nsAString& aEscapedURI { // URL escape %xx cannot be used in JS. // No escaping if the scheme is 'javascript'. - if (IsJavaScript(nsHTMLAtoms::href, aURI)) { + if (IsJavaScript(nsGkAtoms::href, aURI)) { aEscapedURI = aURI; return NS_OK; } @@ -576,20 +575,20 @@ nsHTMLContentSerializer::SerializeAttributes(nsIContent* aContent, // Filter out special case of
or
, // used by the editor. Bug 16988. Yuck. // - if (aTagName == nsHTMLAtoms::br && attrName == nsHTMLAtoms::type && + if (aTagName == nsGkAtoms::br && attrName == nsGkAtoms::type && StringBeginsWith(valueStr, _mozStr)) { continue; } - if (mIsCopying && mIsFirstChildOfOL && (aTagName == nsHTMLAtoms::li) && - (attrName == nsHTMLAtoms::value)){ + if (mIsCopying && mIsFirstChildOfOL && (aTagName == nsGkAtoms::li) && + (attrName == nsGkAtoms::value)){ // This is handled separately in SerializeLIValueAttribute() continue; } PRBool isJS = IsJavaScript(attrName, valueStr); - if (((attrName == nsHTMLAtoms::href) || - (attrName == nsHTMLAtoms::src))) { + if (((attrName == nsGkAtoms::href) || + (attrName == nsGkAtoms::src))) { // Make all links absolute when converting only the selection: if (mFlags & nsIDocumentEncoder::OutputAbsoluteLinks) { // Would be nice to handle OBJECT and APPLET tags, @@ -648,11 +647,11 @@ nsHTMLContentSerializer::AppendElementStart(nsIDOMElement *aElement, // indicate that this element should be pretty printed // even if we're not in pretty printing mode PRBool hasDirtyAttr = content->HasAttr(kNameSpaceID_None, - nsLayoutAtoms::mozdirty); + nsGkAtoms::mozdirty); nsIAtom *name = content->Tag(); - if (name == nsHTMLAtoms::br && mPreLevel > 0 + if (name == nsGkAtoms::br && mPreLevel > 0 && (mFlags & nsIDocumentEncoder::OutputNoFormattingInPre)) { AppendToString(mLineBreak, aStr); mMayIgnoreLineBreakSequence = PR_TRUE; @@ -660,7 +659,7 @@ nsHTMLContentSerializer::AppendElementStart(nsIDOMElement *aElement, return NS_OK; } - if (name == nsHTMLAtoms::body) { + if (name == nsGkAtoms::body) { mInBody = PR_TRUE; } @@ -683,9 +682,9 @@ nsHTMLContentSerializer::AppendElementStart(nsIDOMElement *aElement, StartIndentation(name, hasDirtyAttr, aStr); - if (name == nsHTMLAtoms::pre || - name == nsHTMLAtoms::script || - name == nsHTMLAtoms::style) { + if (name == nsGkAtoms::pre || + name == nsGkAtoms::script || + name == nsGkAtoms::style) { mPreLevel++; } @@ -697,7 +696,7 @@ nsHTMLContentSerializer::AppendElementStart(nsIDOMElement *aElement, // Need to keep track of OL and LI elements in order to get ordinal number // for the LI. - if (mIsCopying && name == nsHTMLAtoms::ol){ + if (mIsCopying && name == nsGkAtoms::ol){ // We are copying and current node is an OL; // Store it's start attribute value in olState->startVal. nsAutoString start; @@ -719,7 +718,7 @@ nsHTMLContentSerializer::AppendElementStart(nsIDOMElement *aElement, mOLStateStack.AppendElement(state); } - if (mIsCopying && name == nsHTMLAtoms::li) { + if (mIsCopying && name == nsGkAtoms::li) { mIsFirstChildOfOL = IsFirstChildOfOL(aOriginalElement); if (mIsFirstChildOfOL){ // If OL is parent of this LI, serialize attributes in different manner. @@ -739,10 +738,10 @@ nsHTMLContentSerializer::AppendElementStart(nsIDOMElement *aElement, mColPos = 0; } - if (name == nsHTMLAtoms::script || - name == nsHTMLAtoms::style || - name == nsHTMLAtoms::noscript || - name == nsHTMLAtoms::noframes) { + if (name == nsGkAtoms::script || + name == nsGkAtoms::style || + name == nsGkAtoms::noscript || + name == nsGkAtoms::noframes) { mInCDATA = PR_TRUE; } @@ -759,11 +758,11 @@ nsHTMLContentSerializer::AppendElementEnd(nsIDOMElement *aElement, if (!content) return NS_ERROR_FAILURE; PRBool hasDirtyAttr = content->HasAttr(kNameSpaceID_None, - nsLayoutAtoms::mozdirty); + nsGkAtoms::mozdirty); nsIAtom *name = content->Tag(); - if (name == nsHTMLAtoms::script) { + if (name == nsGkAtoms::script) { nsCOMPtr script = do_QueryInterface(aElement); NS_ASSERTION(script, "What kind of weird script element is this?"); @@ -775,13 +774,13 @@ nsHTMLContentSerializer::AppendElementEnd(nsIDOMElement *aElement, } } - if (name == nsHTMLAtoms::pre || - name == nsHTMLAtoms::script || - name == nsHTMLAtoms::style) { + if (name == nsGkAtoms::pre || + name == nsGkAtoms::script || + name == nsGkAtoms::style) { mPreLevel--; } - if (mIsCopying && (name == nsHTMLAtoms::ol)){ + if (mIsCopying && (name == nsGkAtoms::ol)){ NS_ASSERTION((mOLStateStack.Count() > 0), "Cannot have an empty OL Stack"); /* Though at this point we must always have an state to be deleted as all the OL opening tags are supposed to push an olState object to the stack*/ @@ -794,7 +793,7 @@ nsHTMLContentSerializer::AppendElementEnd(nsIDOMElement *aElement, nsIParserService* parserService = nsContentUtils::GetParserService(); - if (parserService && (name != nsHTMLAtoms::style)) { + if (parserService && (name != nsGkAtoms::style)) { PRBool isContainer; parserService->IsContainer(parserService->HTMLAtomTagToId(name), @@ -1043,14 +1042,14 @@ nsHTMLContentSerializer::LineBreakBeforeOpen(nsIAtom* aName, return PR_FALSE; } - if (aName == nsHTMLAtoms::title || - aName == nsHTMLAtoms::meta || - aName == nsHTMLAtoms::link || - aName == nsHTMLAtoms::style || - aName == nsHTMLAtoms::select || - aName == nsHTMLAtoms::option || - aName == nsHTMLAtoms::script || - aName == nsHTMLAtoms::html) { + if (aName == nsGkAtoms::title || + aName == nsGkAtoms::meta || + aName == nsGkAtoms::link || + aName == nsGkAtoms::style || + aName == nsGkAtoms::select || + aName == nsGkAtoms::option || + aName == nsGkAtoms::script || + aName == nsGkAtoms::html) { return PR_TRUE; } else { @@ -1075,23 +1074,23 @@ nsHTMLContentSerializer::LineBreakAfterOpen(nsIAtom* aName, return PR_FALSE; } - if ((aName == nsHTMLAtoms::html) || - (aName == nsHTMLAtoms::head) || - (aName == nsHTMLAtoms::body) || - (aName == nsHTMLAtoms::ul) || - (aName == nsHTMLAtoms::ol) || - (aName == nsHTMLAtoms::dl) || - (aName == nsHTMLAtoms::table) || - (aName == nsHTMLAtoms::tbody) || - (aName == nsHTMLAtoms::tr) || - (aName == nsHTMLAtoms::br) || - (aName == nsHTMLAtoms::meta) || - (aName == nsHTMLAtoms::link) || - (aName == nsHTMLAtoms::script) || - (aName == nsHTMLAtoms::select) || - (aName == nsHTMLAtoms::map) || - (aName == nsHTMLAtoms::area) || - (aName == nsHTMLAtoms::style)) { + if ((aName == nsGkAtoms::html) || + (aName == nsGkAtoms::head) || + (aName == nsGkAtoms::body) || + (aName == nsGkAtoms::ul) || + (aName == nsGkAtoms::ol) || + (aName == nsGkAtoms::dl) || + (aName == nsGkAtoms::table) || + (aName == nsGkAtoms::tbody) || + (aName == nsGkAtoms::tr) || + (aName == nsGkAtoms::br) || + (aName == nsGkAtoms::meta) || + (aName == nsGkAtoms::link) || + (aName == nsGkAtoms::script) || + (aName == nsGkAtoms::select) || + (aName == nsGkAtoms::map) || + (aName == nsGkAtoms::area) || + (aName == nsGkAtoms::style)) { return PR_TRUE; } @@ -1107,15 +1106,15 @@ nsHTMLContentSerializer::LineBreakBeforeClose(nsIAtom* aName, return PR_FALSE; } - if ((aName == nsHTMLAtoms::html) || - (aName == nsHTMLAtoms::head) || - (aName == nsHTMLAtoms::body) || - (aName == nsHTMLAtoms::ul) || - (aName == nsHTMLAtoms::ol) || - (aName == nsHTMLAtoms::dl) || - (aName == nsHTMLAtoms::select) || - (aName == nsHTMLAtoms::table) || - (aName == nsHTMLAtoms::tbody)) { + if ((aName == nsGkAtoms::html) || + (aName == nsGkAtoms::head) || + (aName == nsGkAtoms::body) || + (aName == nsGkAtoms::ul) || + (aName == nsGkAtoms::ol) || + (aName == nsGkAtoms::dl) || + (aName == nsGkAtoms::select) || + (aName == nsGkAtoms::table) || + (aName == nsGkAtoms::tbody)) { return PR_TRUE; } @@ -1131,23 +1130,23 @@ nsHTMLContentSerializer::LineBreakAfterClose(nsIAtom* aName, return PR_FALSE; } - if ((aName == nsHTMLAtoms::html) || - (aName == nsHTMLAtoms::head) || - (aName == nsHTMLAtoms::body) || - (aName == nsHTMLAtoms::tr) || - (aName == nsHTMLAtoms::th) || - (aName == nsHTMLAtoms::td) || - (aName == nsHTMLAtoms::pre) || - (aName == nsHTMLAtoms::title) || - (aName == nsHTMLAtoms::li) || - (aName == nsHTMLAtoms::dt) || - (aName == nsHTMLAtoms::dd) || - (aName == nsHTMLAtoms::blockquote) || - (aName == nsHTMLAtoms::select) || - (aName == nsHTMLAtoms::option) || - (aName == nsHTMLAtoms::p) || - (aName == nsHTMLAtoms::map) || - (aName == nsHTMLAtoms::div)) { + if ((aName == nsGkAtoms::html) || + (aName == nsGkAtoms::head) || + (aName == nsGkAtoms::body) || + (aName == nsGkAtoms::tr) || + (aName == nsGkAtoms::th) || + (aName == nsGkAtoms::td) || + (aName == nsGkAtoms::pre) || + (aName == nsGkAtoms::title) || + (aName == nsGkAtoms::li) || + (aName == nsGkAtoms::dt) || + (aName == nsGkAtoms::dd) || + (aName == nsGkAtoms::blockquote) || + (aName == nsGkAtoms::select) || + (aName == nsGkAtoms::option) || + (aName == nsGkAtoms::p) || + (aName == nsGkAtoms::map) || + (aName == nsGkAtoms::div)) { return PR_TRUE; } else { @@ -1174,19 +1173,19 @@ nsHTMLContentSerializer::StartIndentation(nsIAtom* aName, } } - if ((aName == nsHTMLAtoms::head) || - (aName == nsHTMLAtoms::table) || - (aName == nsHTMLAtoms::tr) || - (aName == nsHTMLAtoms::ul) || - (aName == nsHTMLAtoms::ol) || - (aName == nsHTMLAtoms::dl) || - (aName == nsHTMLAtoms::tbody) || - (aName == nsHTMLAtoms::form) || - (aName == nsHTMLAtoms::frameset) || - (aName == nsHTMLAtoms::blockquote) || - (aName == nsHTMLAtoms::li) || - (aName == nsHTMLAtoms::dt) || - (aName == nsHTMLAtoms::dd)) { + if ((aName == nsGkAtoms::head) || + (aName == nsGkAtoms::table) || + (aName == nsGkAtoms::tr) || + (aName == nsGkAtoms::ul) || + (aName == nsGkAtoms::ol) || + (aName == nsGkAtoms::dl) || + (aName == nsGkAtoms::tbody) || + (aName == nsGkAtoms::form) || + (aName == nsGkAtoms::frameset) || + (aName == nsGkAtoms::blockquote) || + (aName == nsGkAtoms::li) || + (aName == nsGkAtoms::dt) || + (aName == nsGkAtoms::dd)) { mIndent++; } } @@ -1196,19 +1195,19 @@ nsHTMLContentSerializer::EndIndentation(nsIAtom* aName, PRBool aHasDirtyAttr, nsAString& aStr) { - if ((aName == nsHTMLAtoms::head) || - (aName == nsHTMLAtoms::table) || - (aName == nsHTMLAtoms::tr) || - (aName == nsHTMLAtoms::ul) || - (aName == nsHTMLAtoms::ol) || - (aName == nsHTMLAtoms::dl) || - (aName == nsHTMLAtoms::li) || - (aName == nsHTMLAtoms::tbody) || - (aName == nsHTMLAtoms::form) || - (aName == nsHTMLAtoms::blockquote) || - (aName == nsHTMLAtoms::dt) || - (aName == nsHTMLAtoms::dd) || - (aName == nsHTMLAtoms::frameset)) { + if ((aName == nsGkAtoms::head) || + (aName == nsGkAtoms::table) || + (aName == nsGkAtoms::tr) || + (aName == nsGkAtoms::ul) || + (aName == nsGkAtoms::ol) || + (aName == nsGkAtoms::dl) || + (aName == nsGkAtoms::li) || + (aName == nsGkAtoms::tbody) || + (aName == nsGkAtoms::form) || + (aName == nsGkAtoms::blockquote) || + (aName == nsGkAtoms::dt) || + (aName == nsGkAtoms::dd) || + (aName == nsGkAtoms::frameset)) { mIndent--; } diff --git a/content/base/src/nsNodeInfoManager.cpp b/content/base/src/nsNodeInfoManager.cpp index 987601e00a50..95da860fa296 100644 --- a/content/base/src/nsNodeInfoManager.cpp +++ b/content/base/src/nsNodeInfoManager.cpp @@ -268,7 +268,7 @@ already_AddRefed nsNodeInfoManager::GetTextNodeInfo() { if (!mTextNodeInfo) { - GetNodeInfo(nsLayoutAtoms::textTagName, nsnull, kNameSpaceID_None, + GetNodeInfo(nsGkAtoms::textTagName, nsnull, kNameSpaceID_None, &mTextNodeInfo); } else { @@ -282,7 +282,7 @@ already_AddRefed nsNodeInfoManager::GetCommentNodeInfo() { if (!mCommentNodeInfo) { - GetNodeInfo(nsLayoutAtoms::commentTagName, nsnull, kNameSpaceID_None, + GetNodeInfo(nsGkAtoms::commentTagName, nsnull, kNameSpaceID_None, &mCommentNodeInfo); } else { @@ -296,7 +296,7 @@ already_AddRefed nsNodeInfoManager::GetDocumentNodeInfo() { if (!mDocumentNodeInfo) { - GetNodeInfo(nsLayoutAtoms::documentNodeName, nsnull, kNameSpaceID_None, + GetNodeInfo(nsGkAtoms::documentNodeName, nsnull, kNameSpaceID_None, &mDocumentNodeInfo); } else { diff --git a/content/base/src/nsObjectLoadingContent.cpp b/content/base/src/nsObjectLoadingContent.cpp index edf71a74b11c..b7a205251259 100644 --- a/content/base/src/nsObjectLoadingContent.cpp +++ b/content/base/src/nsObjectLoadingContent.cpp @@ -71,7 +71,6 @@ #include "nsContentPolicyUtils.h" #include "nsContentUtils.h" #include "nsDocShellCID.h" -#include "nsHTMLAtoms.h" #include "nsLayoutAtoms.h" #include "nsThreadUtils.h" #include "nsNetUtil.h" @@ -898,7 +897,7 @@ nsObjectLoadingContent::LoadObject(nsIURI* aURI, PRBool hasID = PR_FALSE; if (caps & eSupportClassID) { nsAutoString classid; - thisContent->GetAttr(kNameSpaceID_None, nsHTMLAtoms::classid, classid); + thisContent->GetAttr(kNameSpaceID_None, nsGkAtoms::classid, classid); if (!classid.IsEmpty()) { hasID = PR_TRUE; isSupportedClassID = NS_SUCCEEDED(TypeForClassID(classid, typeForID)); @@ -1270,7 +1269,7 @@ nsObjectLoadingContent::GetObjectBaseURI(nsIContent* thisContent, nsIURI** aURI) // For plugins, the codebase attribute is the base URI nsCOMPtr baseURI = thisContent->GetBaseURI(); nsAutoString codebase; - thisContent->GetAttr(kNameSpaceID_None, nsHTMLAtoms::codebase, + thisContent->GetAttr(kNameSpaceID_None, nsGkAtoms::codebase, codebase); if (!codebase.IsEmpty()) { nsContentUtils::NewURIWithDocumentCharset(aURI, codebase, @@ -1380,8 +1379,8 @@ nsObjectLoadingContent::GetPluginSupportState(nsIContent* aContent, return ePluginOtherState; } - if (aContent->Tag() == nsHTMLAtoms::embed || - aContent->Tag() == nsHTMLAtoms::applet) { + if (aContent->Tag() == nsGkAtoms::embed || + aContent->Tag() == nsGkAtoms::applet) { return GetPluginDisabledState(aContentType); } @@ -1392,8 +1391,8 @@ nsObjectLoadingContent::GetPluginSupportState(nsIContent* aContent, NS_ASSERTION(child, "GetChildCount lied!"); if (child->IsNodeOfType(nsINode::eHTML) && - child->Tag() == nsHTMLAtoms::param && - child->AttrValueIs(kNameSpaceID_None, nsHTMLAtoms::name, + child->Tag() == nsGkAtoms::param && + child->AttrValueIs(kNameSpaceID_None, nsGkAtoms::name, NS_LITERAL_STRING("pluginurl"), eIgnoreCase)) { return GetPluginDisabledState(aContentType); } diff --git a/content/base/src/nsPlainTextSerializer.cpp b/content/base/src/nsPlainTextSerializer.cpp index f2228c098dd9..f8f11e95c84a 100644 --- a/content/base/src/nsPlainTextSerializer.cpp +++ b/content/base/src/nsPlainTextSerializer.cpp @@ -46,7 +46,7 @@ #include "nsPlainTextSerializer.h" #include "nsLWBrkCIID.h" #include "nsIServiceManager.h" -#include "nsHTMLAtoms.h" +#include "nsGkAtoms.h" #include "nsIDOMText.h" #include "nsIDOMCDATASection.h" #include "nsIDOMElement.h" @@ -567,7 +567,7 @@ nsPlainTextSerializer::DoOpenContainer(const nsIParserNode* aNode, PRInt32 aTag) // newlines before the text. if (aTag == eHTMLTag_blockquote) { nsAutoString value; - nsresult rv = GetAttributeValue(aNode, nsHTMLAtoms::type, value); + nsresult rv = GetAttributeValue(aNode, nsGkAtoms::type, value); isInCiteBlockquote = NS_SUCCEEDED(rv) && value.EqualsIgnoreCase("cite"); } @@ -596,7 +596,7 @@ nsPlainTextSerializer::DoOpenContainer(const nsIParserNode* aNode, PRInt32 aTag) // (which arguably we should only do if told to do so). nsAutoString style; PRInt32 whitespace; - if(NS_SUCCEEDED(GetAttributeValue(aNode, nsHTMLAtoms::style, style)) && + if(NS_SUCCEEDED(GetAttributeValue(aNode, nsGkAtoms::style, style)) && (kNotFound != (whitespace = style.Find("white-space:")))) { if (kNotFound != style.Find("-moz-pre-wrap", PR_TRUE, whitespace)) { @@ -694,7 +694,7 @@ nsPlainTextSerializer::DoOpenContainer(const nsIParserNode* aNode, PRInt32 aTag) if (mOLStackIndex < OLStackSize) { nsAutoString startAttr; PRInt32 startVal = 1; - if(NS_SUCCEEDED(GetAttributeValue(aNode, nsHTMLAtoms::start, startAttr))){ + if(NS_SUCCEEDED(GetAttributeValue(aNode, nsGkAtoms::start, startAttr))){ PRInt32 rv = 0; startVal = startAttr.ToInteger(&rv); if (NS_FAILED(rv)) @@ -708,7 +708,7 @@ nsPlainTextSerializer::DoOpenContainer(const nsIParserNode* aNode, PRInt32 aTag) if (mTagStackIndex > 1 && IsInOL()) { if (mOLStackIndex > 0) { nsAutoString valueAttr; - if(NS_SUCCEEDED(GetAttributeValue(aNode, nsHTMLAtoms::value, valueAttr))){ + if(NS_SUCCEEDED(GetAttributeValue(aNode, nsGkAtoms::value, valueAttr))){ PRInt32 rv = 0; PRInt32 valueAttrVal = valueAttr.ToInteger(&rv); if (NS_SUCCEEDED(rv)) @@ -815,7 +815,7 @@ nsPlainTextSerializer::DoOpenContainer(const nsIParserNode* aNode, PRInt32 aTag) } else if (type == eHTMLTag_a && !currentNodeIsConverted) { nsAutoString url; - if (NS_SUCCEEDED(GetAttributeValue(aNode, nsHTMLAtoms::href, url)) + if (NS_SUCCEEDED(GetAttributeValue(aNode, nsGkAtoms::href, url)) && !url.IsEmpty()) { mURL = url; } @@ -1101,7 +1101,7 @@ nsPlainTextSerializer::DoAddLeaf(const nsIParserNode *aNode, PRInt32 aTag, // Another egregious editor workaround, see bug 38194: // ignore the bogus br tags that the editor sticks here and there. nsAutoString typeAttr; - if (NS_FAILED(GetAttributeValue(aNode, nsHTMLAtoms::type, typeAttr)) + if (NS_FAILED(GetAttributeValue(aNode, nsGkAtoms::type, typeAttr)) || !typeAttr.EqualsLiteral("_moz")) { EnsureVerticalSpace(mEmptyLines+1); } @@ -1159,12 +1159,12 @@ nsPlainTextSerializer::DoAddLeaf(const nsIParserNode *aNode, PRInt32 aTag, // See nsAutoString imageDescription; if (NS_SUCCEEDED(GetAttributeValue(aNode, - nsHTMLAtoms::alt, + nsGkAtoms::alt, imageDescription))) { // If the alt attribute has an empty value (|alt=""|), output nothing } else if (NS_SUCCEEDED(GetAttributeValue(aNode, - nsHTMLAtoms::title, + nsGkAtoms::title, imageDescription)) && !imageDescription.IsEmpty()) { imageDescription = NS_LITERAL_STRING(" [") + @@ -1797,7 +1797,7 @@ PRBool nsPlainTextSerializer::IsCurrentNodeConverted(const nsIParserNode* aNode) { nsAutoString value; - nsresult rv = GetAttributeValue(aNode, nsHTMLAtoms::_class, value); + nsresult rv = GetAttributeValue(aNode, nsGkAtoms::_class, value); return (NS_SUCCEEDED(rv) && (value.EqualsIgnoreCase("moz-txt", 7) || value.EqualsIgnoreCase("\"moz-txt", 8))); diff --git a/content/base/src/nsScriptLoader.cpp b/content/base/src/nsScriptLoader.cpp index b8831e35b68e..8ef8de56a5d3 100644 --- a/content/base/src/nsScriptLoader.cpp +++ b/content/base/src/nsScriptLoader.cpp @@ -48,7 +48,7 @@ #include "nsICharsetConverterManager.h" #include "nsIUnicodeDecoder.h" #include "nsIContent.h" -#include "nsHTMLAtoms.h" +#include "nsGkAtoms.h" #include "nsNetUtil.h" #include "nsIScriptGlobalObject.h" #include "nsIScriptContext.h" @@ -190,8 +190,8 @@ IsScriptEventHandler(nsIScriptElement *aScriptElement) NS_ASSERTION(contElement, "nsIScriptElement isn't nsIContent"); nsAutoString forAttr, eventAttr; - if (!contElement->GetAttr(kNameSpaceID_None, nsHTMLAtoms::_for, forAttr) || - !contElement->GetAttr(kNameSpaceID_None, nsHTMLAtoms::event, eventAttr)) { + if (!contElement->GetAttr(kNameSpaceID_None, nsGkAtoms::_for, forAttr) || + !contElement->GetAttr(kNameSpaceID_None, nsGkAtoms::event, eventAttr)) { return PR_FALSE; } diff --git a/content/base/src/nsXMLContentSerializer.cpp b/content/base/src/nsXMLContentSerializer.cpp index 534f50be7bce..2150176bd58c 100644 --- a/content/base/src/nsXMLContentSerializer.cpp +++ b/content/base/src/nsXMLContentSerializer.cpp @@ -43,7 +43,7 @@ #include "nsXMLContentSerializer.h" -#include "nsHTMLAtoms.h" +#include "nsLayoutAtoms.h" #include "nsIDOMText.h" #include "nsIDOMCDATASection.h" #include "nsIDOMProcessingInstruction.h" @@ -60,7 +60,6 @@ #include "nsUnicharUtils.h" #include "nsCRT.h" #include "nsContentUtils.h" -#include "nsLayoutAtoms.h" #include "nsAttrName.h" typedef struct { @@ -619,7 +618,7 @@ nsXMLContentSerializer::AppendElementStart(nsIDOMElement *aElement, // XXXbz what if we have both "xmlns" in the null namespace and "xmlns" // in the xmlns namespace? (namespaceID == kNameSpaceID_None && - attrName == nsLayoutAtoms::xmlns)) { + attrName == nsGkAtoms::xmlns)) { content->GetAttr(namespaceID, attrName, uriStr); if (!name->GetPrefix()) { @@ -875,86 +874,86 @@ nsXMLContentSerializer::IsShorthandAttr(const nsIAtom* aAttrName, const nsIAtom* aElementName) { // checked - if ((aAttrName == nsHTMLAtoms::checked) && - (aElementName == nsHTMLAtoms::input)) { + if ((aAttrName == nsGkAtoms::checked) && + (aElementName == nsGkAtoms::input)) { return PR_TRUE; } // compact - if ((aAttrName == nsHTMLAtoms::compact) && - (aElementName == nsHTMLAtoms::dir || - aElementName == nsHTMLAtoms::dl || - aElementName == nsHTMLAtoms::menu || - aElementName == nsHTMLAtoms::ol || - aElementName == nsHTMLAtoms::ul)) { + if ((aAttrName == nsGkAtoms::compact) && + (aElementName == nsGkAtoms::dir || + aElementName == nsGkAtoms::dl || + aElementName == nsGkAtoms::menu || + aElementName == nsGkAtoms::ol || + aElementName == nsGkAtoms::ul)) { return PR_TRUE; } // declare - if ((aAttrName == nsHTMLAtoms::declare) && - (aElementName == nsHTMLAtoms::object)) { + if ((aAttrName == nsGkAtoms::declare) && + (aElementName == nsGkAtoms::object)) { return PR_TRUE; } // defer - if ((aAttrName == nsHTMLAtoms::defer) && - (aElementName == nsHTMLAtoms::script)) { + if ((aAttrName == nsGkAtoms::defer) && + (aElementName == nsGkAtoms::script)) { return PR_TRUE; } // disabled - if ((aAttrName == nsHTMLAtoms::disabled) && - (aElementName == nsHTMLAtoms::button || - aElementName == nsHTMLAtoms::input || - aElementName == nsHTMLAtoms::optgroup || - aElementName == nsHTMLAtoms::option || - aElementName == nsHTMLAtoms::select || - aElementName == nsHTMLAtoms::textarea)) { + if ((aAttrName == nsGkAtoms::disabled) && + (aElementName == nsGkAtoms::button || + aElementName == nsGkAtoms::input || + aElementName == nsGkAtoms::optgroup || + aElementName == nsGkAtoms::option || + aElementName == nsGkAtoms::select || + aElementName == nsGkAtoms::textarea)) { return PR_TRUE; } // ismap - if ((aAttrName == nsHTMLAtoms::ismap) && - (aElementName == nsHTMLAtoms::img || - aElementName == nsHTMLAtoms::input)) { + if ((aAttrName == nsGkAtoms::ismap) && + (aElementName == nsGkAtoms::img || + aElementName == nsGkAtoms::input)) { return PR_TRUE; } // multiple - if ((aAttrName == nsHTMLAtoms::multiple) && - (aElementName == nsHTMLAtoms::select)) { + if ((aAttrName == nsGkAtoms::multiple) && + (aElementName == nsGkAtoms::select)) { return PR_TRUE; } // noresize - if ((aAttrName == nsHTMLAtoms::noresize) && - (aElementName == nsHTMLAtoms::frame)) { + if ((aAttrName == nsGkAtoms::noresize) && + (aElementName == nsGkAtoms::frame)) { return PR_TRUE; } // noshade - if ((aAttrName == nsHTMLAtoms::noshade) && - (aElementName == nsHTMLAtoms::hr)) { + if ((aAttrName == nsGkAtoms::noshade) && + (aElementName == nsGkAtoms::hr)) { return PR_TRUE; } // nowrap - if ((aAttrName == nsHTMLAtoms::nowrap) && - (aElementName == nsHTMLAtoms::td || - aElementName == nsHTMLAtoms::th)) { + if ((aAttrName == nsGkAtoms::nowrap) && + (aElementName == nsGkAtoms::td || + aElementName == nsGkAtoms::th)) { return PR_TRUE; } // readonly - if ((aAttrName == nsHTMLAtoms::readonly) && - (aElementName == nsHTMLAtoms::input || - aElementName == nsHTMLAtoms::textarea)) { + if ((aAttrName == nsGkAtoms::readonly) && + (aElementName == nsGkAtoms::input || + aElementName == nsGkAtoms::textarea)) { return PR_TRUE; } // selected - if ((aAttrName == nsHTMLAtoms::selected) && - (aElementName == nsHTMLAtoms::option)) { + if ((aAttrName == nsGkAtoms::selected) && + (aElementName == nsGkAtoms::option)) { return PR_TRUE; } diff --git a/content/base/src/nsXMLNameSpaceMap.cpp b/content/base/src/nsXMLNameSpaceMap.cpp index 317cfc4b6dbc..866bd09015e8 100755 --- a/content/base/src/nsXMLNameSpaceMap.cpp +++ b/content/base/src/nsXMLNameSpaceMap.cpp @@ -62,9 +62,9 @@ nsXMLNameSpaceMap::Create() nsXMLNameSpaceMap *map = new nsXMLNameSpaceMap(); NS_ENSURE_TRUE(map, nsnull); - nsresult rv = map->AddPrefix(nsLayoutAtoms::xmlns, + nsresult rv = map->AddPrefix(nsGkAtoms::xmlns, kNameSpaceID_XMLNS); - rv |= map->AddPrefix(nsLayoutAtoms::xml, kNameSpaceID_XML); + rv |= map->AddPrefix(nsGkAtoms::xml, kNameSpaceID_XML); if (NS_FAILED(rv)) { delete map; diff --git a/content/events/src/nsDOMEvent.cpp b/content/events/src/nsDOMEvent.cpp index 048bdcc182a8..27d0d97b86e6 100644 --- a/content/events/src/nsDOMEvent.cpp +++ b/content/events/src/nsDOMEvent.cpp @@ -377,101 +377,101 @@ nsDOMEvent::SetEventType(const nsAString& aEventTypeArg) mEvent->message = NS_USER_DEFINED_EVENT; if (mEvent->eventStructType == NS_MOUSE_EVENT) { - if (atom == nsLayoutAtoms::onmousedown) + if (atom == nsGkAtoms::onmousedown) mEvent->message = NS_MOUSE_BUTTON_DOWN; - else if (atom == nsLayoutAtoms::onmouseup) + else if (atom == nsGkAtoms::onmouseup) mEvent->message = NS_MOUSE_BUTTON_UP; - else if (atom == nsLayoutAtoms::onclick) + else if (atom == nsGkAtoms::onclick) mEvent->message = NS_MOUSE_CLICK; - else if (atom == nsLayoutAtoms::ondblclick) + else if (atom == nsGkAtoms::ondblclick) mEvent->message = NS_MOUSE_DOUBLECLICK; - else if (atom == nsLayoutAtoms::onmouseover) + else if (atom == nsGkAtoms::onmouseover) mEvent->message = NS_MOUSE_ENTER_SYNTH; - else if (atom == nsLayoutAtoms::onmouseout) + else if (atom == nsGkAtoms::onmouseout) mEvent->message = NS_MOUSE_EXIT_SYNTH; - else if (atom == nsLayoutAtoms::onmousemove) + else if (atom == nsGkAtoms::onmousemove) mEvent->message = NS_MOUSE_MOVE; - else if (atom == nsLayoutAtoms::oncontextmenu) + else if (atom == nsGkAtoms::oncontextmenu) mEvent->message = NS_CONTEXTMENU; } else if (mEvent->eventStructType == NS_KEY_EVENT) { - if (atom == nsLayoutAtoms::onkeydown) + if (atom == nsGkAtoms::onkeydown) mEvent->message = NS_KEY_DOWN; - else if (atom == nsLayoutAtoms::onkeyup) + else if (atom == nsGkAtoms::onkeyup) mEvent->message = NS_KEY_UP; - else if (atom == nsLayoutAtoms::onkeypress) + else if (atom == nsGkAtoms::onkeypress) mEvent->message = NS_KEY_PRESS; } else if (mEvent->eventStructType == NS_COMPOSITION_EVENT) { - if (atom == nsLayoutAtoms::oncompositionstart) + if (atom == nsGkAtoms::oncompositionstart) mEvent->message = NS_COMPOSITION_START; - else if (atom == nsLayoutAtoms::oncompositionend) + else if (atom == nsGkAtoms::oncompositionend) mEvent->message = NS_COMPOSITION_END; } else if (mEvent->eventStructType == NS_EVENT) { - if (atom == nsLayoutAtoms::onfocus) + if (atom == nsGkAtoms::onfocus) mEvent->message = NS_FOCUS_CONTENT; - else if (atom == nsLayoutAtoms::onblur) + else if (atom == nsGkAtoms::onblur) mEvent->message = NS_BLUR_CONTENT; - else if (atom == nsLayoutAtoms::onsubmit) + else if (atom == nsGkAtoms::onsubmit) mEvent->message = NS_FORM_SUBMIT; - else if (atom == nsLayoutAtoms::onreset) + else if (atom == nsGkAtoms::onreset) mEvent->message = NS_FORM_RESET; - else if (atom == nsLayoutAtoms::onchange) + else if (atom == nsGkAtoms::onchange) mEvent->message = NS_FORM_CHANGE; - else if (atom == nsLayoutAtoms::onselect) + else if (atom == nsGkAtoms::onselect) mEvent->message = NS_FORM_SELECTED; - else if (atom == nsLayoutAtoms::onload) + else if (atom == nsGkAtoms::onload) mEvent->message = NS_LOAD; - else if (atom == nsLayoutAtoms::onunload) + else if (atom == nsGkAtoms::onunload) mEvent->message = NS_PAGE_UNLOAD; - else if (atom == nsLayoutAtoms::onabort) + else if (atom == nsGkAtoms::onabort) mEvent->message = NS_IMAGE_ABORT; - else if (atom == nsLayoutAtoms::onerror) + else if (atom == nsGkAtoms::onerror) mEvent->message = NS_LOAD_ERROR; } else if (mEvent->eventStructType == NS_MUTATION_EVENT) { - if (atom == nsLayoutAtoms::onDOMAttrModified) + if (atom == nsGkAtoms::onDOMAttrModified) mEvent->message = NS_MUTATION_ATTRMODIFIED; - else if (atom == nsLayoutAtoms::onDOMCharacterDataModified) + else if (atom == nsGkAtoms::onDOMCharacterDataModified) mEvent->message = NS_MUTATION_CHARACTERDATAMODIFIED; - else if (atom == nsLayoutAtoms::onDOMNodeInserted) + else if (atom == nsGkAtoms::onDOMNodeInserted) mEvent->message = NS_MUTATION_NODEINSERTED; - else if (atom == nsLayoutAtoms::onDOMNodeRemoved) + else if (atom == nsGkAtoms::onDOMNodeRemoved) mEvent->message = NS_MUTATION_NODEREMOVED; - else if (atom == nsLayoutAtoms::onDOMNodeInsertedIntoDocument) + else if (atom == nsGkAtoms::onDOMNodeInsertedIntoDocument) mEvent->message = NS_MUTATION_NODEINSERTEDINTODOCUMENT; - else if (atom == nsLayoutAtoms::onDOMNodeRemovedFromDocument) + else if (atom == nsGkAtoms::onDOMNodeRemovedFromDocument) mEvent->message = NS_MUTATION_NODEREMOVEDFROMDOCUMENT; - else if (atom == nsLayoutAtoms::onDOMSubtreeModified) + else if (atom == nsGkAtoms::onDOMSubtreeModified) mEvent->message = NS_MUTATION_SUBTREEMODIFIED; } else if (mEvent->eventStructType == NS_UI_EVENT) { - if (atom == nsLayoutAtoms::onDOMActivate) + if (atom == nsGkAtoms::onDOMActivate) mEvent->message = NS_UI_ACTIVATE; - else if (atom == nsLayoutAtoms::onDOMFocusIn) + else if (atom == nsGkAtoms::onDOMFocusIn) mEvent->message = NS_UI_FOCUSIN; - else if (atom == nsLayoutAtoms::onDOMFocusOut) + else if (atom == nsGkAtoms::onDOMFocusOut) mEvent->message = NS_UI_FOCUSOUT; - else if (atom == nsLayoutAtoms::oninput) + else if (atom == nsGkAtoms::oninput) mEvent->message = NS_FORM_INPUT; } else if (mEvent->eventStructType == NS_PAGETRANSITION_EVENT) { - if (atom == nsLayoutAtoms::onpageshow) + if (atom == nsGkAtoms::onpageshow) mEvent->message = NS_PAGE_SHOW; - else if (atom == nsLayoutAtoms::onpagehide) + else if (atom == nsGkAtoms::onpagehide) mEvent->message = NS_PAGE_HIDE; } #ifdef MOZ_SVG else if (mEvent->eventStructType == NS_SVG_EVENT) { - if (atom == nsLayoutAtoms::onSVGLoad) + if (atom == nsGkAtoms::onSVGLoad) mEvent->message = NS_SVG_LOAD; - else if (atom == nsLayoutAtoms::onSVGUnload) + else if (atom == nsGkAtoms::onSVGUnload) mEvent->message = NS_SVG_UNLOAD; - else if (atom == nsLayoutAtoms::onSVGAbort) + else if (atom == nsGkAtoms::onSVGAbort) mEvent->message = NS_SVG_ABORT; - else if (atom == nsLayoutAtoms::onSVGError) + else if (atom == nsGkAtoms::onSVGError) mEvent->message = NS_SVG_ERROR; - else if (atom == nsLayoutAtoms::onSVGResize) + else if (atom == nsGkAtoms::onSVGResize) mEvent->message = NS_SVG_RESIZE; - else if (atom == nsLayoutAtoms::onSVGScroll) + else if (atom == nsGkAtoms::onSVGScroll) mEvent->message = NS_SVG_SCROLL; } else if (mEvent->eventStructType == NS_SVGZOOM_EVENT) { - if (atom == nsLayoutAtoms::onSVGZoom) + if (atom == nsGkAtoms::onSVGZoom) mEvent->message = NS_SVG_ZOOM; } #endif // MOZ_SVG diff --git a/content/events/src/nsEventListenerManager.cpp b/content/events/src/nsEventListenerManager.cpp index 51f8c4e7f015..3f1e0af8683f 100644 --- a/content/events/src/nsEventListenerManager.cpp +++ b/content/events/src/nsEventListenerManager.cpp @@ -62,7 +62,7 @@ #ifdef MOZ_SVG #include "nsIDOMSVGListener.h" #include "nsIDOMSVGZoomListener.h" -#include "nsSVGAtoms.h" +#include "nsLayoutAtoms.h" #endif // MOZ_SVG #include "nsIEventStateManager.h" #include "nsPIDOMWindow.h" @@ -71,7 +71,6 @@ #include "prmem.h" #include "nsIScriptGlobalObject.h" #include "nsIScriptRuntime.h" -#include "nsLayoutAtoms.h" #include "nsLayoutUtils.h" #ifdef MOZ_XUL // XXXbz the fact that this is ifdef MOZ_XUL is good indication that @@ -1160,20 +1159,20 @@ nsEventListenerManager::CompileEventHandlerInternal(nsIScriptContext *aContext, nsAutoString handlerBody; nsIAtom* attrName = aName; #ifdef MOZ_SVG - if (aName == nsLayoutAtoms::onSVGLoad) - attrName = nsSVGAtoms::onload; - else if (aName == nsLayoutAtoms::onSVGUnload) - attrName = nsSVGAtoms::onunload; - else if (aName == nsLayoutAtoms::onSVGAbort) - attrName = nsSVGAtoms::onabort; - else if (aName == nsLayoutAtoms::onSVGError) - attrName = nsSVGAtoms::onerror; - else if (aName == nsLayoutAtoms::onSVGResize) - attrName = nsSVGAtoms::onresize; - else if (aName == nsLayoutAtoms::onSVGScroll) - attrName = nsSVGAtoms::onscroll; - else if (aName == nsLayoutAtoms::onSVGZoom) - attrName = nsSVGAtoms::onzoom; + if (aName == nsGkAtoms::onSVGLoad) + attrName = nsGkAtoms::onload; + else if (aName == nsGkAtoms::onSVGUnload) + attrName = nsGkAtoms::onunload; + else if (aName == nsGkAtoms::onSVGAbort) + attrName = nsGkAtoms::onabort; + else if (aName == nsGkAtoms::onSVGError) + attrName = nsGkAtoms::onerror; + else if (aName == nsGkAtoms::onSVGResize) + attrName = nsGkAtoms::onresize; + else if (aName == nsGkAtoms::onSVGScroll) + attrName = nsGkAtoms::onscroll; + else if (aName == nsGkAtoms::onSVGZoom) + attrName = nsGkAtoms::onzoom; #endif // MOZ_SVG content->GetAttr(kNameSpaceID_None, attrName, handlerBody); diff --git a/content/events/src/nsEventStateManager.cpp b/content/events/src/nsEventStateManager.cpp index 11228032ecf0..6c2487c4c099 100644 --- a/content/events/src/nsEventStateManager.cpp +++ b/content/events/src/nsEventStateManager.cpp @@ -55,7 +55,7 @@ #include "nsPresContext.h" #include "nsIPresShell.h" #include "nsDOMEvent.h" -#include "nsHTMLAtoms.h" +#include "nsLayoutAtoms.h" #include "nsIEditorDocShell.h" #include "nsIFormControl.h" #include "nsIComboboxControlFrame.h" @@ -98,7 +98,6 @@ #include "nsIChromeEventHandler.h" #include "nsIFocusController.h" -#include "nsXULAtoms.h" #include "nsIDOMXULElement.h" #include "nsIDOMDocument.h" #include "nsIDOMKeyEvent.h" @@ -121,7 +120,6 @@ #include "nsIFrameFrame.h" #include "nsIFrameTraversal.h" -#include "nsLayoutAtoms.h" #include "nsLayoutCID.h" #include "nsLayoutUtils.h" #include "nsIInterfaceRequestorUtils.h" @@ -1190,12 +1188,12 @@ nsEventStateManager::HandleAccessKey(nsPresContext* aPresContext, // if it's a XUL element... if (content->IsNodeOfType(nsINode::eXUL)) { // find out what type of content node this is - if (content->Tag() == nsXULAtoms::label) { + if (content->Tag() == nsGkAtoms::label) { // If anything fails, this will be null ... nsCOMPtr element; nsAutoString control; - content->GetAttr(kNameSpaceID_None, nsXULAtoms::control, control); + content->GetAttr(kNameSpaceID_None, nsGkAtoms::control, control); if (!control.IsEmpty()) { nsCOMPtr domDocument = do_QueryInterface(content->GetDocument()); @@ -1229,10 +1227,10 @@ nsEventStateManager::HandleAccessKey(nsPresContext* aPresContext, nsIAtom *atom = content->Tag(); // define behavior for each type of XUL element: - if (atom == nsXULAtoms::textbox || atom == nsXULAtoms::menulist) { + if (atom == nsGkAtoms::textbox || atom == nsGkAtoms::menulist) { // if it's a text box or menulist, give it focus element->Focus(); - } else if (atom == nsXULAtoms::toolbarbutton) { + } else if (atom == nsGkAtoms::toolbarbutton) { // if it's a toolbar button, just click element->Click(); } else { @@ -1246,7 +1244,7 @@ nsEventStateManager::HandleAccessKey(nsPresContext* aPresContext, // It's hard to say what HTML4 wants us to do in all cases. // So for now we'll settle for A) Set focus (except for