diff --git a/mozilla/accessible/src/base/nsAccessibilityAtoms.h b/mozilla/accessible/src/base/nsAccessibilityAtoms.h index 7498bc1eeb9..ae5b93d5393 100644 --- a/mozilla/accessible/src/base/nsAccessibilityAtoms.h +++ b/mozilla/accessible/src/base/nsAccessibilityAtoms.h @@ -65,4 +65,4 @@ public: #undef ACCESSIBILITY_ATOM }; -#endif /* nsLayoutAtoms_h___ */ +#endif /* nsAccessibilityAtoms_h___ */ diff --git a/mozilla/accessible/src/base/nsRootAccessible.cpp b/mozilla/accessible/src/base/nsRootAccessible.cpp index d3cc4effbb2..751779325da 100644 --- a/mozilla/accessible/src/base/nsRootAccessible.cpp +++ b/mozilla/accessible/src/base/nsRootAccessible.cpp @@ -71,7 +71,6 @@ #include "nsISelectionPrivate.h" #include "nsIServiceManager.h" #include "nsIViewManager.h" -#include "nsLayoutAtoms.h" #include "nsPIDOMWindow.h" #include "nsIWebBrowserChrome.h" #include "nsReadableUtils.h" diff --git a/mozilla/content/base/src/mozSanitizingSerializer.cpp b/mozilla/content/base/src/mozSanitizingSerializer.cpp index ee27e74e55b..163d9a59657 100644 --- a/mozilla/content/base/src/mozSanitizingSerializer.cpp +++ b/mozilla/content/base/src/mozSanitizingSerializer.cpp @@ -52,7 +52,6 @@ #include "mozSanitizingSerializer.h" #include "nsIServiceManager.h" -#include "nsHTMLAtoms.h" #include "nsIDOMText.h" #include "nsIDOMElement.h" #include "nsTextFragment.h" diff --git a/mozilla/content/base/src/nsCommentNode.cpp b/mozilla/content/base/src/nsCommentNode.cpp index cec823c2042..65060ef586f 100644 --- a/mozilla/content/base/src/nsCommentNode.cpp +++ b/mozilla/content/base/src/nsCommentNode.cpp @@ -41,7 +41,6 @@ #include "nsIDOMComment.h" #include "nsGenericDOMDataNode.h" -#include "nsLayoutAtoms.h" #include "nsCOMPtr.h" #include "nsIDocument.h" diff --git a/mozilla/content/base/src/nsContentAreaDragDrop.cpp b/mozilla/content/base/src/nsContentAreaDragDrop.cpp index 1a268718dce..556cf6e6f44 100644 --- a/mozilla/content/base/src/nsContentAreaDragDrop.cpp +++ b/mozilla/content/base/src/nsContentAreaDragDrop.cpp @@ -82,7 +82,6 @@ #include "nsIXMLContent.h" #include "nsINameSpaceManager.h" #include "nsUnicharUtils.h" -#include "nsHTMLAtoms.h" #include "nsIURL.h" #include "nsIImage.h" #include "nsIDocument.h" @@ -91,7 +90,6 @@ #include "nsPresContext.h" #include "nsIDocShellTreeItem.h" #include "nsIFrame.h" -#include "nsLayoutAtoms.h" #include "nsRange.h" #include "nsIWebBrowserPersist.h" #include "nsEscape.h" diff --git a/mozilla/content/base/src/nsContentList.cpp b/mozilla/content/base/src/nsContentList.cpp index 945abda2d79..f8e20c9f647 100644 --- a/mozilla/content/base/src/nsContentList.cpp +++ b/mozilla/content/base/src/nsContentList.cpp @@ -51,7 +51,7 @@ #include "nsContentUtils.h" -#include "nsLayoutAtoms.h" +#include "nsGkAtoms.h" // Form related includes #include "nsIDOMHTMLFormElement.h" diff --git a/mozilla/content/base/src/nsContentUtils.cpp b/mozilla/content/base/src/nsContentUtils.cpp index 96a5635578e..0939ebd3fe8 100644 --- a/mozilla/content/base/src/nsContentUtils.cpp +++ b/mozilla/content/base/src/nsContentUtils.cpp @@ -89,7 +89,7 @@ #include "nsIDOMHTMLFormElement.h" #include "nsIForm.h" #include "nsIFormControl.h" -#include "nsLayoutAtoms.h" +#include "nsGkAtoms.h" #include "nsISupportsPrimitives.h" #include "imgIDecoderObserver.h" #include "imgIRequest.h" diff --git a/mozilla/content/base/src/nsDOMDocumentType.cpp b/mozilla/content/base/src/nsDOMDocumentType.cpp index 876ba1406eb..f221894b522 100644 --- a/mozilla/content/base/src/nsDOMDocumentType.cpp +++ b/mozilla/content/base/src/nsDOMDocumentType.cpp @@ -42,7 +42,7 @@ #include "nsDOMDocumentType.h" #include "nsDOMAttributeMap.h" #include "nsIDOMNamedNodeMap.h" -#include "nsLayoutAtoms.h" +#include "nsGkAtoms.h" #include "nsCOMPtr.h" #include "nsContentUtils.h" #include "nsDOMString.h" diff --git a/mozilla/content/base/src/nsDocumentFragment.cpp b/mozilla/content/base/src/nsDocumentFragment.cpp index 1beca57ba27..e229acd8c11 100644 --- a/mozilla/content/base/src/nsDocumentFragment.cpp +++ b/mozilla/content/base/src/nsDocumentFragment.cpp @@ -51,7 +51,7 @@ #include "nsIDOMAttr.h" #include "nsDOMError.h" #include "nsIDOM3Node.h" -#include "nsLayoutAtoms.h" +#include "nsGkAtoms.h" #include "nsDOMString.h" #include "nsIDOMUserDataHandler.h" diff --git a/mozilla/content/base/src/nsGenericDOMDataNode.cpp b/mozilla/content/base/src/nsGenericDOMDataNode.cpp index 6146a2d771f..e24c372fdd2 100644 --- a/mozilla/content/base/src/nsGenericDOMDataNode.cpp +++ b/mozilla/content/base/src/nsGenericDOMDataNode.cpp @@ -55,7 +55,6 @@ #include "nsIDOMText.h" #include "nsCOMPtr.h" #include "nsDOMString.h" -#include "nsLayoutAtoms.h" #include "nsIDOMUserDataHandler.h" #include "nsChangeHint.h" #include "nsEventDispatcher.h" diff --git a/mozilla/content/base/src/nsGenericElement.cpp b/mozilla/content/base/src/nsGenericElement.cpp index 3e545e9b3e0..2b98584bd4d 100644 --- a/mozilla/content/base/src/nsGenericElement.cpp +++ b/mozilla/content/base/src/nsGenericElement.cpp @@ -94,7 +94,7 @@ #include "nsPIBoxObject.h" #include "nsIDOMNSDocument.h" -#include "nsLayoutAtoms.h" +#include "nsGkAtoms.h" #include "nsContentUtils.h" #include "nsIJSContextStack.h" diff --git a/mozilla/content/base/src/nsHTMLContentSerializer.cpp b/mozilla/content/base/src/nsHTMLContentSerializer.cpp index 8cbc5a697ee..4325581e658 100644 --- a/mozilla/content/base/src/nsHTMLContentSerializer.cpp +++ b/mozilla/content/base/src/nsHTMLContentSerializer.cpp @@ -55,7 +55,7 @@ #include "nsXPIDLString.h" #include "nsIServiceManager.h" #include "nsIDocumentEncoder.h" -#include "nsLayoutAtoms.h" +#include "nsGkAtoms.h" #include "nsIURI.h" #include "nsNetUtil.h" #include "nsEscape.h" diff --git a/mozilla/content/base/src/nsImageLoadingContent.cpp b/mozilla/content/base/src/nsImageLoadingContent.cpp index e3e3590df76..1fdf440532e 100644 --- a/mozilla/content/base/src/nsImageLoadingContent.cpp +++ b/mozilla/content/base/src/nsImageLoadingContent.cpp @@ -68,7 +68,6 @@ #include "nsIChannel.h" #include "nsIStreamListener.h" -#include "nsLayoutAtoms.h" #include "nsIFrame.h" #include "nsIDOMNode.h" diff --git a/mozilla/content/base/src/nsNodeInfoManager.cpp b/mozilla/content/base/src/nsNodeInfoManager.cpp index 95da860fa29..65f629e878e 100644 --- a/mozilla/content/base/src/nsNodeInfoManager.cpp +++ b/mozilla/content/base/src/nsNodeInfoManager.cpp @@ -49,7 +49,7 @@ #include "nsIURI.h" #include "nsContentUtils.h" #include "nsReadableUtils.h" -#include "nsLayoutAtoms.h" +#include "nsGkAtoms.h" #include "nsComponentManagerUtils.h" PRUint32 nsNodeInfoManager::gNodeManagerCount; diff --git a/mozilla/content/base/src/nsObjectLoadingContent.cpp b/mozilla/content/base/src/nsObjectLoadingContent.cpp index b7a20525125..252fcc2cafd 100644 --- a/mozilla/content/base/src/nsObjectLoadingContent.cpp +++ b/mozilla/content/base/src/nsObjectLoadingContent.cpp @@ -71,7 +71,7 @@ #include "nsContentPolicyUtils.h" #include "nsContentUtils.h" #include "nsDocShellCID.h" -#include "nsLayoutAtoms.h" +#include "nsGkAtoms.h" #include "nsThreadUtils.h" #include "nsNetUtil.h" diff --git a/mozilla/content/base/src/nsStyleLinkElement.cpp b/mozilla/content/base/src/nsStyleLinkElement.cpp index 63af160b5fc..000dc426ecc 100644 --- a/mozilla/content/base/src/nsStyleLinkElement.cpp +++ b/mozilla/content/base/src/nsStyleLinkElement.cpp @@ -45,7 +45,6 @@ #include "nsStyleLinkElement.h" -#include "nsHTMLAtoms.h" #include "nsIContent.h" #include "nsICSSLoader.h" #include "nsICSSStyleSheet.h" diff --git a/mozilla/content/base/src/nsTextNode.cpp b/mozilla/content/base/src/nsTextNode.cpp index e6acdc74434..c622bd6a69b 100644 --- a/mozilla/content/base/src/nsTextNode.cpp +++ b/mozilla/content/base/src/nsTextNode.cpp @@ -41,7 +41,6 @@ #include "nsGenericDOMDataNode.h" #include "nsIDOMText.h" -#include "nsLayoutAtoms.h" #include "nsContentUtils.h" #include "nsIDOMEventListener.h" #include "nsIDOMEventTarget.h" diff --git a/mozilla/content/base/src/nsXMLContentSerializer.cpp b/mozilla/content/base/src/nsXMLContentSerializer.cpp index 2150176bd58..20e10fa7c16 100644 --- a/mozilla/content/base/src/nsXMLContentSerializer.cpp +++ b/mozilla/content/base/src/nsXMLContentSerializer.cpp @@ -43,7 +43,7 @@ #include "nsXMLContentSerializer.h" -#include "nsLayoutAtoms.h" +#include "nsGkAtoms.h" #include "nsIDOMText.h" #include "nsIDOMCDATASection.h" #include "nsIDOMProcessingInstruction.h" diff --git a/mozilla/content/base/src/nsXMLNameSpaceMap.cpp b/mozilla/content/base/src/nsXMLNameSpaceMap.cpp index 866bd09015e..10328caed1c 100755 --- a/mozilla/content/base/src/nsXMLNameSpaceMap.cpp +++ b/mozilla/content/base/src/nsXMLNameSpaceMap.cpp @@ -45,7 +45,7 @@ #include "nsCOMPtr.h" #include "nsINameSpaceManager.h" #include "nsContentUtils.h" -#include "nsLayoutAtoms.h" +#include "nsGkAtoms.h" struct nsNameSpaceEntry { diff --git a/mozilla/content/events/src/nsDOMEvent.cpp b/mozilla/content/events/src/nsDOMEvent.cpp index 5481f898d83..d8d307ffe71 100644 --- a/mozilla/content/events/src/nsDOMEvent.cpp +++ b/mozilla/content/events/src/nsDOMEvent.cpp @@ -49,7 +49,7 @@ #include "nsIInterfaceRequestor.h" #include "nsIInterfaceRequestorUtils.h" #include "prmem.h" -#include "nsLayoutAtoms.h" +#include "nsGkAtoms.h" #include "nsMutationEvent.h" #include "nsContentUtils.h" #include "nsIURI.h" diff --git a/mozilla/content/events/src/nsEventListenerManager.cpp b/mozilla/content/events/src/nsEventListenerManager.cpp index 2484208a54e..af72ded5281 100644 --- a/mozilla/content/events/src/nsEventListenerManager.cpp +++ b/mozilla/content/events/src/nsEventListenerManager.cpp @@ -62,7 +62,7 @@ #ifdef MOZ_SVG #include "nsIDOMSVGListener.h" #include "nsIDOMSVGZoomListener.h" -#include "nsLayoutAtoms.h" +#include "nsGkAtoms.h" #endif // MOZ_SVG #include "nsIEventStateManager.h" #include "nsPIDOMWindow.h" diff --git a/mozilla/content/events/src/nsEventStateManager.cpp b/mozilla/content/events/src/nsEventStateManager.cpp index 2629d90f51e..9f583166013 100644 --- a/mozilla/content/events/src/nsEventStateManager.cpp +++ b/mozilla/content/events/src/nsEventStateManager.cpp @@ -55,7 +55,7 @@ #include "nsPresContext.h" #include "nsIPresShell.h" #include "nsDOMEvent.h" -#include "nsLayoutAtoms.h" +#include "nsGkAtoms.h" #include "nsIEditorDocShell.h" #include "nsIFormControl.h" #include "nsIComboboxControlFrame.h" diff --git a/mozilla/content/events/src/nsXMLEventsManager.cpp b/mozilla/content/events/src/nsXMLEventsManager.cpp index 71177472328..ab8d827d8a3 100644 --- a/mozilla/content/events/src/nsXMLEventsManager.cpp +++ b/mozilla/content/events/src/nsXMLEventsManager.cpp @@ -38,7 +38,7 @@ #include "nsIDOMMutationEvent.h" #include "nsXMLEventsManager.h" -#include "nsLayoutAtoms.h" +#include "nsGkAtoms.h" #include "nsIDOMElement.h" #include "nsIDOMDocument.h" #include "nsIDOMEventReceiver.h" diff --git a/mozilla/content/html/content/src/Makefile.in b/mozilla/content/html/content/src/Makefile.in index c5b410b45bb..6ffc4ef7c70 100644 --- a/mozilla/content/html/content/src/Makefile.in +++ b/mozilla/content/html/content/src/Makefile.in @@ -75,7 +75,6 @@ REQUIRES = xpcom \ $(NULL) EXPORTS = \ - nsHTMLAtoms.h \ nsImageMapUtils.h \ $(NULL) diff --git a/mozilla/content/html/content/src/nsGenericHTMLElement.cpp b/mozilla/content/html/content/src/nsGenericHTMLElement.cpp index c82209dff51..c2fcfffb933 100644 --- a/mozilla/content/html/content/src/nsGenericHTMLElement.cpp +++ b/mozilla/content/html/content/src/nsGenericHTMLElement.cpp @@ -87,7 +87,7 @@ #include "nsContentUtils.h" #include "nsString.h" #include "nsUnicharUtils.h" -#include "nsLayoutAtoms.h" +#include "nsGkAtoms.h" #include "nsIEventStateManager.h" #include "nsIDOMEvent.h" #include "nsIDOMNSEvent.h" diff --git a/mozilla/content/html/content/src/nsHTMLAtoms.h b/mozilla/content/html/content/src/nsHTMLAtoms.h deleted file mode 100644 index cc92c0eda16..00000000000 --- a/mozilla/content/html/content/src/nsHTMLAtoms.h +++ /dev/null @@ -1,42 +0,0 @@ -/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */ -/* ***** BEGIN LICENSE BLOCK ***** - * Version: MPL 1.1/GPL 2.0/LGPL 2.1 - * - * The contents of this file are subject to the Mozilla Public License Version - * 1.1 (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * http://www.mozilla.org/MPL/ - * - * Software distributed under the License is distributed on an "AS IS" basis, - * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License - * for the specific language governing rights and limitations under the - * License. - * - * The Original Code is mozilla.org code. - * - * The Initial Developer of the Original Code is - * Netscape Communications Corporation. - * Portions created by the Initial Developer are Copyright (C) 1998 - * the Initial Developer. All Rights Reserved. - * - * Contributor(s): - * - * Alternatively, the contents of this file may be used under the terms of - * either of the GNU General Public License Version 2 or later (the "GPL"), - * or the GNU Lesser General Public License Version 2.1 or later (the "LGPL"), - * in which case the provisions of the GPL or the LGPL are applicable instead - * of those above. If you wish to allow use of your version of this file only - * under the terms of either the GPL or the LGPL, and not to allow others to - * use your version of this file under the terms of the MPL, indicate your - * decision by deleting the provisions above and replace them with the notice - * and other provisions required by the GPL or the LGPL. If you do not delete - * the provisions above, a recipient may use your version of this file under - * the terms of any one of the MPL, the GPL or the LGPL. - * - * ***** END LICENSE BLOCK ***** */ -#ifndef nsHTMLAtoms_h___ -#define nsHTMLAtoms_h___ - -#include "nsGkAtoms.h" - -#endif /* nsHTMLAtoms_h___ */ diff --git a/mozilla/content/html/content/src/nsHTMLBodyElement.cpp b/mozilla/content/html/content/src/nsHTMLBodyElement.cpp index 52746e0a39a..029856fcd2e 100644 --- a/mozilla/content/html/content/src/nsHTMLBodyElement.cpp +++ b/mozilla/content/html/content/src/nsHTMLBodyElement.cpp @@ -40,7 +40,7 @@ #include "nsIDOMHTMLBodyElement.h" #include "nsIDOMEventReceiver.h" #include "nsGenericHTMLElement.h" -#include "nsLayoutAtoms.h" +#include "nsGkAtoms.h" #include "nsStyleConsts.h" #include "nsPresContext.h" #include "nsIPresShell.h" diff --git a/mozilla/content/html/content/src/nsHTMLDelElement.cpp b/mozilla/content/html/content/src/nsHTMLDelElement.cpp index 441ce507802..bc8ad02c7a9 100644 --- a/mozilla/content/html/content/src/nsHTMLDelElement.cpp +++ b/mozilla/content/html/content/src/nsHTMLDelElement.cpp @@ -37,7 +37,7 @@ #include "nsIDOMHTMLModElement.h" #include "nsIDOMEventReceiver.h" #include "nsGenericHTMLElement.h" -#include "nsHTMLAtoms.h" +#include "nsGkAtoms.h" #include "nsStyleConsts.h" #include "nsPresContext.h" diff --git a/mozilla/content/html/content/src/nsHTMLFieldSetElement.cpp b/mozilla/content/html/content/src/nsHTMLFieldSetElement.cpp index fb02ccc3263..90ef721de9a 100644 --- a/mozilla/content/html/content/src/nsHTMLFieldSetElement.cpp +++ b/mozilla/content/html/content/src/nsHTMLFieldSetElement.cpp @@ -38,7 +38,6 @@ #include "nsIDOMHTMLFormElement.h" #include "nsIDOMEventReceiver.h" #include "nsGenericHTMLElement.h" -#include "nsHTMLAtoms.h" #include "nsStyleConsts.h" #include "nsPresContext.h" #include "nsIForm.h" diff --git a/mozilla/content/html/content/src/nsHTMLHeadElement.cpp b/mozilla/content/html/content/src/nsHTMLHeadElement.cpp index c8007edc7d9..94c2d746ad6 100644 --- a/mozilla/content/html/content/src/nsHTMLHeadElement.cpp +++ b/mozilla/content/html/content/src/nsHTMLHeadElement.cpp @@ -37,7 +37,7 @@ #include "nsIDOMHTMLHeadElement.h" #include "nsIDOMEventReceiver.h" #include "nsGenericHTMLElement.h" -#include "nsHTMLAtoms.h" +#include "nsGkAtoms.h" #include "nsStyleConsts.h" #include "nsPresContext.h" diff --git a/mozilla/content/html/content/src/nsHTMLHtmlElement.cpp b/mozilla/content/html/content/src/nsHTMLHtmlElement.cpp index a22379f99a5..89d9f81e58a 100644 --- a/mozilla/content/html/content/src/nsHTMLHtmlElement.cpp +++ b/mozilla/content/html/content/src/nsHTMLHtmlElement.cpp @@ -37,7 +37,7 @@ #include "nsIDOMHTMLHtmlElement.h" #include "nsIDOMEventReceiver.h" #include "nsGenericHTMLElement.h" -#include "nsHTMLAtoms.h" +#include "nsGkAtoms.h" #include "nsStyleConsts.h" #include "nsPresContext.h" #include "nsIDocument.h" diff --git a/mozilla/content/html/content/src/nsHTMLImageElement.cpp b/mozilla/content/html/content/src/nsHTMLImageElement.cpp index 32ee3ee0a68..e9fb50e4255 100644 --- a/mozilla/content/html/content/src/nsHTMLImageElement.cpp +++ b/mozilla/content/html/content/src/nsHTMLImageElement.cpp @@ -39,7 +39,7 @@ #include "nsIDOMEventReceiver.h" #include "nsGenericHTMLElement.h" #include "nsImageLoadingContent.h" -#include "nsLayoutAtoms.h" +#include "nsGkAtoms.h" #include "nsStyleConsts.h" #include "nsPresContext.h" #include "nsIPresShell.h" diff --git a/mozilla/content/html/content/src/nsHTMLMetaElement.cpp b/mozilla/content/html/content/src/nsHTMLMetaElement.cpp index 21261840b0b..1217c1d2f3f 100644 --- a/mozilla/content/html/content/src/nsHTMLMetaElement.cpp +++ b/mozilla/content/html/content/src/nsHTMLMetaElement.cpp @@ -37,7 +37,7 @@ #include "nsIDOMHTMLMetaElement.h" #include "nsIDOMEventReceiver.h" #include "nsGenericHTMLElement.h" -#include "nsHTMLAtoms.h" +#include "nsGkAtoms.h" #include "nsStyleConsts.h" #include "nsPresContext.h" diff --git a/mozilla/content/html/content/src/nsHTMLObjectElement.cpp b/mozilla/content/html/content/src/nsHTMLObjectElement.cpp index 40c75bbb398..668fda88f02 100644 --- a/mozilla/content/html/content/src/nsHTMLObjectElement.cpp +++ b/mozilla/content/html/content/src/nsHTMLObjectElement.cpp @@ -38,7 +38,7 @@ #include "nsGenericHTMLElement.h" #include "nsObjectLoadingContent.h" -#include "nsHTMLAtoms.h" +#include "nsGkAtoms.h" #include "nsDOMError.h" #include "nsIDocument.h" #include "nsIDOMDocument.h" diff --git a/mozilla/content/html/content/src/nsHTMLOptionElement.cpp b/mozilla/content/html/content/src/nsHTMLOptionElement.cpp index 48dfd62232c..936fd738f0e 100644 --- a/mozilla/content/html/content/src/nsHTMLOptionElement.cpp +++ b/mozilla/content/html/content/src/nsHTMLOptionElement.cpp @@ -43,7 +43,7 @@ #include "nsIDOMHTMLFormElement.h" #include "nsIDOMEventReceiver.h" #include "nsGenericHTMLElement.h" -#include "nsLayoutAtoms.h" +#include "nsGkAtoms.h" #include "nsStyleConsts.h" #include "nsPresContext.h" #include "nsIFormControl.h" diff --git a/mozilla/content/html/content/src/nsHTMLSharedObjectElement.cpp b/mozilla/content/html/content/src/nsHTMLSharedObjectElement.cpp index c4894146965..298bff98172 100644 --- a/mozilla/content/html/content/src/nsHTMLSharedObjectElement.cpp +++ b/mozilla/content/html/content/src/nsHTMLSharedObjectElement.cpp @@ -38,7 +38,7 @@ #include "nsGenericHTMLElement.h" #include "nsObjectLoadingContent.h" -#include "nsHTMLAtoms.h" +#include "nsGkAtoms.h" #include "nsDOMError.h" #include "nsIDocument.h" #include "nsIDOMDocument.h" diff --git a/mozilla/content/html/content/src/nsHTMLTitleElement.cpp b/mozilla/content/html/content/src/nsHTMLTitleElement.cpp index 947c15caf50..0b043c6e0ea 100644 --- a/mozilla/content/html/content/src/nsHTMLTitleElement.cpp +++ b/mozilla/content/html/content/src/nsHTMLTitleElement.cpp @@ -37,7 +37,6 @@ #include "nsIDOMHTMLTitleElement.h" #include "nsIDOMEventReceiver.h" #include "nsGenericHTMLElement.h" -#include "nsHTMLAtoms.h" #include "nsStyleConsts.h" #include "nsPresContext.h" #include "nsIDOMText.h" diff --git a/mozilla/content/html/document/src/nsHTMLDocument.cpp b/mozilla/content/html/document/src/nsHTMLDocument.cpp index 70e02712021..919da383cfd 100644 --- a/mozilla/content/html/document/src/nsHTMLDocument.cpp +++ b/mozilla/content/html/document/src/nsHTMLDocument.cpp @@ -50,7 +50,7 @@ #include "nsIXMLContentSink.h" #include "nsHTMLParts.h" #include "nsHTMLStyleSheet.h" -#include "nsLayoutAtoms.h" +#include "nsGkAtoms.h" #include "nsIPresShell.h" #include "nsPresContext.h" #include "nsIDOMNode.h" // for Find diff --git a/mozilla/content/svg/content/src/nsSVGElement.cpp b/mozilla/content/svg/content/src/nsSVGElement.cpp index 208db7fb097..ca234d4c364 100644 --- a/mozilla/content/svg/content/src/nsSVGElement.cpp +++ b/mozilla/content/svg/content/src/nsSVGElement.cpp @@ -52,7 +52,7 @@ #include "nsIDOMCSSStyleDeclaration.h" #include "nsIServiceManager.h" #include "nsIXBLService.h" -#include "nsLayoutAtoms.h" +#include "nsGkAtoms.h" #include "nsICSSStyleRule.h" #include "nsISVGSVGElement.h" #include "nsRuleWalker.h" diff --git a/mozilla/content/xbl/src/Makefile.in b/mozilla/content/xbl/src/Makefile.in index f78c4a4e91e..22d649c61e0 100644 --- a/mozilla/content/xbl/src/Makefile.in +++ b/mozilla/content/xbl/src/Makefile.in @@ -69,10 +69,6 @@ REQUIRES = xpcom \ locale \ $(NULL) -EXPORTS = \ - nsXBLAtoms.h \ - $(NULL) - CPPSRCS = \ nsXBLBinding.cpp \ nsXBLPrototypeBinding.cpp \ diff --git a/mozilla/content/xbl/src/nsBindingManager.cpp b/mozilla/content/xbl/src/nsBindingManager.cpp index ea45107c646..34730b999ff 100644 --- a/mozilla/content/xbl/src/nsBindingManager.cpp +++ b/mozilla/content/xbl/src/nsBindingManager.cpp @@ -57,7 +57,6 @@ #include "nsIXMLContentSink.h" #include "nsContentCID.h" #include "nsXMLDocument.h" -#include "nsHTMLAtoms.h" #include "nsIStreamListener.h" #include "nsGenericDOMNodeList.h" diff --git a/mozilla/content/xbl/src/nsXBLAtoms.h b/mozilla/content/xbl/src/nsXBLAtoms.h deleted file mode 100644 index e26d0033028..00000000000 --- a/mozilla/content/xbl/src/nsXBLAtoms.h +++ /dev/null @@ -1,44 +0,0 @@ -/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */ -/* ***** BEGIN LICENSE BLOCK ***** - * Version: MPL 1.1/GPL 2.0/LGPL 2.1 - * - * The contents of this file are subject to the Mozilla Public License Version - * 1.1 (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * http://www.mozilla.org/MPL/ - * - * Software distributed under the License is distributed on an "AS IS" basis, - * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License - * for the specific language governing rights and limitations under the - * License. - * - * The Original Code is mozilla.org code. - * - * The Initial Developer of the Original Code is - * Netscape Communications Corporation. - * Portions created by the Initial Developer are Copyright (C) 1998 - * the Initial Developer. All Rights Reserved. - * - * Contributor(s): - * Original Author: David W. Hyatt (hyatt@netscape.com) - * - * Alternatively, the contents of this file may be used under the terms of - * either of the GNU General Public License Version 2 or later (the "GPL"), - * or the GNU Lesser General Public License Version 2.1 or later (the "LGPL"), - * in which case the provisions of the GPL or the LGPL are applicable instead - * of those above. If you wish to allow use of your version of this file only - * under the terms of either the GPL or the LGPL, and not to allow others to - * use your version of this file under the terms of the MPL, indicate your - * decision by deleting the provisions above and replace them with the notice - * and other provisions required by the GPL or the LGPL. If you do not delete - * the provisions above, a recipient may use your version of this file under - * the terms of any one of the MPL, the GPL or the LGPL. - * - * ***** END LICENSE BLOCK ***** */ -#ifndef nsXBLAtoms_h___ -#define nsXBLAtoms_h___ - -#include "nsGkAtoms.h" -typedef class nsGkAtoms nsXBLAtoms; - -#endif /* nsXBLAtoms_h___ */ diff --git a/mozilla/content/xbl/src/nsXBLContentSink.cpp b/mozilla/content/xbl/src/nsXBLContentSink.cpp index 1a463b6602d..f358ef6b147 100644 --- a/mozilla/content/xbl/src/nsXBLContentSink.cpp +++ b/mozilla/content/xbl/src/nsXBLContentSink.cpp @@ -41,7 +41,7 @@ #include "nsIBindingManager.h" #include "nsIDOMNode.h" #include "nsIParser.h" -#include "nsLayoutAtoms.h" +#include "nsGkAtoms.h" #include "nsINameSpaceManager.h" #include "nsHTMLTokens.h" #include "nsIURI.h" diff --git a/mozilla/content/xbl/src/nsXBLEventHandler.cpp b/mozilla/content/xbl/src/nsXBLEventHandler.cpp index 17c296f9f49..745c7c9c84a 100644 --- a/mozilla/content/xbl/src/nsXBLEventHandler.cpp +++ b/mozilla/content/xbl/src/nsXBLEventHandler.cpp @@ -45,7 +45,7 @@ #include "nsIDOMMouseEvent.h" #include "nsIDOMText.h" #include "nsIDOM3EventTarget.h" -#include "nsXBLAtoms.h" +#include "nsGkAtoms.h" #include "nsXBLPrototypeHandler.h" #include "nsIDOMNSEvent.h" @@ -162,19 +162,19 @@ NS_NewXBLEventHandler(nsXBLPrototypeHandler* aHandler, nsIAtom* aEventType, nsXBLEventHandler** aResult) { - if (aEventType == nsXBLAtoms::mousedown || - aEventType == nsXBLAtoms::mouseup || - aEventType == nsXBLAtoms::click || - aEventType == nsXBLAtoms::dblclick || - aEventType == nsXBLAtoms::mouseover || - aEventType == nsXBLAtoms::mouseout || - aEventType == nsXBLAtoms::mousemove || - aEventType == nsXBLAtoms::contextmenu || - aEventType == nsXBLAtoms::dragenter || - aEventType == nsXBLAtoms::dragover || - aEventType == nsXBLAtoms::dragdrop || - aEventType == nsXBLAtoms::dragexit || - aEventType == nsXBLAtoms::draggesture) { + if (aEventType == nsGkAtoms::mousedown || + aEventType == nsGkAtoms::mouseup || + aEventType == nsGkAtoms::click || + aEventType == nsGkAtoms::dblclick || + aEventType == nsGkAtoms::mouseover || + aEventType == nsGkAtoms::mouseout || + aEventType == nsGkAtoms::mousemove || + aEventType == nsGkAtoms::contextmenu || + aEventType == nsGkAtoms::dragenter || + aEventType == nsGkAtoms::dragover || + aEventType == nsGkAtoms::dragdrop || + aEventType == nsGkAtoms::dragexit || + aEventType == nsGkAtoms::draggesture) { *aResult = new nsXBLMouseEventHandler(aHandler); } else { diff --git a/mozilla/content/xbl/src/nsXBLPrototypeHandler.cpp b/mozilla/content/xbl/src/nsXBLPrototypeHandler.cpp index 2fe204a6f89..5fc3e51424a 100644 --- a/mozilla/content/xbl/src/nsXBLPrototypeHandler.cpp +++ b/mozilla/content/xbl/src/nsXBLPrototypeHandler.cpp @@ -72,7 +72,7 @@ #include "nsIScriptError.h" #include "nsXPIDLString.h" #include "nsReadableUtils.h" -#include "nsLayoutAtoms.h" +#include "nsGkAtoms.h" #include "nsGUIEvent.h" #include "nsIXPConnect.h" #include "nsIDOMScriptObjectFactory.h" diff --git a/mozilla/content/xbl/src/nsXBLResourceLoader.cpp b/mozilla/content/xbl/src/nsXBLResourceLoader.cpp index fccb4d842c6..33812e5e27d 100644 --- a/mozilla/content/xbl/src/nsXBLResourceLoader.cpp +++ b/mozilla/content/xbl/src/nsXBLResourceLoader.cpp @@ -52,7 +52,7 @@ #include "nsIXBLDocumentInfo.h" #include "nsIURI.h" #include "nsNetUtil.h" -#include "nsXBLAtoms.h" +#include "nsGkAtoms.h" #include "nsFrameManager.h" #include "nsStyleContext.h" #include "nsXBLPrototypeBinding.h" @@ -109,7 +109,7 @@ nsXBLResourceLoader::LoadResources(PRBool* aResult) doc->GetDocumentCharacterSet().get(), docURL))) continue; - if (curr->mType == nsXBLAtoms::image) { + if (curr->mType == nsGkAtoms::image) { if (!nsContentUtils::CanLoadImage(url, doc, doc)) { // We're not permitted to load this image, move on... continue; @@ -123,7 +123,7 @@ nsXBLResourceLoader::LoadResources(PRBool* aResult) nsIRequest::LOAD_BACKGROUND, getter_AddRefs(req)); } - else if (curr->mType == nsXBLAtoms::stylesheet) { + else if (curr->mType == nsGkAtoms::stylesheet) { // Kick off the load of the stylesheet. // Always load chrome synchronously diff --git a/mozilla/content/xbl/src/nsXBLWindowKeyHandler.cpp b/mozilla/content/xbl/src/nsXBLWindowKeyHandler.cpp index e2c7b4de423..d6eb432f92e 100644 --- a/mozilla/content/xbl/src/nsXBLWindowKeyHandler.cpp +++ b/mozilla/content/xbl/src/nsXBLWindowKeyHandler.cpp @@ -40,7 +40,6 @@ #include "nsCOMPtr.h" #include "nsXBLPrototypeHandler.h" #include "nsXBLWindowKeyHandler.h" -#include "nsXBLAtoms.h" #include "nsIContent.h" #include "nsIAtom.h" #include "nsIDOMNSUIEvent.h" @@ -49,10 +48,9 @@ #include "nsIDOMNSEvent.h" #include "nsXBLService.h" #include "nsIServiceManager.h" -#include "nsHTMLAtoms.h" +#include "nsGkAtoms.h" #include "nsIXBLDocumentInfo.h" #include "nsIDOMElement.h" -#include "nsXBLAtoms.h" #include "nsINativeKeyBindings.h" #include "nsIController.h" #include "nsIControllers.h" @@ -72,7 +70,6 @@ #include "nsIPresShell.h" #include "nsIPrivateDOMEvent.h" #include "nsISelectionController.h" -#include "nsXULAtoms.h" static nsINativeKeyBindings *sNativeEditorBindings = nsnull; @@ -215,7 +212,7 @@ BuildHandlerChain(nsIContent* aContent, nsXBLPrototypeHandler** aResult) for (PRUint32 j = aContent->GetChildCount(); j--; ) { nsIContent *key = aContent->GetChildAt(j); - if (key->NodeInfo()->Equals(nsXBLAtoms::key, kNameSpaceID_XUL)) { + if (key->NodeInfo()->Equals(nsGkAtoms::key, kNameSpaceID_XUL)) { nsXBLPrototypeHandler* handler = new nsXBLPrototypeHandler(key); if (!handler) @@ -368,11 +365,11 @@ nsXBLWindowKeyHandler::WalkHandlers(nsIDOMEvent* aKeyEvent, nsIAtom* aEventType) } PRBool handled; - if (aEventType == nsXBLAtoms::keypress) { + if (aEventType == nsGkAtoms::keypress) { keyEvent->GetCharCode(&nativeEvent.charCode); handled = sNativeEditorBindings->KeyPress(nativeEvent, DoCommandCallback, controllers); - } else if (aEventType == nsXBLAtoms::keyup) { + } else if (aEventType == nsGkAtoms::keyup) { handled = sNativeEditorBindings->KeyUp(nativeEvent, DoCommandCallback, controllers); } else { @@ -390,17 +387,17 @@ nsXBLWindowKeyHandler::WalkHandlers(nsIDOMEvent* aKeyEvent, nsIAtom* aEventType) nsresult nsXBLWindowKeyHandler::KeyUp(nsIDOMEvent* aKeyEvent) { - return WalkHandlers(aKeyEvent, nsXBLAtoms::keyup); + return WalkHandlers(aKeyEvent, nsGkAtoms::keyup); } nsresult nsXBLWindowKeyHandler::KeyDown(nsIDOMEvent* aKeyEvent) { - return WalkHandlers(aKeyEvent, nsXBLAtoms::keydown); + return WalkHandlers(aKeyEvent, nsGkAtoms::keydown); } nsresult nsXBLWindowKeyHandler::KeyPress(nsIDOMEvent* aKeyEvent) { - return WalkHandlers(aKeyEvent, nsXBLAtoms::keypress); + return WalkHandlers(aKeyEvent, nsGkAtoms::keypress); } diff --git a/mozilla/content/xml/content/src/nsXMLCDATASection.cpp b/mozilla/content/xml/content/src/nsXMLCDATASection.cpp index 3b135f01344..8a4eb89fdbd 100644 --- a/mozilla/content/xml/content/src/nsXMLCDATASection.cpp +++ b/mozilla/content/xml/content/src/nsXMLCDATASection.cpp @@ -37,7 +37,7 @@ #include "nsIDOMCDATASection.h" #include "nsGenericDOMDataNode.h" -#include "nsLayoutAtoms.h" +#include "nsGkAtoms.h" #include "nsIDocument.h" #include "nsContentUtils.h" diff --git a/mozilla/content/xml/content/src/nsXMLProcessingInstruction.cpp b/mozilla/content/xml/content/src/nsXMLProcessingInstruction.cpp index ef72d0ea4fd..04a7ac7489f 100644 --- a/mozilla/content/xml/content/src/nsXMLProcessingInstruction.cpp +++ b/mozilla/content/xml/content/src/nsXMLProcessingInstruction.cpp @@ -36,7 +36,7 @@ * ***** END LICENSE BLOCK ***** */ #include "nsGenericElement.h" -#include "nsLayoutAtoms.h" +#include "nsGkAtoms.h" #include "nsUnicharUtils.h" #include "nsXMLProcessingInstruction.h" #include "nsParserUtils.h" diff --git a/mozilla/content/xml/content/src/nsXMLStylesheetPI.cpp b/mozilla/content/xml/content/src/nsXMLStylesheetPI.cpp index 14ea7b00e43..9458fd1b095 100644 --- a/mozilla/content/xml/content/src/nsXMLStylesheetPI.cpp +++ b/mozilla/content/xml/content/src/nsXMLStylesheetPI.cpp @@ -46,7 +46,7 @@ #include "nsXMLProcessingInstruction.h" #include "nsUnicharUtils.h" #include "nsParserUtils.h" -#include "nsLayoutAtoms.h" +#include "nsGkAtoms.h" class nsXMLStylesheetPI : public nsXMLProcessingInstruction, public nsStyleLinkElement diff --git a/mozilla/content/xml/document/src/nsXMLContentSink.cpp b/mozilla/content/xml/document/src/nsXMLContentSink.cpp index f2a2cefcaac..c57847da4c6 100644 --- a/mozilla/content/xml/document/src/nsXMLContentSink.cpp +++ b/mozilla/content/xml/document/src/nsXMLContentSink.cpp @@ -62,7 +62,7 @@ #include "nsCRT.h" #include "nsICSSLoader.h" #include "nsICSSStyleSheet.h" -#include "nsLayoutAtoms.h" +#include "nsGkAtoms.h" #include "nsContentUtils.h" #include "nsIScriptContext.h" #include "nsINameSpaceManager.h" diff --git a/mozilla/content/xtf/src/nsXTFElementWrapper.cpp b/mozilla/content/xtf/src/nsXTFElementWrapper.cpp index 6096e6bc123..dea6f9dab8c 100644 --- a/mozilla/content/xtf/src/nsXTFElementWrapper.cpp +++ b/mozilla/content/xtf/src/nsXTFElementWrapper.cpp @@ -45,7 +45,7 @@ #include "nsPIDOMWindow.h" #include "nsIInterfaceRequestorUtils.h" #include "nsIDocument.h" -#include "nsLayoutAtoms.h" // XXX only needed for nsGkAtoms::id +#include "nsGkAtoms.h" #include "nsIEventListenerManager.h" #include "nsIDOMEvent.h" #include "nsGUIEvent.h" diff --git a/mozilla/content/xul/content/src/Makefile.in b/mozilla/content/xul/content/src/Makefile.in index dcc1dc7c8bf..8b21de9ef0a 100644 --- a/mozilla/content/xul/content/src/Makefile.in +++ b/mozilla/content/xul/content/src/Makefile.in @@ -72,10 +72,6 @@ REQUIRES = xpcom \ htmlparser \ $(NULL) -EXPORTS = \ - nsXULAtoms.h \ - $(NULL) - ifdef MOZ_XUL CPPSRCS += \ nsXULElement.cpp \ diff --git a/mozilla/content/xul/content/src/nsXULAtoms.h b/mozilla/content/xul/content/src/nsXULAtoms.h deleted file mode 100644 index c26c63ca4a6..00000000000 --- a/mozilla/content/xul/content/src/nsXULAtoms.h +++ /dev/null @@ -1,43 +0,0 @@ -/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */ -/* ***** BEGIN LICENSE BLOCK ***** - * Version: MPL 1.1/GPL 2.0/LGPL 2.1 - * - * The contents of this file are subject to the Mozilla Public License Version - * 1.1 (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * http://www.mozilla.org/MPL/ - * - * Software distributed under the License is distributed on an "AS IS" basis, - * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License - * for the specific language governing rights and limitations under the - * License. - * - * The Original Code is mozilla.org code. - * - * The Initial Developer of the Original Code is - * Netscape Communications Corporation. - * Portions created by the Initial Developer are Copyright (C) 1998 - * the Initial Developer. All Rights Reserved. - * - * Contributor(s): - * Original Author: David W. Hyatt (hyatt@netscape.com) - * - * Alternatively, the contents of this file may be used under the terms of - * either of the GNU General Public License Version 2 or later (the "GPL"), - * or the GNU Lesser General Public License Version 2.1 or later (the "LGPL"), - * in which case the provisions of the GPL or the LGPL are applicable instead - * of those above. If you wish to allow use of your version of this file only - * under the terms of either the GPL or the LGPL, and not to allow others to - * use your version of this file under the terms of the MPL, indicate your - * decision by deleting the provisions above and replace them with the notice - * and other provisions required by the GPL or the LGPL. If you do not delete - * the provisions above, a recipient may use your version of this file under - * the terms of any one of the MPL, the GPL or the LGPL. - * - * ***** END LICENSE BLOCK ***** */ -#ifndef nsXULAtoms_h___ -#define nsXULAtoms_h___ - -#include "nsGkAtoms.h" - -#endif /* nsXULAtoms_h___ */ diff --git a/mozilla/content/xul/content/src/nsXULElement.cpp b/mozilla/content/xul/content/src/nsXULElement.cpp index f29d1cc1972..1d42d8d07aa 100644 --- a/mozilla/content/xul/content/src/nsXULElement.cpp +++ b/mozilla/content/xul/content/src/nsXULElement.cpp @@ -134,7 +134,7 @@ #include "nsDOMAttributeMap.h" #include "nsDOMCSSDeclaration.h" #include "nsGenericHTMLElement.h" -#include "nsLayoutAtoms.h" +#include "nsGkAtoms.h" #include "nsXULContentUtils.h" #include "nsNodeUtils.h" diff --git a/mozilla/content/xul/document/src/nsXULContentSink.cpp b/mozilla/content/xul/document/src/nsXULContentSink.cpp index 602bc0952d4..48d504a2b9b 100644 --- a/mozilla/content/xul/document/src/nsXULContentSink.cpp +++ b/mozilla/content/xul/document/src/nsXULContentSink.cpp @@ -95,7 +95,7 @@ #include "nsIExpatSink.h" #include "nsUnicharUtils.h" -#include "nsLayoutAtoms.h" +#include "nsGkAtoms.h" #include "nsNodeInfoManager.h" #include "nsContentUtils.h" #include "nsAttrName.h" diff --git a/mozilla/content/xul/templates/src/nsXULContentBuilder.cpp b/mozilla/content/xul/templates/src/nsXULContentBuilder.cpp index 179d9f3ecf6..971e6ab00fd 100644 --- a/mozilla/content/xul/templates/src/nsXULContentBuilder.cpp +++ b/mozilla/content/xul/templates/src/nsXULContentBuilder.cpp @@ -56,7 +56,7 @@ #include "nsTemplateMap.h" #include "nsVoidArray.h" #include "nsXPIDLString.h" -#include "nsLayoutAtoms.h" +#include "nsGkAtoms.h" #include "nsXULContentUtils.h" #include "nsXULElement.h" #include "nsXULTemplateBuilder.h" diff --git a/mozilla/extensions/spatialnavigation/src/nsSpatialNavigationPrivate.h b/mozilla/extensions/spatialnavigation/src/nsSpatialNavigationPrivate.h index 28ed1d40048..fa86921d61c 100755 --- a/mozilla/extensions/spatialnavigation/src/nsSpatialNavigationPrivate.h +++ b/mozilla/extensions/spatialnavigation/src/nsSpatialNavigationPrivate.h @@ -49,7 +49,6 @@ #include "nsDirectoryServiceDefs.h" #include "nsDirectoryServiceUtils.h" #include "nsFrameTraversal.h" -#include "nsHTMLAtoms.h" #include "nsIArray.h" #include "nsIBaseWindow.h" #include "nsICategoryManager.h" @@ -118,7 +117,6 @@ #include "nsIWebBrowser.h" #include "nsIWebBrowserChrome.h" #include "nsIWindowWatcher.h" -#include "nsLayoutAtoms.h" #include "nsLayoutCID.h" #include "nsPIDOMWindow.h" #include "nsStyleContext.h" diff --git a/mozilla/extensions/typeaheadfind/src/nsTypeAheadFind.cpp b/mozilla/extensions/typeaheadfind/src/nsTypeAheadFind.cpp index ddf471d6950..988773faaa6 100644 --- a/mozilla/extensions/typeaheadfind/src/nsTypeAheadFind.cpp +++ b/mozilla/extensions/typeaheadfind/src/nsTypeAheadFind.cpp @@ -94,7 +94,6 @@ #include "nsINameSpaceManager.h" #include "nsIWindowWatcher.h" #include "nsIObserverService.h" -#include "nsLayoutAtoms.h" #include "nsIPrivateTextEvent.h" #include "nsIPrivateCompositionEvent.h" diff --git a/mozilla/layout/base/Makefile.in b/mozilla/layout/base/Makefile.in index 5108580cbd3..8a9a9515b91 100644 --- a/mozilla/layout/base/Makefile.in +++ b/mozilla/layout/base/Makefile.in @@ -111,7 +111,6 @@ EXPORTS = \ nsIPercentHeightObserver.h \ nsIPresShell.h \ nsIReflowCallback.h \ - nsLayoutAtoms.h \ nsLayoutErrors.h \ nsLayoutUtils.h \ nsPresContext.h \ diff --git a/mozilla/layout/base/nsBidiPresUtils.cpp b/mozilla/layout/base/nsBidiPresUtils.cpp index c22fcc0a29e..e9262fced84 100644 --- a/mozilla/layout/base/nsBidiPresUtils.cpp +++ b/mozilla/layout/base/nsBidiPresUtils.cpp @@ -41,7 +41,7 @@ #include "nsBidiPresUtils.h" #include "nsTextFragment.h" -#include "nsLayoutAtoms.h" +#include "nsGkAtoms.h" #include "nsPresContext.h" #include "nsIRenderingContext.h" #include "nsIServiceManager.h" diff --git a/mozilla/layout/base/nsCSSFrameConstructor.cpp b/mozilla/layout/base/nsCSSFrameConstructor.cpp index 9d353614849..b9b1599e2dc 100644 --- a/mozilla/layout/base/nsCSSFrameConstructor.cpp +++ b/mozilla/layout/base/nsCSSFrameConstructor.cpp @@ -52,7 +52,7 @@ #include "nsIHTMLDocument.h" #include "nsIStyleRule.h" #include "nsIFrame.h" -#include "nsLayoutAtoms.h" +#include "nsGkAtoms.h" #include "nsPresContext.h" #include "nsILinkHandler.h" #include "nsIDocument.h" diff --git a/mozilla/layout/base/nsCSSRendering.cpp b/mozilla/layout/base/nsCSSRendering.cpp index be3ba13441e..41d043945cd 100644 --- a/mozilla/layout/base/nsCSSRendering.cpp +++ b/mozilla/layout/base/nsCSSRendering.cpp @@ -52,7 +52,7 @@ #include "nsFrameManager.h" #include "nsStyleContext.h" #include "nsIScrollableView.h" -#include "nsLayoutAtoms.h" +#include "nsGkAtoms.h" #include "nsIDrawingSurface.h" #include "nsTransform2D.h" #include "nsIDeviceContext.h" diff --git a/mozilla/layout/base/nsCaret.cpp b/mozilla/layout/base/nsCaret.cpp index 5d24a05d176..48b7955c26f 100644 --- a/mozilla/layout/base/nsCaret.cpp +++ b/mozilla/layout/base/nsCaret.cpp @@ -74,7 +74,6 @@ static const PRUint32 kMinBidiIndicatorPixels = 2; #ifdef IBMBIDI -#include "nsLayoutAtoms.h" #include "nsIBidiKeyboard.h" #include "nsContentUtils.h" #endif //IBMBIDI diff --git a/mozilla/layout/base/nsDocumentViewer.cpp b/mozilla/layout/base/nsDocumentViewer.cpp index 4dc395306f5..78896ef1c6a 100644 --- a/mozilla/layout/base/nsDocumentViewer.cpp +++ b/mozilla/layout/base/nsDocumentViewer.cpp @@ -100,7 +100,6 @@ #include "nsIBaseWindow.h" #include "nsIFrameDebug.h" #include "nsILayoutHistoryState.h" -#include "nsLayoutAtoms.h" #include "nsIParser.h" #include "nsGUIEvent.h" #include "nsHTMLReflowState.h" @@ -145,7 +144,6 @@ #include "nsIPrintSettingsService.h" #include "nsIPrintOptions.h" #include "nsIServiceManager.h" -#include "nsHTMLAtoms.h" // XXX until atoms get factored into nsLayoutAtoms #include "nsISimpleEnumerator.h" #include "nsXPCOM.h" #include "nsISupportsPrimitives.h" @@ -176,7 +174,6 @@ static const char sPrintOptionsContractID[] = "@mozilla.org/gfx/printset // FrameSet #include "nsIDocument.h" -#include "nsHTMLAtoms.h" //focus #include "nsIDOMEventReceiver.h" diff --git a/mozilla/layout/base/nsFrameManager.cpp b/mozilla/layout/base/nsFrameManager.cpp index b20f4f49963..aa86ed74961 100644 --- a/mozilla/layout/base/nsFrameManager.cpp +++ b/mozilla/layout/base/nsFrameManager.cpp @@ -59,7 +59,7 @@ #include "prthread.h" #include "plhash.h" #include "nsPlaceholderFrame.h" -#include "nsLayoutAtoms.h" +#include "nsGkAtoms.h" #include "nsCSSAnonBoxes.h" #include "nsCSSPseudoElements.h" #ifdef NS_DEBUG diff --git a/mozilla/layout/base/nsFrameTraversal.cpp b/mozilla/layout/base/nsFrameTraversal.cpp index 4760d5167cc..28bcc265801 100644 --- a/mozilla/layout/base/nsFrameTraversal.cpp +++ b/mozilla/layout/base/nsFrameTraversal.cpp @@ -35,7 +35,7 @@ * * ***** END LICENSE BLOCK ***** */ #include "nsCOMPtr.h" -#include "nsLayoutAtoms.h" +#include "nsGkAtoms.h" #include "nsFrameTraversal.h" #include "nsFrameList.h" diff --git a/mozilla/layout/base/nsImageLoader.cpp b/mozilla/layout/base/nsImageLoader.cpp index 62c5ac2c4b6..659e3631004 100644 --- a/mozilla/layout/base/nsImageLoader.cpp +++ b/mozilla/layout/base/nsImageLoader.cpp @@ -58,7 +58,7 @@ #include "nsIViewManager.h" #include "nsStyleContext.h" -#include "nsLayoutAtoms.h" +#include "nsGkAtoms.h" // Paint forcing #include "prenv.h" diff --git a/mozilla/layout/base/nsLayoutAtoms.h b/mozilla/layout/base/nsLayoutAtoms.h deleted file mode 100644 index 39d83db7b50..00000000000 --- a/mozilla/layout/base/nsLayoutAtoms.h +++ /dev/null @@ -1,50 +0,0 @@ -/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */ -/* ***** BEGIN LICENSE BLOCK ***** - * Version: MPL 1.1/GPL 2.0/LGPL 2.1 - * - * The contents of this file are subject to the Mozilla Public License Version - * 1.1 (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * http://www.mozilla.org/MPL/ - * - * Software distributed under the License is distributed on an "AS IS" basis, - * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License - * for the specific language governing rights and limitations under the - * License. - * - * The Original Code is mozilla.org code. - * - * The Initial Developer of the Original Code is - * Netscape Communications Corporation. - * Portions created by the Initial Developer are Copyright (C) 1998 - * the Initial Developer. All Rights Reserved. - * - * Contributor(s): - * - * Alternatively, the contents of this file may be used under the terms of - * either of the GNU General Public License Version 2 or later (the "GPL"), - * or the GNU Lesser General Public License Version 2.1 or later (the "LGPL"), - * in which case the provisions of the GPL or the LGPL are applicable instead - * of those above. If you wish to allow use of your version of this file only - * under the terms of either the GPL or the LGPL, and not to allow others to - * use your version of this file under the terms of the MPL, indicate your - * decision by deleting the provisions above and replace them with the notice - * and other provisions required by the GPL or the LGPL. If you do not delete - * the provisions above, a recipient may use your version of this file under - * the terms of any one of the MPL, the GPL or the LGPL. - * - * ***** END LICENSE BLOCK ***** */ - -/* atom list */ - -#ifndef nsLayoutAtoms_h___ -#define nsLayoutAtoms_h___ - -#include "nsGkAtoms.h" - -static inline PRBool IS_TABLE_CELL(nsIAtom* frameType) { - return nsGkAtoms::tableCellFrame == frameType || - nsGkAtoms::bcTableCellFrame == frameType; -} - -#endif /* nsLayoutAtoms_h___ */ diff --git a/mozilla/layout/base/nsLayoutUtils.cpp b/mozilla/layout/base/nsLayoutUtils.cpp index 90c2764aebf..1e48954397e 100644 --- a/mozilla/layout/base/nsLayoutUtils.cpp +++ b/mozilla/layout/base/nsLayoutUtils.cpp @@ -44,7 +44,7 @@ #include "nsPresContext.h" #include "nsIContent.h" #include "nsFrameList.h" -#include "nsLayoutAtoms.h" +#include "nsGkAtoms.h" #include "nsIAtom.h" #include "nsCSSPseudoElements.h" #include "nsIView.h" diff --git a/mozilla/layout/base/nsLayoutUtils.h b/mozilla/layout/base/nsLayoutUtils.h index b412d0bc9a6..f9487768c58 100644 --- a/mozilla/layout/base/nsLayoutUtils.h +++ b/mozilla/layout/base/nsLayoutUtils.h @@ -92,7 +92,7 @@ public: * ancestor "Page" frame, if any. * * @param the frame to start at - * @return a frame of type nsLayoutAtoms::pageFrame or nsnull if no + * @return a frame of type nsGkAtoms::pageFrame or nsnull if no * such ancestor exists */ static nsIFrame* GetPageFrame(nsIFrame* aFrame); diff --git a/mozilla/layout/base/nsPresContext.h b/mozilla/layout/base/nsPresContext.h index d16305a6509..0f68f3c370c 100644 --- a/mozilla/layout/base/nsPresContext.h +++ b/mozilla/layout/base/nsPresContext.h @@ -58,7 +58,7 @@ #include "nsCRT.h" #include "nsIPrintSettings.h" #include "nsPropertyTable.h" -#include "nsLayoutAtoms.h" +#include "nsGkAtoms.h" #include "nsIDocument.h" #ifdef IBMBIDI class nsBidiPresUtils; diff --git a/mozilla/layout/base/nsPresShell.cpp b/mozilla/layout/base/nsPresShell.cpp index 10eb31eac2e..a5044b7c7c3 100644 --- a/mozilla/layout/base/nsPresShell.cpp +++ b/mozilla/layout/base/nsPresShell.cpp @@ -90,7 +90,7 @@ #include "nsISelection.h" #include "nsISelectionController.h" #include "nsLayoutCID.h" -#include "nsLayoutAtoms.h" +#include "nsGkAtoms.h" #include "nsIDOMRange.h" #include "nsIDOMDocument.h" #include "nsIDOMNode.h" diff --git a/mozilla/layout/build/nsLayoutModule.cpp b/mozilla/layout/build/nsLayoutModule.cpp index b08601455ea..e7e62d055a1 100644 --- a/mozilla/layout/build/nsLayoutModule.cpp +++ b/mozilla/layout/build/nsLayoutModule.cpp @@ -100,7 +100,6 @@ #ifndef MOZ_CAIRO_GFX #include "nsISelectionImageService.h" #endif -#include "nsXULAtoms.h" #include "nsLayoutCID.h" #include "nsILanguageAtomService.h" #include "nsStyleSheetService.h" diff --git a/mozilla/layout/build/nsLayoutStatics.cpp b/mozilla/layout/build/nsLayoutStatics.cpp index a5342c96d3c..c99c56fab6f 100644 --- a/mozilla/layout/build/nsLayoutStatics.cpp +++ b/mozilla/layout/build/nsLayoutStatics.cpp @@ -61,9 +61,8 @@ #include "nsGenericElement.h" // for nsDOMEventRTTearoff #include "nsGenericHTMLElement.h" #include "nsGlobalWindow.h" -#include "nsHTMLAtoms.h" +#include "nsGkAtoms.h" #include "nsImageFrame.h" -#include "nsLayoutAtoms.h" #include "nsLayoutStylesheetCache.h" #include "nsNodeInfo.h" #include "nsRange.h" @@ -74,7 +73,6 @@ #include "nsStyleSet.h" #include "nsTextControlFrame.h" #include "nsTextTransformer.h" -#include "nsXBLAtoms.h" #include "nsXBLWindowKeyHandler.h" #include "txMozillaXSLTProcessor.h" #include "nsDOMStorage.h" diff --git a/mozilla/layout/forms/nsComboboxControlFrame.cpp b/mozilla/layout/forms/nsComboboxControlFrame.cpp index b3f3ee36529..5e47d71d1d2 100644 --- a/mozilla/layout/forms/nsComboboxControlFrame.cpp +++ b/mozilla/layout/forms/nsComboboxControlFrame.cpp @@ -43,7 +43,7 @@ #include "nsFrameManager.h" #include "nsFormControlFrame.h" #include "nsGfxButtonControlFrame.h" -#include "nsLayoutAtoms.h" +#include "nsGkAtoms.h" #include "nsCSSAnonBoxes.h" #include "nsHTMLParts.h" #include "nsIFormControl.h" diff --git a/mozilla/layout/forms/nsFieldSetFrame.cpp b/mozilla/layout/forms/nsFieldSetFrame.cpp index c4d08d17dc6..6d405777b64 100644 --- a/mozilla/layout/forms/nsFieldSetFrame.cpp +++ b/mozilla/layout/forms/nsFieldSetFrame.cpp @@ -52,7 +52,7 @@ #include "nsPresContext.h" #include "nsFrameManager.h" #include "nsHTMLParts.h" -#include "nsLayoutAtoms.h" +#include "nsGkAtoms.h" #include "nsStyleConsts.h" #include "nsFont.h" #include "nsCOMPtr.h" diff --git a/mozilla/layout/forms/nsGfxButtonControlFrame.cpp b/mozilla/layout/forms/nsGfxButtonControlFrame.cpp index a5b8edf23ec..e23f64a56ff 100644 --- a/mozilla/layout/forms/nsGfxButtonControlFrame.cpp +++ b/mozilla/layout/forms/nsGfxButtonControlFrame.cpp @@ -47,7 +47,7 @@ #endif #include "nsIServiceManager.h" #include "nsIDOMNode.h" -#include "nsLayoutAtoms.h" +#include "nsGkAtoms.h" #include "nsAutoPtr.h" #include "nsStyleSet.h" #include "nsContentUtils.h" diff --git a/mozilla/layout/forms/nsHTMLButtonControlFrame.cpp b/mozilla/layout/forms/nsHTMLButtonControlFrame.cpp index 3b4df035f74..4cd0f6b9f0a 100644 --- a/mozilla/layout/forms/nsHTMLButtonControlFrame.cpp +++ b/mozilla/layout/forms/nsHTMLButtonControlFrame.cpp @@ -50,7 +50,7 @@ #include "nsLeafFrame.h" #include "nsCSSRendering.h" #include "nsISupports.h" -#include "nsLayoutAtoms.h" +#include "nsGkAtoms.h" #include "nsCSSAnonBoxes.h" #include "nsIImage.h" #include "nsStyleConsts.h" diff --git a/mozilla/layout/forms/nsImageControlFrame.cpp b/mozilla/layout/forms/nsImageControlFrame.cpp index 714a45b9305..d93f09cac4c 100644 --- a/mozilla/layout/forms/nsImageControlFrame.cpp +++ b/mozilla/layout/forms/nsImageControlFrame.cpp @@ -47,7 +47,7 @@ #include "nsLeafFrame.h" #include "nsCSSRendering.h" #include "nsISupports.h" -#include "nsLayoutAtoms.h" +#include "nsGkAtoms.h" #include "nsIDeviceContext.h" #include "nsIFontMetrics.h" #include "nsIImage.h" diff --git a/mozilla/layout/forms/nsLegendFrame.cpp b/mozilla/layout/forms/nsLegendFrame.cpp index 0883e9617dc..75dfe7ccc1b 100644 --- a/mozilla/layout/forms/nsLegendFrame.cpp +++ b/mozilla/layout/forms/nsLegendFrame.cpp @@ -47,7 +47,7 @@ #include "nsIAtom.h" #include "nsGenericHTMLElement.h" #include "nsHTMLParts.h" -#include "nsLayoutAtoms.h" +#include "nsGkAtoms.h" #include "nsStyleConsts.h" #include "nsFont.h" #include "nsFormControlFrame.h" diff --git a/mozilla/layout/forms/nsListControlFrame.cpp b/mozilla/layout/forms/nsListControlFrame.cpp index c0e9599eb72..f46389bcc17 100644 --- a/mozilla/layout/forms/nsListControlFrame.cpp +++ b/mozilla/layout/forms/nsListControlFrame.cpp @@ -43,7 +43,7 @@ #include "nsUnicharUtils.h" #include "nsListControlFrame.h" #include "nsFormControlFrame.h" // for COMPARE macro -#include "nsLayoutAtoms.h" +#include "nsGkAtoms.h" #include "nsIFormControl.h" #include "nsIDeviceContext.h" #include "nsIDocument.h" diff --git a/mozilla/layout/forms/nsListControlFrame.h b/mozilla/layout/forms/nsListControlFrame.h index 607b2caac6b..33674468e77 100644 --- a/mozilla/layout/forms/nsListControlFrame.h +++ b/mozilla/layout/forms/nsListControlFrame.h @@ -119,7 +119,7 @@ public: /** * Get the "type" of the frame * - * @see nsLayoutAtoms::scrollFrame + * @see nsGkAtoms::scrollFrame */ virtual nsIAtom* GetType() const; diff --git a/mozilla/layout/forms/nsSelectsAreaFrame.h b/mozilla/layout/forms/nsSelectsAreaFrame.h index 87730b3bab9..a4001df2b4f 100644 --- a/mozilla/layout/forms/nsSelectsAreaFrame.h +++ b/mozilla/layout/forms/nsSelectsAreaFrame.h @@ -44,7 +44,7 @@ class nsIContent; * The area frame has an additional named child list: * - "Absolute-list" which contains the absolutely positioned frames * - * @see nsLayoutAtoms::absoluteList + * @see nsGkAtoms::absoluteList */ class nsSelectsAreaFrame : public nsAreaFrame { diff --git a/mozilla/layout/forms/nsTextControlFrame.cpp b/mozilla/layout/forms/nsTextControlFrame.cpp index 6783cef40aa..1f251d570d2 100644 --- a/mozilla/layout/forms/nsTextControlFrame.cpp +++ b/mozilla/layout/forms/nsTextControlFrame.cpp @@ -74,7 +74,7 @@ #include "nsIPrintContext.h" #include "nsIPrintPreviewContext.h" #endif // USE_QI_IN_SUPPRESS_EVENT_HANDLERS -#include "nsLayoutAtoms.h" +#include "nsGkAtoms.h" #include "nsLayoutUtils.h" #include "nsIComponentManager.h" #include "nsIView.h" diff --git a/mozilla/layout/generic/nsAbsoluteContainingBlock.cpp b/mozilla/layout/generic/nsAbsoluteContainingBlock.cpp index 11e7fd75066..cd33194cef7 100644 --- a/mozilla/layout/generic/nsAbsoluteContainingBlock.cpp +++ b/mozilla/layout/generic/nsAbsoluteContainingBlock.cpp @@ -44,7 +44,6 @@ #include "nsAbsoluteContainingBlock.h" #include "nsContainerFrame.h" #include "nsIViewManager.h" -#include "nsLayoutAtoms.h" #include "nsIPresShell.h" #include "nsHTMLParts.h" #include "nsPresContext.h" @@ -304,7 +303,7 @@ nsAbsoluteContainingBlock::DestroyFrames(nsIFrame* aDelegatingFrame) // reflow... // When bug 154892 is checked in, make sure that when -// GetChildListName() == nsLayoutAtoms::fixedList, the height is unconstrained. +// GetChildListName() == nsGkAtoms::fixedList, the height is unconstrained. // since we don't allow replicated frames to split. nsresult diff --git a/mozilla/layout/generic/nsAbsoluteContainingBlock.h b/mozilla/layout/generic/nsAbsoluteContainingBlock.h index 7e1aebdae98..2f1a50fe64a 100644 --- a/mozilla/layout/generic/nsAbsoluteContainingBlock.h +++ b/mozilla/layout/generic/nsAbsoluteContainingBlock.h @@ -45,7 +45,7 @@ #include "nsFrameList.h" #include "nsHTMLReflowState.h" -#include "nsLayoutAtoms.h" +#include "nsGkAtoms.h" class nsIAtom; class nsIFrame; diff --git a/mozilla/layout/generic/nsAreaFrame.cpp b/mozilla/layout/generic/nsAreaFrame.cpp index c3af4e51aa9..bc5e36381db 100644 --- a/mozilla/layout/generic/nsAreaFrame.cpp +++ b/mozilla/layout/generic/nsAreaFrame.cpp @@ -44,7 +44,7 @@ #include "nsPresContext.h" #include "nsIViewManager.h" #include "nsINodeInfo.h" -#include "nsLayoutAtoms.h" +#include "nsGkAtoms.h" #include "nsIView.h" #include "nsHTMLParts.h" diff --git a/mozilla/layout/generic/nsAreaFrame.h b/mozilla/layout/generic/nsAreaFrame.h index e915ff129ca..5f06205cce4 100644 --- a/mozilla/layout/generic/nsAreaFrame.h +++ b/mozilla/layout/generic/nsAreaFrame.h @@ -51,7 +51,7 @@ struct nsStylePosition; * The area frame has an additional named child list: * - "Absolute-list" which contains the absolutely positioned frames * - * @see nsLayoutAtoms::absoluteList + * @see nsGkAtoms::absoluteList */ class nsAreaFrame : public nsBlockFrame { @@ -75,7 +75,7 @@ public: /** * Get the "type" of the frame * - * @see nsLayoutAtoms::areaFrame + * @see nsGkAtoms::areaFrame */ virtual nsIAtom* GetType() const; diff --git a/mozilla/layout/generic/nsBRFrame.cpp b/mozilla/layout/generic/nsBRFrame.cpp index c4f7196a121..ad6b6c6632c 100644 --- a/mozilla/layout/generic/nsBRFrame.cpp +++ b/mozilla/layout/generic/nsBRFrame.cpp @@ -43,7 +43,7 @@ #include "nsPresContext.h" #include "nsLineLayout.h" #include "nsStyleConsts.h" -#include "nsLayoutAtoms.h" +#include "nsGkAtoms.h" #include "nsIFontMetrics.h" #include "nsIRenderingContext.h" #include "nsTextTransformer.h" diff --git a/mozilla/layout/generic/nsBidiFrames.cpp b/mozilla/layout/generic/nsBidiFrames.cpp index 61b465795ca..1ec7efdb438 100644 --- a/mozilla/layout/generic/nsBidiFrames.cpp +++ b/mozilla/layout/generic/nsBidiFrames.cpp @@ -39,7 +39,7 @@ #ifdef IBMBIDI #include "nsBidiFrames.h" -#include "nsLayoutAtoms.h" +#include "nsGkAtoms.h" nsDirectionalFrame::nsDirectionalFrame(nsStyleContext* aContext, PRUnichar aChar) diff --git a/mozilla/layout/generic/nsBlockBandData.cpp b/mozilla/layout/generic/nsBlockBandData.cpp index e8d5cea71d3..339fc59efbe 100644 --- a/mozilla/layout/generic/nsBlockBandData.cpp +++ b/mozilla/layout/generic/nsBlockBandData.cpp @@ -43,7 +43,6 @@ #include "nsHTMLReflowState.h" #include "nsPresContext.h" #include "nsIPresShell.h" -#include "nsLayoutAtoms.h" nsBlockBandData::nsBlockBandData() : mSpaceManager(nsnull), diff --git a/mozilla/layout/generic/nsBlockFrame.cpp b/mozilla/layout/generic/nsBlockFrame.cpp index 5294e35cc91..e1f2d910d71 100644 --- a/mozilla/layout/generic/nsBlockFrame.cpp +++ b/mozilla/layout/generic/nsBlockFrame.cpp @@ -64,7 +64,7 @@ #include "nsIView.h" #include "nsIFontMetrics.h" #include "nsHTMLParts.h" -#include "nsLayoutAtoms.h" +#include "nsGkAtoms.h" #include "nsIDOMEvent.h" #include "nsGenericHTMLElement.h" #include "prprf.h" diff --git a/mozilla/layout/generic/nsBlockFrame.h b/mozilla/layout/generic/nsBlockFrame.h index 778285fcbc5..f3b96ef8722 100644 --- a/mozilla/layout/generic/nsBlockFrame.h +++ b/mozilla/layout/generic/nsBlockFrame.h @@ -135,7 +135,7 @@ extern const nsIID kBlockFrameCID; * The block frame has an additional named child list: * - "Absolute-list" which contains the absolutely positioned frames * - * @see nsLayoutAtoms::absoluteList + * @see nsGkAtoms::absoluteList */ class nsBlockFrame : public nsBlockFrameSuper { diff --git a/mozilla/layout/generic/nsBlockReflowContext.cpp b/mozilla/layout/generic/nsBlockReflowContext.cpp index cba4c3db7dc..7ed04e96e2f 100644 --- a/mozilla/layout/generic/nsBlockReflowContext.cpp +++ b/mozilla/layout/generic/nsBlockReflowContext.cpp @@ -52,7 +52,7 @@ #include "nsLineBox.h" #include "nsIDOMHTMLTableCellElement.h" #include "nsIDOMHTMLBodyElement.h" -#include "nsLayoutAtoms.h" +#include "nsGkAtoms.h" #include "nsCOMPtr.h" #include "nsLayoutUtils.h" diff --git a/mozilla/layout/generic/nsBlockReflowState.cpp b/mozilla/layout/generic/nsBlockReflowState.cpp index cb83069b707..bb457c3f976 100644 --- a/mozilla/layout/generic/nsBlockReflowState.cpp +++ b/mozilla/layout/generic/nsBlockReflowState.cpp @@ -47,7 +47,7 @@ #include "nsBlockFrame.h" #include "nsLineLayout.h" #include "nsPresContext.h" -#include "nsLayoutAtoms.h" +#include "nsGkAtoms.h" #include "nsIFrame.h" #include "nsFrameManager.h" diff --git a/mozilla/layout/generic/nsBulletFrame.cpp b/mozilla/layout/generic/nsBulletFrame.cpp index 8aa72f7846e..d6ad5c5914a 100644 --- a/mozilla/layout/generic/nsBulletFrame.cpp +++ b/mozilla/layout/generic/nsBulletFrame.cpp @@ -39,7 +39,7 @@ #include "nsCOMPtr.h" #include "nsBulletFrame.h" -#include "nsLayoutAtoms.h" +#include "nsGkAtoms.h" #include "nsHTMLParts.h" #include "nsHTMLContainerFrame.h" #include "nsIFontMetrics.h" diff --git a/mozilla/layout/generic/nsColumnSetFrame.cpp b/mozilla/layout/generic/nsColumnSetFrame.cpp index 5fc037dbb9c..2a3af44fc74 100644 --- a/mozilla/layout/generic/nsColumnSetFrame.cpp +++ b/mozilla/layout/generic/nsColumnSetFrame.cpp @@ -45,7 +45,7 @@ #include "nsIAtom.h" #include "nsPresContext.h" #include "nsHTMLParts.h" -#include "nsLayoutAtoms.h" +#include "nsGkAtoms.h" #include "nsStyleConsts.h" #include "nsCOMPtr.h" diff --git a/mozilla/layout/generic/nsContainerFrame.cpp b/mozilla/layout/generic/nsContainerFrame.cpp index 950cfb331ad..2e0aeee783e 100644 --- a/mozilla/layout/generic/nsContainerFrame.cpp +++ b/mozilla/layout/generic/nsContainerFrame.cpp @@ -54,7 +54,7 @@ #include "nsFrameManager.h" #include "nsIPresShell.h" #include "nsCOMPtr.h" -#include "nsLayoutAtoms.h" +#include "nsGkAtoms.h" #include "nsCSSAnonBoxes.h" #include "nsIViewManager.h" #include "nsIWidget.h" diff --git a/mozilla/layout/generic/nsFirstLetterFrame.cpp b/mozilla/layout/generic/nsFirstLetterFrame.cpp index 985605a8dc0..2a35df006b1 100644 --- a/mozilla/layout/generic/nsFirstLetterFrame.cpp +++ b/mozilla/layout/generic/nsFirstLetterFrame.cpp @@ -43,7 +43,7 @@ #include "nsStyleContext.h" #include "nsIContent.h" #include "nsLineLayout.h" -#include "nsLayoutAtoms.h" +#include "nsGkAtoms.h" #include "nsAutoPtr.h" #include "nsStyleSet.h" #include "nsFrameManager.h" diff --git a/mozilla/layout/generic/nsFrame.cpp b/mozilla/layout/generic/nsFrame.cpp index 81e7812eacb..7e2249e9e3f 100644 --- a/mozilla/layout/generic/nsFrame.cpp +++ b/mozilla/layout/generic/nsFrame.cpp @@ -85,7 +85,7 @@ #include "nsISelectionPrivate.h" #include "nsFrameSelection.h" #include "nsHTMLParts.h" -#include "nsLayoutAtoms.h" +#include "nsGkAtoms.h" #include "nsCSSAnonBoxes.h" #include "nsCSSPseudoElements.h" #include "nsIHTMLContentSink.h" diff --git a/mozilla/layout/generic/nsFrameFrame.cpp b/mozilla/layout/generic/nsFrameFrame.cpp index a968f914fc1..88aa33a71f3 100644 --- a/mozilla/layout/generic/nsFrameFrame.cpp +++ b/mozilla/layout/generic/nsFrameFrame.cpp @@ -65,7 +65,7 @@ #include "nsIViewManager.h" #include "nsWidgetsCID.h" #include "nsViewsCID.h" -#include "nsLayoutAtoms.h" +#include "nsGkAtoms.h" #include "nsIScrollableView.h" #include "nsStyleCoord.h" #include "nsStyleContext.h" diff --git a/mozilla/layout/generic/nsFrameList.cpp b/mozilla/layout/generic/nsFrameList.cpp index 5eab70e3257..19c00c66dd5 100644 --- a/mozilla/layout/generic/nsFrameList.cpp +++ b/mozilla/layout/generic/nsFrameList.cpp @@ -46,7 +46,7 @@ #ifdef IBMBIDI #include "nsCOMPtr.h" -#include "nsLayoutAtoms.h" +#include "nsGkAtoms.h" #include "nsILineIterator.h" #include "nsBidiPresUtils.h" #endif // IBMBIDI diff --git a/mozilla/layout/generic/nsFrameSetFrame.cpp b/mozilla/layout/generic/nsFrameSetFrame.cpp index 7955c8bbe1b..b0d6f47e386 100644 --- a/mozilla/layout/generic/nsFrameSetFrame.cpp +++ b/mozilla/layout/generic/nsFrameSetFrame.cpp @@ -54,7 +54,7 @@ #include "nsIView.h" #include "nsIViewManager.h" #include "nsWidgetsCID.h" -#include "nsLayoutAtoms.h" +#include "nsGkAtoms.h" #include "nsIScrollableView.h" #include "nsStyleCoord.h" #include "nsStyleConsts.h" diff --git a/mozilla/layout/generic/nsFrameSetFrame.h b/mozilla/layout/generic/nsFrameSetFrame.h index 5f3164ada51..4b7de877a43 100644 --- a/mozilla/layout/generic/nsFrameSetFrame.h +++ b/mozilla/layout/generic/nsFrameSetFrame.h @@ -40,7 +40,7 @@ #ifndef nsHTMLFrameset_h___ #define nsHTMLFrameset_h___ -#include "nsHTMLAtoms.h" +#include "nsGkAtoms.h" #include "nsHTMLContainerFrame.h" #include "nsColor.h" #include "nsIObserver.h" diff --git a/mozilla/layout/generic/nsGfxScrollFrame.cpp b/mozilla/layout/generic/nsGfxScrollFrame.cpp index 05c15c777fc..73f0d615a01 100644 --- a/mozilla/layout/generic/nsGfxScrollFrame.cpp +++ b/mozilla/layout/generic/nsGfxScrollFrame.cpp @@ -49,7 +49,7 @@ #include "nsIViewManager.h" #include "nsHTMLContainerFrame.h" #include "nsGfxScrollFrame.h" -#include "nsLayoutAtoms.h" +#include "nsGkAtoms.h" #include "nsINameSpaceManager.h" #include "nsISupportsArray.h" #include "nsIDocument.h" diff --git a/mozilla/layout/generic/nsGfxScrollFrame.h b/mozilla/layout/generic/nsGfxScrollFrame.h index 079e556472e..47c8dfa3e84 100644 --- a/mozilla/layout/generic/nsGfxScrollFrame.h +++ b/mozilla/layout/generic/nsGfxScrollFrame.h @@ -354,7 +354,7 @@ public: /** * Get the "type" of the frame * - * @see nsLayoutAtoms::scrollFrame + * @see nsGkAtoms::scrollFrame */ virtual nsIAtom* GetType() const; @@ -545,7 +545,7 @@ public: /** * Get the "type" of the frame * - * @see nsLayoutAtoms::scrollFrame + * @see nsGkAtoms::scrollFrame */ virtual nsIAtom* GetType() const; diff --git a/mozilla/layout/generic/nsHTMLCanvasFrame.cpp b/mozilla/layout/generic/nsHTMLCanvasFrame.cpp index 62f65d6f64f..ddb5e1198d1 100644 --- a/mozilla/layout/generic/nsHTMLCanvasFrame.cpp +++ b/mozilla/layout/generic/nsHTMLCanvasFrame.cpp @@ -41,7 +41,7 @@ #include "nsHTMLParts.h" #include "nsCOMPtr.h" #include "nsIServiceManager.h" -#include "nsLayoutAtoms.h" +#include "nsGkAtoms.h" #include "nsHTMLCanvasFrame.h" #include "nsICanvasElement.h" diff --git a/mozilla/layout/generic/nsHTMLContainerFrame.cpp b/mozilla/layout/generic/nsHTMLContainerFrame.cpp index 92dc15070fd..376e258eff1 100644 --- a/mozilla/layout/generic/nsHTMLContainerFrame.cpp +++ b/mozilla/layout/generic/nsHTMLContainerFrame.cpp @@ -44,7 +44,7 @@ #include "nsStyleContext.h" #include "nsStyleConsts.h" #include "nsIContent.h" -#include "nsLayoutAtoms.h" +#include "nsGkAtoms.h" #include "nsLayoutUtils.h" #include "nsCSSAnonBoxes.h" #include "nsIWidget.h" diff --git a/mozilla/layout/generic/nsHTMLFrame.cpp b/mozilla/layout/generic/nsHTMLFrame.cpp index e6a16ef07d5..30169aaf11b 100644 --- a/mozilla/layout/generic/nsHTMLFrame.cpp +++ b/mozilla/layout/generic/nsHTMLFrame.cpp @@ -48,7 +48,7 @@ #include "nsIRenderingContext.h" #include "nsGUIEvent.h" #include "nsStyleConsts.h" -#include "nsLayoutAtoms.h" +#include "nsGkAtoms.h" #include "nsIEventStateManager.h" #include "nsIDeviceContext.h" #include "nsIPresShell.h" diff --git a/mozilla/layout/generic/nsHTMLReflowState.cpp b/mozilla/layout/generic/nsHTMLReflowState.cpp index 43710fc93c4..fa8f50005a1 100644 --- a/mozilla/layout/generic/nsHTMLReflowState.cpp +++ b/mozilla/layout/generic/nsHTMLReflowState.cpp @@ -42,7 +42,7 @@ #include "nsCSSAnonBoxes.h" #include "nsFrame.h" #include "nsIContent.h" -#include "nsLayoutAtoms.h" +#include "nsGkAtoms.h" #include "nsPresContext.h" #include "nsIPresShell.h" #include "nsIDeviceContext.h" diff --git a/mozilla/layout/generic/nsImageFrame.cpp b/mozilla/layout/generic/nsImageFrame.cpp index 523cc4f9948..2c9d4ce491f 100644 --- a/mozilla/layout/generic/nsImageFrame.cpp +++ b/mozilla/layout/generic/nsImageFrame.cpp @@ -48,7 +48,7 @@ #include "nsIPresShell.h" #include "nsIImage.h" #include "nsIWidget.h" -#include "nsLayoutAtoms.h" +#include "nsGkAtoms.h" #include "nsIDocument.h" #include "nsINodeInfo.h" #include "nsContentUtils.h" diff --git a/mozilla/layout/generic/nsInlineFrame.cpp b/mozilla/layout/generic/nsInlineFrame.cpp index e56cbeda675..7af6ba559d1 100644 --- a/mozilla/layout/generic/nsInlineFrame.cpp +++ b/mozilla/layout/generic/nsInlineFrame.cpp @@ -40,7 +40,7 @@ #include "nsCOMPtr.h" #include "nsInlineFrame.h" #include "nsBlockFrame.h" -#include "nsLayoutAtoms.h" +#include "nsGkAtoms.h" #include "nsHTMLParts.h" #include "nsStyleContext.h" #include "nsIPresShell.h" diff --git a/mozilla/layout/generic/nsInlineFrame.h b/mozilla/layout/generic/nsInlineFrame.h index 71b53326855..012d0ca980f 100644 --- a/mozilla/layout/generic/nsInlineFrame.h +++ b/mozilla/layout/generic/nsInlineFrame.h @@ -43,7 +43,6 @@ #include "nsHTMLContainerFrame.h" #include "nsAbsoluteContainingBlock.h" #include "nsLineLayout.h" -#include "nsLayoutAtoms.h" class nsAnonymousBlockFrame; diff --git a/mozilla/layout/generic/nsLeafFrame.cpp b/mozilla/layout/generic/nsLeafFrame.cpp index 56bda764c52..23fb133fb6f 100644 --- a/mozilla/layout/generic/nsLeafFrame.cpp +++ b/mozilla/layout/generic/nsLeafFrame.cpp @@ -41,7 +41,6 @@ #include "nsLeafFrame.h" #include "nsHTMLContainerFrame.h" #include "nsHTMLParts.h" -#include "nsHTMLAtoms.h" #include "nsIPresShell.h" #include "nsPresContext.h" diff --git a/mozilla/layout/generic/nsLineBox.cpp b/mozilla/layout/generic/nsLineBox.cpp index 2df7ff8a078..7b2aad6ffbf 100644 --- a/mozilla/layout/generic/nsLineBox.cpp +++ b/mozilla/layout/generic/nsLineBox.cpp @@ -45,7 +45,7 @@ #include "nsLineLayout.h" #include "prprf.h" #include "nsBlockFrame.h" -#include "nsLayoutAtoms.h" +#include "nsGkAtoms.h" #include "nsFrameManager.h" #ifdef IBMBIDI #include "nsBidiPresUtils.h" diff --git a/mozilla/layout/generic/nsLineLayout.cpp b/mozilla/layout/generic/nsLineLayout.cpp index 813d5838fb1..d657208f140 100644 --- a/mozilla/layout/generic/nsLineLayout.cpp +++ b/mozilla/layout/generic/nsLineLayout.cpp @@ -57,7 +57,7 @@ #include "nsPresContext.h" #include "nsIFontMetrics.h" #include "nsIRenderingContext.h" -#include "nsLayoutAtoms.h" +#include "nsGkAtoms.h" #include "nsPlaceholderFrame.h" #include "nsIDocument.h" #include "nsIHTMLDocument.h" diff --git a/mozilla/layout/generic/nsObjectFrame.cpp b/mozilla/layout/generic/nsObjectFrame.cpp index 4312a230bf0..35888ddc08e 100644 --- a/mozilla/layout/generic/nsObjectFrame.cpp +++ b/mozilla/layout/generic/nsObjectFrame.cpp @@ -57,7 +57,7 @@ #include "nsString.h" #include "nsReadableUtils.h" #include "prmem.h" -#include "nsLayoutAtoms.h" +#include "nsGkAtoms.h" #include "nsIDocument.h" #include "nsINodeInfo.h" #include "nsIURL.h" diff --git a/mozilla/layout/generic/nsPageContentFrame.cpp b/mozilla/layout/generic/nsPageContentFrame.cpp index 5cd8434ff5b..e4fa9b0938c 100644 --- a/mozilla/layout/generic/nsPageContentFrame.cpp +++ b/mozilla/layout/generic/nsPageContentFrame.cpp @@ -39,7 +39,7 @@ #include "nsIContent.h" #include "nsPresContext.h" #include "nsIRenderingContext.h" -#include "nsLayoutAtoms.h" +#include "nsGkAtoms.h" #include "nsIPresShell.h" #include "nsIDeviceContext.h" #include "nsReadableUtils.h" diff --git a/mozilla/layout/generic/nsPageContentFrame.h b/mozilla/layout/generic/nsPageContentFrame.h index a9b8a74e740..49b8ccbd01c 100644 --- a/mozilla/layout/generic/nsPageContentFrame.h +++ b/mozilla/layout/generic/nsPageContentFrame.h @@ -65,7 +65,7 @@ public: /** * Get the "type" of the frame * - * @see nsLayoutAtoms::pageFrame + * @see nsGkAtoms::pageFrame */ virtual nsIAtom* GetType() const; diff --git a/mozilla/layout/generic/nsPageFrame.cpp b/mozilla/layout/generic/nsPageFrame.cpp index ad03abf800e..ad032cc114a 100644 --- a/mozilla/layout/generic/nsPageFrame.cpp +++ b/mozilla/layout/generic/nsPageFrame.cpp @@ -39,7 +39,7 @@ #include "nsPresContext.h" #include "nsStyleContext.h" #include "nsIRenderingContext.h" -#include "nsLayoutAtoms.h" +#include "nsGkAtoms.h" #include "nsIPresShell.h" #include "nsCSSFrameConstructor.h" #include "nsIDeviceContext.h" diff --git a/mozilla/layout/generic/nsPageFrame.h b/mozilla/layout/generic/nsPageFrame.h index 6c2327993d9..43162ef9b86 100644 --- a/mozilla/layout/generic/nsPageFrame.h +++ b/mozilla/layout/generic/nsPageFrame.h @@ -62,7 +62,7 @@ public: /** * Get the "type" of the frame * - * @see nsLayoutAtoms::pageFrame + * @see nsGkAtoms::pageFrame */ virtual nsIAtom* GetType() const; diff --git a/mozilla/layout/generic/nsPlaceholderFrame.cpp b/mozilla/layout/generic/nsPlaceholderFrame.cpp index 6f996ceb3e2..a32390ec73c 100644 --- a/mozilla/layout/generic/nsPlaceholderFrame.cpp +++ b/mozilla/layout/generic/nsPlaceholderFrame.cpp @@ -46,7 +46,7 @@ #include "nsIContent.h" #include "nsPresContext.h" #include "nsIRenderingContext.h" -#include "nsLayoutAtoms.h" +#include "nsGkAtoms.h" #include "nsFrameManager.h" #include "nsDisplayList.h" diff --git a/mozilla/layout/generic/nsPlaceholderFrame.h b/mozilla/layout/generic/nsPlaceholderFrame.h index 9bf4ae75a9d..9ee29b57f16 100644 --- a/mozilla/layout/generic/nsPlaceholderFrame.h +++ b/mozilla/layout/generic/nsPlaceholderFrame.h @@ -75,7 +75,7 @@ #define nsPlaceholderFrame_h___ #include "nsSplittableFrame.h" -#include "nsLayoutAtoms.h" +#include "nsGkAtoms.h" nsIFrame* NS_NewPlaceholderFrame(nsIPresShell* aPresShell, nsStyleContext* aContext); diff --git a/mozilla/layout/generic/nsSelection.cpp b/mozilla/layout/generic/nsSelection.cpp index c3cb393102b..a6cc92a877c 100644 --- a/mozilla/layout/generic/nsSelection.cpp +++ b/mozilla/layout/generic/nsSelection.cpp @@ -74,7 +74,7 @@ // for IBMBIDI #include "nsFrameTraversal.h" #include "nsILineIterator.h" -#include "nsLayoutAtoms.h" +#include "nsGkAtoms.h" #include "nsIFrameTraversal.h" #include "nsLayoutUtils.h" #include "nsLayoutCID.h" diff --git a/mozilla/layout/generic/nsSimplePageSequence.cpp b/mozilla/layout/generic/nsSimplePageSequence.cpp index c95f922d458..528565155e6 100644 --- a/mozilla/layout/generic/nsSimplePageSequence.cpp +++ b/mozilla/layout/generic/nsSimplePageSequence.cpp @@ -39,7 +39,7 @@ #include "nsSimplePageSequence.h" #include "nsPresContext.h" #include "nsIRenderingContext.h" -#include "nsLayoutAtoms.h" +#include "nsGkAtoms.h" #include "nsIDeviceContext.h" #include "nsIViewManager.h" #include "nsIPresShell.h" diff --git a/mozilla/layout/generic/nsSimplePageSequence.h b/mozilla/layout/generic/nsSimplePageSequence.h index 55707daef41..ecd38ad94f1 100644 --- a/mozilla/layout/generic/nsSimplePageSequence.h +++ b/mozilla/layout/generic/nsSimplePageSequence.h @@ -123,7 +123,7 @@ public: /** * Get the "type" of the frame * - * @see nsLayoutAtoms::sequenceFrame + * @see nsGkAtoms::sequenceFrame */ virtual nsIAtom* GetType() const; diff --git a/mozilla/layout/generic/nsTextFrame.cpp b/mozilla/layout/generic/nsTextFrame.cpp index 6a66cf07b67..7bec09d471b 100644 --- a/mozilla/layout/generic/nsTextFrame.cpp +++ b/mozilla/layout/generic/nsTextFrame.cpp @@ -83,7 +83,7 @@ #include "nsTextTransformer.h" #include "nsTextFragment.h" -#include "nsLayoutAtoms.h" +#include "nsGkAtoms.h" #include "nsFrameSelection.h" #include "nsISelection.h" #include "nsIDOMRange.h" diff --git a/mozilla/layout/generic/nsTextFrameThebes.cpp b/mozilla/layout/generic/nsTextFrameThebes.cpp index 18e7f38a9eb..02f97fab778 100644 --- a/mozilla/layout/generic/nsTextFrameThebes.cpp +++ b/mozilla/layout/generic/nsTextFrameThebes.cpp @@ -85,8 +85,7 @@ #include "nsTextRunTransformations.h" #include "nsTextFragment.h" -#include "nsHTMLAtoms.h" -#include "nsLayoutAtoms.h" +#include "nsGkAtoms.h" #include "nsFrameSelection.h" #include "nsISelection.h" #include "nsIDOMRange.h" diff --git a/mozilla/layout/generic/nsTextTransformer.cpp b/mozilla/layout/generic/nsTextTransformer.cpp index edc03e1ae3b..5ed756b9014 100644 --- a/mozilla/layout/generic/nsTextTransformer.cpp +++ b/mozilla/layout/generic/nsTextTransformer.cpp @@ -55,9 +55,7 @@ #include "nsUnicharUtils.h" #include "nsICaseConversion.h" #include "prenv.h" -#ifdef IBMBIDI -#include "nsLayoutAtoms.h" -#endif +#include "nsGkAtoms.h" nsICaseConversion* nsTextTransformer::gCaseConv = nsnull; PRBool nsTextTransformer::sWordSelectListenerPrefChecked = PR_FALSE; diff --git a/mozilla/layout/generic/nsViewportFrame.cpp b/mozilla/layout/generic/nsViewportFrame.cpp index 0f7a31e7381..c6a393720a1 100644 --- a/mozilla/layout/generic/nsViewportFrame.cpp +++ b/mozilla/layout/generic/nsViewportFrame.cpp @@ -43,7 +43,7 @@ #include "nsCOMPtr.h" #include "nsViewportFrame.h" #include "nsHTMLParts.h" -#include "nsLayoutAtoms.h" +#include "nsGkAtoms.h" #include "nsIViewManager.h" #include "nsIScrollableFrame.h" #include "nsIDeviceContext.h" diff --git a/mozilla/layout/generic/nsViewportFrame.h b/mozilla/layout/generic/nsViewportFrame.h index f06211013ee..3547e0806e8 100644 --- a/mozilla/layout/generic/nsViewportFrame.h +++ b/mozilla/layout/generic/nsViewportFrame.h @@ -44,7 +44,7 @@ #define nsViewportFrame_h___ #include "nsContainerFrame.h" -#include "nsLayoutAtoms.h" +#include "nsGkAtoms.h" #include "nsPresContext.h" #include "nsIPresShell.h" #include "nsAbsoluteContainingBlock.h" diff --git a/mozilla/layout/inspector/src/inLayoutUtils.cpp b/mozilla/layout/inspector/src/inLayoutUtils.cpp index aef363143cb..487137468da 100644 --- a/mozilla/layout/inspector/src/inLayoutUtils.cpp +++ b/mozilla/layout/inspector/src/inLayoutUtils.cpp @@ -51,8 +51,6 @@ #include "nsIViewManager.h" #include "nsIWidget.h" #include "nsPresContext.h" -#include "nsXULAtoms.h" -#include "nsHTMLAtoms.h" /////////////////////////////////////////////////////////////////////////////// diff --git a/mozilla/layout/mathml/base/src/nsMathMLForeignFrameWrapper.cpp b/mozilla/layout/mathml/base/src/nsMathMLForeignFrameWrapper.cpp index 499e97e3978..4e50275bd84 100644 --- a/mozilla/layout/mathml/base/src/nsMathMLForeignFrameWrapper.cpp +++ b/mozilla/layout/mathml/base/src/nsMathMLForeignFrameWrapper.cpp @@ -46,7 +46,6 @@ #include "nsAreaFrame.h" #include "nsLineLayout.h" #include "nsPresContext.h" -#include "nsHTMLAtoms.h" #include "nsUnitConversion.h" #include "nsStyleContext.h" #include "nsStyleConsts.h" diff --git a/mozilla/layout/printing/nsPrintEngine.cpp b/mozilla/layout/printing/nsPrintEngine.cpp index 178f9c6e025..d59b5ecbc1a 100644 --- a/mozilla/layout/printing/nsPrintEngine.cpp +++ b/mozilla/layout/printing/nsPrintEngine.cpp @@ -56,7 +56,7 @@ #include "nsIPrintSession.h" #include "nsGfxCIID.h" #include "nsIServiceManager.h" -#include "nsLayoutAtoms.h" // XXX until atoms get factored into nsGkAtoms +#include "nsGkAtoms.h" #include "nsISimpleEnumerator.h" #include "nsXPCOM.h" #include "nsISupportsPrimitives.h" diff --git a/mozilla/layout/style/nsCSSParser.cpp b/mozilla/layout/style/nsCSSParser.cpp index 4f1cdd22cf9..c6ef3ff29b6 100644 --- a/mozilla/layout/style/nsCSSParser.cpp +++ b/mozilla/layout/style/nsCSSParser.cpp @@ -67,7 +67,6 @@ #include "nsCOMArray.h" #include "nsColor.h" #include "nsStyleConsts.h" -#include "nsLayoutAtoms.h" #include "nsCSSPseudoClasses.h" #include "nsCSSPseudoElements.h" #include "nsCSSAnonBoxes.h" diff --git a/mozilla/layout/style/nsCSSRules.cpp b/mozilla/layout/style/nsCSSRules.cpp index c2816e5c73b..44aa6a0e410 100644 --- a/mozilla/layout/style/nsCSSRules.cpp +++ b/mozilla/layout/style/nsCSSRules.cpp @@ -47,7 +47,6 @@ #include "nsIURL.h" #include "nsCSSRule.h" -#include "nsLayoutAtoms.h" #include "nsICSSStyleSheet.h" #include "nsCOMPtr.h" diff --git a/mozilla/layout/style/nsCSSStyleRule.cpp b/mozilla/layout/style/nsCSSStyleRule.cpp index 7246b2f60d6..a2e819bd73f 100644 --- a/mozilla/layout/style/nsCSSStyleRule.cpp +++ b/mozilla/layout/style/nsCSSStyleRule.cpp @@ -60,7 +60,6 @@ #include "nsString.h" #include "nsStyleConsts.h" #include "nsStyleUtil.h" -#include "nsHTMLAtoms.h" #include "nsUnitConversion.h" #include "nsIFontMetrics.h" #include "nsIDOMCSSStyleSheet.h" diff --git a/mozilla/layout/style/nsCSSStyleSheet.cpp b/mozilla/layout/style/nsCSSStyleSheet.cpp index 09b06e51391..3c332cd10c5 100644 --- a/mozilla/layout/style/nsCSSStyleSheet.cpp +++ b/mozilla/layout/style/nsCSSStyleSheet.cpp @@ -54,7 +54,7 @@ #include "nsIMediaList.h" #include "nsIDocument.h" #include "nsPresContext.h" -#include "nsLayoutAtoms.h" +#include "nsGkAtoms.h" #include "nsString.h" #include "nsVoidArray.h" #include "nsIDOMStyleSheetList.h" diff --git a/mozilla/layout/style/nsComputedDOMStyle.cpp b/mozilla/layout/style/nsComputedDOMStyle.cpp index d8d9e8f3786..1257e13c0bd 100644 --- a/mozilla/layout/style/nsComputedDOMStyle.cpp +++ b/mozilla/layout/style/nsComputedDOMStyle.cpp @@ -56,7 +56,7 @@ #include "nsCSSProps.h" #include "nsCSSKeywords.h" #include "nsDOMCSSRect.h" -#include "nsLayoutAtoms.h" +#include "nsGkAtoms.h" #include "nsHTMLReflowState.h" #include "nsThemeConstants.h" diff --git a/mozilla/layout/style/nsDOMCSSAttrDeclaration.cpp b/mozilla/layout/style/nsDOMCSSAttrDeclaration.cpp index 22c3c8693c8..e73d7b8c3e4 100644 --- a/mozilla/layout/style/nsDOMCSSAttrDeclaration.cpp +++ b/mozilla/layout/style/nsDOMCSSAttrDeclaration.cpp @@ -40,7 +40,6 @@ #include "nsDOMCSSAttrDeclaration.h" #include "nsCSSDeclaration.h" #include "nsIDocument.h" -#include "nsHTMLAtoms.h" #include "nsIDOMMutationEvent.h" #include "nsICSSStyleRule.h" #include "nsICSSLoader.h" diff --git a/mozilla/layout/style/nsInspectorCSSUtils.cpp b/mozilla/layout/style/nsInspectorCSSUtils.cpp index aff0d48941f..f1b8907a9b4 100644 --- a/mozilla/layout/style/nsInspectorCSSUtils.cpp +++ b/mozilla/layout/style/nsInspectorCSSUtils.cpp @@ -43,7 +43,7 @@ #include "nsIStyleRule.h" #include "nsRuleNode.h" #include "nsString.h" -#include "nsLayoutAtoms.h" +#include "nsGkAtoms.h" #include "nsIDocument.h" #include "nsIPresShell.h" #include "nsAutoPtr.h" diff --git a/mozilla/layout/style/nsStyleContext.cpp b/mozilla/layout/style/nsStyleContext.cpp index de1414694a5..c673c52ffe5 100644 --- a/mozilla/layout/style/nsStyleContext.cpp +++ b/mozilla/layout/style/nsStyleContext.cpp @@ -48,7 +48,6 @@ #include "nsCOMPtr.h" #include "nsStyleSet.h" #include "nsIPresShell.h" -#include "nsLayoutAtoms.h" #include "prenv.h" #include "nsRuleNode.h" diff --git a/mozilla/layout/style/nsStyleStruct.cpp b/mozilla/layout/style/nsStyleStruct.cpp index 0d8d6f8463c..5b542122651 100644 --- a/mozilla/layout/style/nsStyleStruct.cpp +++ b/mozilla/layout/style/nsStyleStruct.cpp @@ -54,7 +54,6 @@ #include "nsCOMPtr.h" #include "nsIPresShell.h" #include "nsIFrame.h" -#include "nsLayoutAtoms.h" #include "nsHTMLReflowState.h" #include "prenv.h" diff --git a/mozilla/layout/svg/base/src/nsSVGClipPathFrame.h b/mozilla/layout/svg/base/src/nsSVGClipPathFrame.h index 38d52e5446b..5adf67e3bc2 100644 --- a/mozilla/layout/svg/base/src/nsSVGClipPathFrame.h +++ b/mozilla/layout/svg/base/src/nsSVGClipPathFrame.h @@ -68,7 +68,7 @@ class nsSVGClipPathFrame : public nsSVGClipPathFrameBase /** * Get the "type" of the frame * - * @see nsLayoutAtoms::svgClipPathFrame + * @see nsGkAtoms::svgClipPathFrame */ virtual nsIAtom* GetType() const; diff --git a/mozilla/layout/svg/base/src/nsSVGForeignObjectFrame.cpp b/mozilla/layout/svg/base/src/nsSVGForeignObjectFrame.cpp index 0a5b49f058d..6f8d4b0db1c 100644 --- a/mozilla/layout/svg/base/src/nsSVGForeignObjectFrame.cpp +++ b/mozilla/layout/svg/base/src/nsSVGForeignObjectFrame.cpp @@ -48,7 +48,7 @@ #include "nsSVGOuterSVGFrame.h" #include "nsISVGValueUtils.h" #include "nsRegion.h" -#include "nsLayoutAtoms.h" +#include "nsGkAtoms.h" #include "nsLayoutUtils.h" #include "nsSVGUtils.h" #include "nsIURI.h" diff --git a/mozilla/layout/svg/base/src/nsSVGForeignObjectFrame.h b/mozilla/layout/svg/base/src/nsSVGForeignObjectFrame.h index ad2fcb819af..bf15b9e0999 100644 --- a/mozilla/layout/svg/base/src/nsSVGForeignObjectFrame.h +++ b/mozilla/layout/svg/base/src/nsSVGForeignObjectFrame.h @@ -87,7 +87,7 @@ public: /** * Get the "type" of the frame * - * @see nsLayoutAtoms::svgForeignObjectFrame + * @see nsGkAtoms::svgForeignObjectFrame */ virtual nsIAtom* GetType() const; virtual PRBool IsFrameOfType(PRUint32 aFlags) const; diff --git a/mozilla/layout/svg/base/src/nsSVGGFrame.cpp b/mozilla/layout/svg/base/src/nsSVGGFrame.cpp index e4ab718eba9..8ed6c10d41b 100644 --- a/mozilla/layout/svg/base/src/nsSVGGFrame.cpp +++ b/mozilla/layout/svg/base/src/nsSVGGFrame.cpp @@ -41,7 +41,7 @@ #include "nsIFrame.h" #include "nsSVGMatrix.h" #include "nsSVGClipPathFrame.h" -#include "nsLayoutAtoms.h" +#include "nsGkAtoms.h" #include "nsSVGUtils.h" #include "nsISVGValueUtils.h" #include "nsSVGGraphicElement.h" diff --git a/mozilla/layout/svg/base/src/nsSVGGFrame.h b/mozilla/layout/svg/base/src/nsSVGGFrame.h index df883006024..dcac61d03c4 100644 --- a/mozilla/layout/svg/base/src/nsSVGGFrame.h +++ b/mozilla/layout/svg/base/src/nsSVGGFrame.h @@ -58,7 +58,7 @@ public: /** * Get the "type" of the frame * - * @see nsLayoutAtoms::svgGFrame + * @see nsGkAtoms::svgGFrame */ virtual nsIAtom* GetType() const; diff --git a/mozilla/layout/svg/base/src/nsSVGGenericContainerFrame.h b/mozilla/layout/svg/base/src/nsSVGGenericContainerFrame.h index ceb5a7f34d6..c37e48bf496 100644 --- a/mozilla/layout/svg/base/src/nsSVGGenericContainerFrame.h +++ b/mozilla/layout/svg/base/src/nsSVGGenericContainerFrame.h @@ -42,7 +42,7 @@ #include "nsIDOMSVGGElement.h" #include "nsPresContext.h" #include "nsSVGContainerFrame.h" -#include "nsLayoutAtoms.h" +#include "nsGkAtoms.h" typedef nsSVGDisplayContainerFrame nsSVGGenericContainerFrameBase; @@ -61,7 +61,7 @@ public: /** * Get the "type" of the frame * - * @see nsLayoutAtoms::svgGenericContainerFrame + * @see nsGkAtoms::svgGenericContainerFrame */ virtual nsIAtom* GetType() const; diff --git a/mozilla/layout/svg/base/src/nsSVGGlyphFrame.h b/mozilla/layout/svg/base/src/nsSVGGlyphFrame.h index 906c5bf086d..f6440098e4d 100644 --- a/mozilla/layout/svg/base/src/nsSVGGlyphFrame.h +++ b/mozilla/layout/svg/base/src/nsSVGGlyphFrame.h @@ -82,7 +82,7 @@ public: /** * Get the "type" of the frame * - * @see nsLayoutAtoms::svgGlyphFrame + * @see nsGkAtoms::svgGlyphFrame */ virtual nsIAtom* GetType() const; virtual PRBool IsFrameOfType(PRUint32 aFlags) const; diff --git a/mozilla/layout/svg/base/src/nsSVGLeafFrame.cpp b/mozilla/layout/svg/base/src/nsSVGLeafFrame.cpp index b7e0b5b47f7..43458c3cb71 100644 --- a/mozilla/layout/svg/base/src/nsSVGLeafFrame.cpp +++ b/mozilla/layout/svg/base/src/nsSVGLeafFrame.cpp @@ -35,7 +35,6 @@ * ***** END LICENSE BLOCK ***** */ #include "nsFrame.h" -#include "nsLayoutAtoms.h" class nsSVGLeafFrame : public nsFrame { diff --git a/mozilla/layout/svg/base/src/nsSVGMarkerFrame.h b/mozilla/layout/svg/base/src/nsSVGMarkerFrame.h index c15938cbce2..ba29e036501 100644 --- a/mozilla/layout/svg/base/src/nsSVGMarkerFrame.h +++ b/mozilla/layout/svg/base/src/nsSVGMarkerFrame.h @@ -83,7 +83,7 @@ public: /** * Get the "type" of the frame * - * @see nsLayoutAtoms::svgMarkerFrame + * @see nsGkAtoms::svgMarkerFrame */ virtual nsIAtom* GetType() const; diff --git a/mozilla/layout/svg/base/src/nsSVGMaskFrame.h b/mozilla/layout/svg/base/src/nsSVGMaskFrame.h index 1dea5e45fbe..c0ee076fbcd 100644 --- a/mozilla/layout/svg/base/src/nsSVGMaskFrame.h +++ b/mozilla/layout/svg/base/src/nsSVGMaskFrame.h @@ -63,7 +63,7 @@ class nsSVGMaskFrame : public nsSVGMaskFrameBase /** * Get the "type" of the frame * - * @see nsLayoutAtoms::svgMaskFrame + * @see nsGkAtoms::svgMaskFrame */ virtual nsIAtom* GetType() const; diff --git a/mozilla/layout/svg/base/src/nsSVGOuterSVGFrame.h b/mozilla/layout/svg/base/src/nsSVGOuterSVGFrame.h index 175af40afda..23a6351e181 100644 --- a/mozilla/layout/svg/base/src/nsSVGOuterSVGFrame.h +++ b/mozilla/layout/svg/base/src/nsSVGOuterSVGFrame.h @@ -94,7 +94,7 @@ public: /** * Get the "type" of the frame * - * @see nsLayoutAtoms::svgOuterSVGFrame + * @see nsGkAtoms::svgOuterSVGFrame */ virtual nsIAtom* GetType() const; diff --git a/mozilla/layout/svg/base/src/nsSVGPathGeometryFrame.h b/mozilla/layout/svg/base/src/nsSVGPathGeometryFrame.h index ed009d8f831..ef27efa8329 100644 --- a/mozilla/layout/svg/base/src/nsSVGPathGeometryFrame.h +++ b/mozilla/layout/svg/base/src/nsSVGPathGeometryFrame.h @@ -44,7 +44,7 @@ #include "nsWeakReference.h" #include "nsISVGValue.h" #include "nsISVGValueObserver.h" -#include "nsLayoutAtoms.h" +#include "nsGkAtoms.h" #include "nsSVGGeometryFrame.h" class nsPresContext; @@ -80,7 +80,7 @@ public: /** * Get the "type" of the frame * - * @see nsLayoutAtoms::svgPathGeometryFrame + * @see nsGkAtoms::svgPathGeometryFrame */ virtual nsIAtom* GetType() const; virtual PRBool IsFrameOfType(PRUint32 aFlags) const; diff --git a/mozilla/layout/svg/base/src/nsSVGPatternFrame.cpp b/mozilla/layout/svg/base/src/nsSVGPatternFrame.cpp index e1efddc9d45..2ec5b31dc5a 100644 --- a/mozilla/layout/svg/base/src/nsSVGPatternFrame.cpp +++ b/mozilla/layout/svg/base/src/nsSVGPatternFrame.cpp @@ -36,7 +36,7 @@ * * ***** END LICENSE BLOCK ***** */ -#include "nsLayoutAtoms.h" +#include "nsGkAtoms.h" #include "nsIDOMSVGAnimatedEnum.h" #include "nsIDOMSVGAnimatedRect.h" #include "nsIDOMSVGAnimTransformList.h" diff --git a/mozilla/layout/svg/base/src/nsSVGPatternFrame.h b/mozilla/layout/svg/base/src/nsSVGPatternFrame.h index fa3793f1e01..2aee1fd1154 100644 --- a/mozilla/layout/svg/base/src/nsSVGPatternFrame.h +++ b/mozilla/layout/svg/base/src/nsSVGPatternFrame.h @@ -99,7 +99,7 @@ public: /** * Get the "type" of the frame * - * @see nsLayoutAtoms::svgPatternFrame + * @see nsGkAtoms::svgPatternFrame */ virtual nsIAtom* GetType() const; diff --git a/mozilla/layout/svg/base/src/nsSVGTSpanFrame.h b/mozilla/layout/svg/base/src/nsSVGTSpanFrame.h index 190eb67f909..4b61627a0ad 100644 --- a/mozilla/layout/svg/base/src/nsSVGTSpanFrame.h +++ b/mozilla/layout/svg/base/src/nsSVGTSpanFrame.h @@ -70,7 +70,7 @@ public: /** * Get the "type" of the frame * - * @see nsLayoutAtoms::svgTSpanFrame + * @see nsGkAtoms::svgTSpanFrame */ virtual nsIAtom* GetType() const; diff --git a/mozilla/layout/svg/base/src/nsSVGTextFrame.cpp b/mozilla/layout/svg/base/src/nsSVGTextFrame.cpp index aa4d139801c..ac5e54628ef 100644 --- a/mozilla/layout/svg/base/src/nsSVGTextFrame.cpp +++ b/mozilla/layout/svg/base/src/nsSVGTextFrame.cpp @@ -49,7 +49,7 @@ #include "nsISVGTextContentMetrics.h" #include "nsSVGRect.h" #include "nsSVGMatrix.h" -#include "nsLayoutAtoms.h" +#include "nsGkAtoms.h" #include "nsSVGTextPathFrame.h" #include "nsSVGPathElement.h" #include "nsSVGUtils.h" diff --git a/mozilla/layout/svg/base/src/nsSVGTextFrame.h b/mozilla/layout/svg/base/src/nsSVGTextFrame.h index 9353cfefb7c..83d7f78eafe 100755 --- a/mozilla/layout/svg/base/src/nsSVGTextFrame.h +++ b/mozilla/layout/svg/base/src/nsSVGTextFrame.h @@ -71,7 +71,7 @@ public: /** * Get the "type" of the frame * - * @see nsLayoutAtoms::svgTextFrame + * @see nsGkAtoms::svgTextFrame */ virtual nsIAtom* GetType() const; diff --git a/mozilla/layout/svg/base/src/nsSVGTextPathFrame.h b/mozilla/layout/svg/base/src/nsSVGTextPathFrame.h index 241437c27e9..461423532dd 100644 --- a/mozilla/layout/svg/base/src/nsSVGTextPathFrame.h +++ b/mozilla/layout/svg/base/src/nsSVGTextPathFrame.h @@ -66,7 +66,7 @@ public: /** * Get the "type" of the frame * - * @see nsLayoutAtoms::svgGFrame + * @see nsGkAtoms::svgGFrame */ virtual nsIAtom* GetType() const; diff --git a/mozilla/layout/svg/base/src/nsSVGUtils.cpp b/mozilla/layout/svg/base/src/nsSVGUtils.cpp index 1b78cdf69a3..f6bb5fb9e3e 100644 --- a/mozilla/layout/svg/base/src/nsSVGUtils.cpp +++ b/mozilla/layout/svg/base/src/nsSVGUtils.cpp @@ -44,7 +44,7 @@ #include "nsIContent.h" #include "nsIDocument.h" #include "nsIFrame.h" -#include "nsLayoutAtoms.h" +#include "nsGkAtoms.h" #include "nsIURI.h" #include "nsStyleStruct.h" #include "nsIPresShell.h" diff --git a/mozilla/layout/tables/nsCellMap.cpp b/mozilla/layout/tables/nsCellMap.cpp index 7dab7710465..9cd8b51113c 100644 --- a/mozilla/layout/tables/nsCellMap.cpp +++ b/mozilla/layout/tables/nsCellMap.cpp @@ -35,7 +35,6 @@ * * ***** END LICENSE BLOCK ***** */ -#include "nsLayoutAtoms.h" #include "nsVoidArray.h" #include "nsCellMap.h" #include "nsTableFrame.h" diff --git a/mozilla/layout/tables/nsCellMap.h b/mozilla/layout/tables/nsCellMap.h index d554aaa50bc..2b648511464 100644 --- a/mozilla/layout/tables/nsCellMap.h +++ b/mozilla/layout/tables/nsCellMap.h @@ -42,6 +42,7 @@ #include "nsVoidArray.h" #include "nsTPtrArray.h" #include "nsRect.h" +#include "nsCOMPtr.h" #undef DEBUG_TABLE_CELLMAP diff --git a/mozilla/layout/tables/nsTableCellFrame.cpp b/mozilla/layout/tables/nsTableCellFrame.cpp index d85ebb4b044..5bac3f5c2e6 100644 --- a/mozilla/layout/tables/nsTableCellFrame.cpp +++ b/mozilla/layout/tables/nsTableCellFrame.cpp @@ -49,7 +49,7 @@ #include "nsIContent.h" #include "nsGenericHTMLElement.h" #include "nsHTMLParts.h" -#include "nsLayoutAtoms.h" +#include "nsGkAtoms.h" #include "nsIView.h" #include "nsIPresShell.h" #include "nsCOMPtr.h" diff --git a/mozilla/layout/tables/nsTableCellFrame.h b/mozilla/layout/tables/nsTableCellFrame.h index bf807fe3fff..ec2490db188 100644 --- a/mozilla/layout/tables/nsTableCellFrame.h +++ b/mozilla/layout/tables/nsTableCellFrame.h @@ -43,7 +43,7 @@ #include "nsTableRowFrame.h" // need to actually include this here to inline GetRowIndex #include "nsStyleContext.h" #include "nsIPercentHeightObserver.h" -#include "nsLayoutAtoms.h" +#include "nsGkAtoms.h" #include "nsLayoutUtils.h" class nsTableFrame; diff --git a/mozilla/layout/tables/nsTableColFrame.cpp b/mozilla/layout/tables/nsTableColFrame.cpp index 9d17a0fc9ce..5c2a1e30665 100644 --- a/mozilla/layout/tables/nsTableColFrame.cpp +++ b/mozilla/layout/tables/nsTableColFrame.cpp @@ -41,7 +41,7 @@ #include "nsStyleContext.h" #include "nsStyleConsts.h" #include "nsPresContext.h" -#include "nsLayoutAtoms.h" +#include "nsGkAtoms.h" #include "nsCSSRendering.h" #include "nsIContent.h" #include "nsIDOMHTMLTableColElement.h" diff --git a/mozilla/layout/tables/nsTableColFrame.h b/mozilla/layout/tables/nsTableColFrame.h index 92359566bc8..97972d5e6e9 100644 --- a/mozilla/layout/tables/nsTableColFrame.h +++ b/mozilla/layout/tables/nsTableColFrame.h @@ -94,7 +94,7 @@ public: /** * Get the "type" of the frame * - * @see nsLayoutAtoms::tableColFrame + * @see nsGkAtoms::tableColFrame */ virtual nsIAtom* GetType() const; diff --git a/mozilla/layout/tables/nsTableColGroupFrame.cpp b/mozilla/layout/tables/nsTableColGroupFrame.cpp index fd705f7df22..3b40e075fc5 100644 --- a/mozilla/layout/tables/nsTableColGroupFrame.cpp +++ b/mozilla/layout/tables/nsTableColGroupFrame.cpp @@ -42,7 +42,7 @@ #include "nsStyleConsts.h" #include "nsPresContext.h" #include "nsHTMLParts.h" -#include "nsLayoutAtoms.h" +#include "nsGkAtoms.h" #include "nsCOMPtr.h" #include "nsCSSRendering.h" #include "nsIPresShell.h" diff --git a/mozilla/layout/tables/nsTableColGroupFrame.h b/mozilla/layout/tables/nsTableColGroupFrame.h index 0e1273d8d35..51966d438a4 100644 --- a/mozilla/layout/tables/nsTableColGroupFrame.h +++ b/mozilla/layout/tables/nsTableColGroupFrame.h @@ -154,7 +154,7 @@ public: /** * Get the "type" of the frame * - * @see nsLayoutAtoms::tableColGroupFrame + * @see nsGkAtoms::tableColGroupFrame */ virtual nsIAtom* GetType() const; diff --git a/mozilla/layout/tables/nsTableFrame.cpp b/mozilla/layout/tables/nsTableFrame.cpp index 75ceaa3a7b5..47183bbeb07 100644 --- a/mozilla/layout/tables/nsTableFrame.cpp +++ b/mozilla/layout/tables/nsTableFrame.cpp @@ -61,7 +61,7 @@ #include "nsCSSRendering.h" #include "nsStyleConsts.h" #include "nsIView.h" -#include "nsLayoutAtoms.h" +#include "nsGkAtoms.h" #include "nsCSSAnonBoxes.h" #include "nsIPresShell.h" #include "nsIDOMElement.h" diff --git a/mozilla/layout/tables/nsTableFrame.h b/mozilla/layout/tables/nsTableFrame.h index 31d83e06a88..c6169b34d84 100644 --- a/mozilla/layout/tables/nsTableFrame.h +++ b/mozilla/layout/tables/nsTableFrame.h @@ -46,6 +46,7 @@ #include "nsTableColFrame.h" #include "nsTableColGroupFrame.h" #include "nsCellMap.h" +#include "nsGkAtoms.h" class nsTableCellFrame; class nsTableColFrame; @@ -68,6 +69,11 @@ enum nsPixelRound {eAlwaysRoundUp=0, eAlwaysRoundDown, eRoundUpIfHalfOrMore}; #define NS_TABLE_FRAME_OVERFLOW_LIST_INDEX 1 #define NS_TABLE_FRAME_LAST_LIST_INDEX NS_TABLE_FRAME_OVERFLOW_LIST_INDEX +static inline PRBool IS_TABLE_CELL(nsIAtom* frameType) { + return nsGkAtoms::tableCellFrame == frameType || + nsGkAtoms::bcTableCellFrame == frameType; +} + /* ============================================================================ */ /** nsTableFrame maps the inner portion of a table (everything except captions.) @@ -78,7 +84,7 @@ enum nsPixelRound {eAlwaysRoundUp=0, eAlwaysRoundDown, eRoundUpIfHalfOrMore}; * named child list: * - "ColGroup-list" which contains the col group frames * - * @see nsLayoutAtoms::colGroupList + * @see nsGkAtoms::colGroupList */ class nsTableFrame : public nsHTMLContainerFrame, public nsITableLayout { @@ -319,7 +325,7 @@ public: /** * Get the "type" of the frame * - * @see nsLayoutAtoms::tableFrame + * @see nsGkAtoms::tableFrame */ virtual nsIAtom* GetType() const; diff --git a/mozilla/layout/tables/nsTableOuterFrame.cpp b/mozilla/layout/tables/nsTableOuterFrame.cpp index 25a101fcf3f..96165463248 100644 --- a/mozilla/layout/tables/nsTableOuterFrame.cpp +++ b/mozilla/layout/tables/nsTableOuterFrame.cpp @@ -44,7 +44,7 @@ #include "nsCSSRendering.h" #include "nsIContent.h" #include "prinrval.h" -#include "nsLayoutAtoms.h" +#include "nsGkAtoms.h" #include "nsHTMLParts.h" #include "nsIPresShell.h" #ifdef ACCESSIBILITY diff --git a/mozilla/layout/tables/nsTableOuterFrame.h b/mozilla/layout/tables/nsTableOuterFrame.h index cdafb1f0cb7..2aacd525349 100644 --- a/mozilla/layout/tables/nsTableOuterFrame.h +++ b/mozilla/layout/tables/nsTableOuterFrame.h @@ -153,7 +153,7 @@ public: /** * Get the "type" of the frame * - * @see nsLayoutAtoms::tableOuterFrame + * @see nsGkAtoms::tableOuterFrame */ virtual nsIAtom* GetType() const; diff --git a/mozilla/layout/tables/nsTableRowFrame.cpp b/mozilla/layout/tables/nsTableRowFrame.cpp index 085fc2eedf1..636dc12dd0f 100644 --- a/mozilla/layout/tables/nsTableRowFrame.cpp +++ b/mozilla/layout/tables/nsTableRowFrame.cpp @@ -41,7 +41,7 @@ #include "nsPresContext.h" #include "nsStyleContext.h" #include "nsStyleConsts.h" -#include "nsLayoutAtoms.h" +#include "nsGkAtoms.h" #include "nsIContent.h" #include "nsTableFrame.h" #include "nsTableCellFrame.h" diff --git a/mozilla/layout/tables/nsTableRowFrame.h b/mozilla/layout/tables/nsTableRowFrame.h index a75cacf1065..f7c9e8cced6 100644 --- a/mozilla/layout/tables/nsTableRowFrame.h +++ b/mozilla/layout/tables/nsTableRowFrame.h @@ -116,7 +116,7 @@ public: /** * Get the "type" of the frame * - * @see nsLayoutAtoms::tableRowFrame + * @see nsGkAtoms::tableRowFrame */ virtual nsIAtom* GetType() const; diff --git a/mozilla/layout/tables/nsTableRowGroupFrame.cpp b/mozilla/layout/tables/nsTableRowGroupFrame.cpp index 926dbcb4fd6..e02d3671822 100644 --- a/mozilla/layout/tables/nsTableRowGroupFrame.cpp +++ b/mozilla/layout/tables/nsTableRowGroupFrame.cpp @@ -46,7 +46,7 @@ #include "nsStyleConsts.h" #include "nsIContent.h" #include "nsIView.h" -#include "nsLayoutAtoms.h" +#include "nsGkAtoms.h" #include "nsIPresShell.h" #include "nsCSSRendering.h" #include "nsHTMLParts.h" diff --git a/mozilla/layout/tables/nsTableRowGroupFrame.h b/mozilla/layout/tables/nsTableRowGroupFrame.h index 5daddaf0c4a..9d9d3c73cf0 100644 --- a/mozilla/layout/tables/nsTableRowGroupFrame.h +++ b/mozilla/layout/tables/nsTableRowGroupFrame.h @@ -148,7 +148,7 @@ public: /** * Get the "type" of the frame * - * @see nsLayoutAtoms::tableRowGroupFrame + * @see nsGkAtoms::tableRowGroupFrame */ virtual nsIAtom* GetType() const; diff --git a/mozilla/layout/xul/base/src/nsBox.cpp b/mozilla/layout/xul/base/src/nsBox.cpp index 922a5d880b9..2841a0e0c31 100644 --- a/mozilla/layout/xul/base/src/nsBox.cpp +++ b/mozilla/layout/xul/base/src/nsBox.cpp @@ -48,7 +48,7 @@ #include "nsIPresShell.h" #include "nsHTMLContainerFrame.h" #include "nsINameSpaceManager.h" -#include "nsLayoutAtoms.h" +#include "nsGkAtoms.h" #include "nsFrameManager.h" #include "nsIDOMNode.h" #include "nsIDOMNamedNodeMap.h" diff --git a/mozilla/layout/xul/base/src/nsBoxFrame.cpp b/mozilla/layout/xul/base/src/nsBoxFrame.cpp index cf1ca702b0a..f978947b8be 100644 --- a/mozilla/layout/xul/base/src/nsBoxFrame.cpp +++ b/mozilla/layout/xul/base/src/nsBoxFrame.cpp @@ -71,7 +71,7 @@ #include "nsCOMPtr.h" #include "nsUnitConversion.h" #include "nsINameSpaceManager.h" -#include "nsLayoutAtoms.h" +#include "nsGkAtoms.h" #include "nsIContent.h" #include "nsSpaceManager.h" #include "nsHTMLParts.h" diff --git a/mozilla/layout/xul/base/src/nsDocElementBoxFrame.cpp b/mozilla/layout/xul/base/src/nsDocElementBoxFrame.cpp index 23c8fa42430..e2c3dffad4e 100644 --- a/mozilla/layout/xul/base/src/nsDocElementBoxFrame.cpp +++ b/mozilla/layout/xul/base/src/nsDocElementBoxFrame.cpp @@ -49,7 +49,7 @@ #include "nsIDOMEvent.h" #include "nsStyleConsts.h" #include "nsIViewManager.h" -#include "nsLayoutAtoms.h" +#include "nsGkAtoms.h" #include "nsIEventStateManager.h" #include "nsIDeviceContext.h" #include "nsIScrollableView.h" diff --git a/mozilla/layout/xul/base/src/nsImageBoxFrame.cpp b/mozilla/layout/xul/base/src/nsImageBoxFrame.cpp index 6c839e23d11..7e38b8eed48 100644 --- a/mozilla/layout/xul/base/src/nsImageBoxFrame.cpp +++ b/mozilla/layout/xul/base/src/nsImageBoxFrame.cpp @@ -45,7 +45,7 @@ #include "nsImageBoxFrame.h" #include "nsIDeviceContext.h" #include "nsIFontMetrics.h" -#include "nsLayoutAtoms.h" +#include "nsGkAtoms.h" #include "nsStyleContext.h" #include "nsStyleConsts.h" #include "nsCOMPtr.h" diff --git a/mozilla/layout/xul/base/src/nsMenuBarListener.cpp b/mozilla/layout/xul/base/src/nsMenuBarListener.cpp index 14ea7eb3943..eb259bcac72 100644 --- a/mozilla/layout/xul/base/src/nsMenuBarListener.cpp +++ b/mozilla/layout/xul/base/src/nsMenuBarListener.cpp @@ -55,7 +55,6 @@ #include "nsIContent.h" #include "nsIDOMNode.h" #include "nsIDOMElement.h" -#include "nsXULAtoms.h" #include "nsIEventStateManager.h" diff --git a/mozilla/layout/xul/base/src/nsMenuFrame.cpp b/mozilla/layout/xul/base/src/nsMenuFrame.cpp index 39a409e87ae..385c2e1723c 100644 --- a/mozilla/layout/xul/base/src/nsMenuFrame.cpp +++ b/mozilla/layout/xul/base/src/nsMenuFrame.cpp @@ -39,7 +39,7 @@ * * ***** END LICENSE BLOCK ***** */ -#include "nsLayoutAtoms.h" +#include "nsGkAtoms.h" #include "nsHTMLParts.h" #include "nsMenuFrame.h" #include "nsBoxFrame.h" diff --git a/mozilla/layout/xul/base/src/nsMenuListener.cpp b/mozilla/layout/xul/base/src/nsMenuListener.cpp index b9814dc67ce..72a02b9fe95 100644 --- a/mozilla/layout/xul/base/src/nsMenuListener.cpp +++ b/mozilla/layout/xul/base/src/nsMenuListener.cpp @@ -56,7 +56,6 @@ #include "nsIContent.h" #include "nsIDOMNode.h" #include "nsIDOMElement.h" -#include "nsXULAtoms.h" #include "nsIEventStateManager.h" diff --git a/mozilla/layout/xul/base/src/nsPopupSetFrame.cpp b/mozilla/layout/xul/base/src/nsPopupSetFrame.cpp index a365cfd9e84..884d4c8dfa5 100644 --- a/mozilla/layout/xul/base/src/nsPopupSetFrame.cpp +++ b/mozilla/layout/xul/base/src/nsPopupSetFrame.cpp @@ -38,7 +38,7 @@ * * ***** END LICENSE BLOCK ***** */ -#include "nsLayoutAtoms.h" +#include "nsGkAtoms.h" #include "nsPopupSetFrame.h" #include "nsIMenuParent.h" #include "nsMenuFrame.h" diff --git a/mozilla/layout/xul/base/src/nsRootBoxFrame.cpp b/mozilla/layout/xul/base/src/nsRootBoxFrame.cpp index 4e27d5fde91..aee054f9c24 100644 --- a/mozilla/layout/xul/base/src/nsRootBoxFrame.cpp +++ b/mozilla/layout/xul/base/src/nsRootBoxFrame.cpp @@ -49,7 +49,7 @@ #include "nsIDOMEvent.h" #include "nsStyleConsts.h" #include "nsIViewManager.h" -#include "nsLayoutAtoms.h" +#include "nsGkAtoms.h" #include "nsIEventStateManager.h" #include "nsIDeviceContext.h" #include "nsIScrollableView.h" diff --git a/mozilla/layout/xul/base/src/nsScrollBoxFrame.cpp b/mozilla/layout/xul/base/src/nsScrollBoxFrame.cpp index edf11a03bdc..aed5553a0dd 100644 --- a/mozilla/layout/xul/base/src/nsScrollBoxFrame.cpp +++ b/mozilla/layout/xul/base/src/nsScrollBoxFrame.cpp @@ -40,7 +40,7 @@ #include "nsCOMPtr.h" #include "nsPresContext.h" -#include "nsLayoutAtoms.h" +#include "nsGkAtoms.h" #include "nsGUIEvent.h" #include "nsButtonBoxFrame.h" #include "nsITimer.h" diff --git a/mozilla/layout/xul/base/src/nsSprocketLayout.cpp b/mozilla/layout/xul/base/src/nsSprocketLayout.cpp index 6dab93bd4c6..cd828ff6064 100644 --- a/mozilla/layout/xul/base/src/nsSprocketLayout.cpp +++ b/mozilla/layout/xul/base/src/nsSprocketLayout.cpp @@ -54,8 +54,6 @@ #include "nsIPresShell.h" #include "nsHTMLContainerFrame.h" #include "nsBoxFrame.h" -#include "nsHTMLAtoms.h" -#include "nsXULAtoms.h" #include "nsBoxFrame.h" nsIBoxLayout* nsSprocketLayout::gInstance = nsnull; diff --git a/mozilla/layout/xul/base/src/nsStackFrame.cpp b/mozilla/layout/xul/base/src/nsStackFrame.cpp index 44844af8e45..a0193443336 100644 --- a/mozilla/layout/xul/base/src/nsStackFrame.cpp +++ b/mozilla/layout/xul/base/src/nsStackFrame.cpp @@ -48,8 +48,6 @@ #include "nsIContent.h" #include "nsCOMPtr.h" #include "nsUnitConversion.h" -#include "nsXULAtoms.h" -#include "nsHTMLAtoms.h" #include "nsHTMLParts.h" #include "nsIPresShell.h" #include "nsCSSRendering.h" diff --git a/mozilla/toolkit/components/typeaheadfind/src/nsTypeAheadFind.cpp b/mozilla/toolkit/components/typeaheadfind/src/nsTypeAheadFind.cpp index 859879cc502..a4e246143d4 100755 --- a/mozilla/toolkit/components/typeaheadfind/src/nsTypeAheadFind.cpp +++ b/mozilla/toolkit/components/typeaheadfind/src/nsTypeAheadFind.cpp @@ -93,7 +93,6 @@ #include "nsINameSpaceManager.h" #include "nsIWindowWatcher.h" #include "nsIObserverService.h" -#include "nsLayoutAtoms.h" #include "nsTypeAheadFind.h" diff --git a/mozilla/widget/src/xpwidgets/nsWidgetAtoms.h b/mozilla/widget/src/xpwidgets/nsWidgetAtoms.h index 772a70da7a0..945d6fa0dee 100644 --- a/mozilla/widget/src/xpwidgets/nsWidgetAtoms.h +++ b/mozilla/widget/src/xpwidgets/nsWidgetAtoms.h @@ -47,7 +47,7 @@ * is created when the first xul content object is created, and * destroyed when the last such content object is destroyed. * - * It's here because we cannot use nsHTMLAtoms or nsXULAtoms from + * It's here because we cannot use nsGkAtoms from * the Widget shlb. They are components are we're not. */ class nsWidgetAtoms { @@ -68,4 +68,4 @@ public: }; -#endif /* nsXULAtoms_h___ */ +#endif /* nsWidgetAtoms_h___ */