Index: mozilla/content/base/src/nsContentList.cpp
===================================================================
RCS file: /cvsroot/mozilla/content/base/src/nsContentList.cpp,v
retrieving revision 3.96
diff -u -p -0 -r3.96 nsContentList.cpp
--- mozilla/content/base/src/nsContentList.cpp 30 Sep 2006 15:12:47 -0000 3.96
+++ mozilla/content/base/src/nsContentList.cpp 3 Oct 2006 22:56:31 -0000
@@ -54,2 +54 @@
-#include "nsLayoutAtoms.h"
-#include "nsHTMLAtoms.h" // XXX until atoms get factored into nsLayoutAtoms
+#include "nsGkAtoms.h"
@@ -305 +304 @@ nsContentList::nsContentList(nsINode* aR
- if (nsLayoutAtoms::_asterix == mMatchAtom) {
+ if (nsGkAtoms::_asterix == mMatchAtom) {
@@ -415 +414 @@ nsContentList::NamedItem(const nsAString
- (content->AttrValueIs(kNameSpaceID_None, nsHTMLAtoms::name,
+ (content->AttrValueIs(kNameSpaceID_None, nsGkAtoms::name,
@@ -417 +416 @@ nsContentList::NamedItem(const nsAString
- content->AttrValueIs(kNameSpaceID_None, nsHTMLAtoms::id,
+ content->AttrValueIs(kNameSpaceID_None, nsGkAtoms::id,
Index: mozilla/content/base/src/nsContentUtils.cpp
===================================================================
RCS file: /cvsroot/mozilla/content/base/src/nsContentUtils.cpp,v
retrieving revision 1.184
diff -u -p -0 -r1.184 nsContentUtils.cpp
--- mozilla/content/base/src/nsContentUtils.cpp 3 Oct 2006 02:22:21 -0000 1.184
+++ mozilla/content/base/src/nsContentUtils.cpp 3 Oct 2006 22:56:32 -0000
@@ -93 +92,0 @@
-#include "nsHTMLAtoms.h"
@@ -95 +93,0 @@
-#include "nsLayoutAtoms.h"
@@ -135 +132,0 @@ static NS_DEFINE_CID(kXTFServiceCID, NS_
-#include "nsXULAtoms.h"
@@ -1716 +1713 @@ nsContentUtils::GenerateStateKey(nsICont
- aContent->GetAttr(kNameSpaceID_None, nsHTMLAtoms::name, name);
+ aContent->GetAttr(kNameSpaceID_None, nsGkAtoms::name, name);
@@ -1786 +1783 @@ nsContentUtils::BelongsInForm(nsIDOMHTML
- if (content->Tag() == nsHTMLAtoms::form &&
+ if (content->Tag() == nsGkAtoms::form &&
@@ -1891 +1888 @@ nsContentUtils::LookupNamespaceURI(nsICo
- name = nsLayoutAtoms::xmlns;
+ name = nsGkAtoms::xmlns;
@@ -2205 +2202 @@ nsContentUtils::GetXLinkURI(nsIContent*
- if (aContent->GetAttr(kNameSpaceID_XLink, nsHTMLAtoms::href, value)) {
+ if (aContent->GetAttr(kNameSpaceID_XLink, nsGkAtoms::href, value)) {
@@ -2339 +2336 @@ nsContentUtils::GetEventArgNames(PRInt32
- if (aEventName == nsLayoutAtoms::onerror) {
+ if (aEventName == nsGkAtoms::onerror) {
@@ -2930 +2927 @@ nsContentUtils::HasNonEmptyAttr(nsIConte
- static nsIContent::AttrValuesArray strings[] = {&nsXULAtoms::_empty, nsnull};
+ static nsIContent::AttrValuesArray strings[] = {&nsGkAtoms::_empty, nsnull};
Index: mozilla/content/base/src/nsDOMDocumentType.cpp
===================================================================
RCS file: /cvsroot/mozilla/content/base/src/nsDOMDocumentType.cpp,v
retrieving revision 1.39
diff -u -p -0 -r1.39 nsDOMDocumentType.cpp
--- mozilla/content/base/src/nsDOMDocumentType.cpp 5 Sep 2006 10:22:52 -0000 1.39
+++ mozilla/content/base/src/nsDOMDocumentType.cpp 3 Oct 2006 22:56:32 -0000
@@ -45 +44,0 @@
-#include "nsLayoutAtoms.h"
@@ -51 +49,0 @@
-#include "nsLayoutAtoms.h"
@@ -87 +85 @@ NS_NewDOMDocumentType(nsIDOMDocumentType
- rv = nimgr->GetNodeInfo(nsLayoutAtoms::documentTypeNodeName, nsnull,
+ rv = nimgr->GetNodeInfo(nsGkAtoms::documentTypeNodeName, nsnull,
Index: mozilla/content/base/src/nsDocument.cpp
===================================================================
RCS file: /cvsroot/mozilla/content/base/src/nsDocument.cpp,v
retrieving revision 3.683
diff -u -p -0 -r3.683 nsDocument.cpp
--- mozilla/content/base/src/nsDocument.cpp 25 Sep 2006 22:50:01 -0000 3.683
+++ mozilla/content/base/src/nsDocument.cpp 3 Oct 2006 22:56:34 -0000
@@ -113 +112,0 @@
-#include "nsXULAtoms.h"
@@ -126 +124,0 @@ static NS_DEFINE_CID(kDOMEventGroupCID,
-#include "nsHTMLAtoms.h"
@@ -1495 +1493 @@ nsDocument::SetHeaderData(nsIAtom* aHead
- if (aHeaderField == nsHTMLAtoms::headerContentLanguage) {
+ if (aHeaderField == nsGkAtoms::headerContentLanguage) {
@@ -1500 +1498 @@ nsDocument::SetHeaderData(nsIAtom* aHead
- if (aHeaderField == nsHTMLAtoms::headerContentScriptType) {
+ if (aHeaderField == nsGkAtoms::headerContentScriptType) {
@@ -1515 +1513 @@ nsDocument::SetHeaderData(nsIAtom* aHead
- if (aHeaderField == nsHTMLAtoms::headerDefaultStyle) {
+ if (aHeaderField == nsGkAtoms::headerDefaultStyle) {
@@ -1542 +1540 @@ nsDocument::SetHeaderData(nsIAtom* aHead
- if (aHeaderField == nsHTMLAtoms::refresh) {
+ if (aHeaderField == nsGkAtoms::refresh) {
@@ -3212,3 +3210,3 @@ nsDocument::GetBoxObjectFor(nsIDOMElemen
- if (tag == nsXULAtoms::browser ||
- tag == nsXULAtoms::editor ||
- tag == nsXULAtoms::iframe)
+ if (tag == nsGkAtoms::browser ||
+ tag == nsGkAtoms::editor ||
+ tag == nsGkAtoms::iframe)
@@ -3216 +3214 @@ nsDocument::GetBoxObjectFor(nsIDOMElemen
- else if (tag == nsXULAtoms::menu)
+ else if (tag == nsGkAtoms::menu)
@@ -3218,3 +3216,3 @@ nsDocument::GetBoxObjectFor(nsIDOMElemen
- else if (tag == nsXULAtoms::popup ||
- tag == nsXULAtoms::menupopup ||
- tag == nsXULAtoms::tooltip)
+ else if (tag == nsGkAtoms::popup ||
+ tag == nsGkAtoms::menupopup ||
+ tag == nsGkAtoms::tooltip)
@@ -3222 +3220 @@ nsDocument::GetBoxObjectFor(nsIDOMElemen
- else if (tag == nsXULAtoms::tree)
+ else if (tag == nsGkAtoms::tree)
@@ -3224 +3222 @@ nsDocument::GetBoxObjectFor(nsIDOMElemen
- else if (tag == nsXULAtoms::listbox)
+ else if (tag == nsGkAtoms::listbox)
@@ -3226 +3224 @@ nsDocument::GetBoxObjectFor(nsIDOMElemen
- else if (tag == nsXULAtoms::scrollbox)
+ else if (tag == nsGkAtoms::scrollbox)
@@ -4710 +4708 @@ nsDocument::RetrieveRelevantHeaders(nsIC
- SetHeaderData(nsHTMLAtoms::headerContentDisposition,
+ SetHeaderData(nsGkAtoms::headerContentDisposition,
@@ -5175 +5173 @@ nsDocument::OnPageShow(PRBool aPersisted
- nsHTMLAtoms::link,
+ nsGkAtoms::link,
@@ -5200 +5198 @@ nsDocument::OnPageHide(PRBool aPersisted
- nsHTMLAtoms::link,
+ nsGkAtoms::link,
Index: mozilla/content/base/src/nsDocumentFragment.cpp
===================================================================
RCS file: /cvsroot/mozilla/content/base/src/nsDocumentFragment.cpp,v
retrieving revision 1.94
diff -u -p -0 -r1.94 nsDocumentFragment.cpp
--- mozilla/content/base/src/nsDocumentFragment.cpp 15 Sep 2006 19:54:44 -0000 1.94
+++ mozilla/content/base/src/nsDocumentFragment.cpp 3 Oct 2006 22:56:34 -0000
@@ -54 +53,0 @@
-#include "nsLayoutAtoms.h"
@@ -169 +168 @@ NS_NewDocumentFragment(nsIDOMDocumentFra
- aNodeInfoManager->GetNodeInfo(nsLayoutAtoms::documentFragmentNodeName,
+ aNodeInfoManager->GetNodeInfo(nsGkAtoms::documentFragmentNodeName,
Index: mozilla/content/base/src/nsGenericDOMDataNode.cpp
===================================================================
RCS file: /cvsroot/mozilla/content/base/src/nsGenericDOMDataNode.cpp,v
retrieving revision 3.208
diff -u -p -0 -r3.208 nsGenericDOMDataNode.cpp
--- mozilla/content/base/src/nsGenericDOMDataNode.cpp 16 Sep 2006 17:15:37 -0000 3.208
+++ mozilla/content/base/src/nsGenericDOMDataNode.cpp 3 Oct 2006 22:56:34 -0000
@@ -62 +61,0 @@
-#include "nsLayoutAtoms.h"
@@ -646 +645 @@ nsGenericDOMDataNode::BindToTree(nsIDocu
- if (name == nsLayoutAtoms::textTagName) {
+ if (name == nsGkAtoms::textTagName) {
@@ -650 +649 @@ nsGenericDOMDataNode::BindToTree(nsIDocu
- else if (name == nsLayoutAtoms::commentTagName) {
+ else if (name == nsGkAtoms::commentTagName) {
Index: mozilla/content/base/src/nsGenericElement.cpp
===================================================================
RCS file: /cvsroot/mozilla/content/base/src/nsGenericElement.cpp,v
retrieving revision 3.507
diff -u -p -0 -r3.507 nsGenericElement.cpp
--- mozilla/content/base/src/nsGenericElement.cpp 3 Oct 2006 17:52:22 -0000 3.507
+++ mozilla/content/base/src/nsGenericElement.cpp 3 Oct 2006 22:56:35 -0000
@@ -98,2 +97,0 @@
-#include "nsLayoutAtoms.h"
-#include "nsHTMLAtoms.h"
@@ -445 +443 @@ nsNode3Tearoff::AreNodesEqual(nsIContent
- if (aContent1->Tag() == nsLayoutAtoms::documentTypeNodeName) {
+ if (aContent1->Tag() == nsGkAtoms::documentTypeNodeName) {
@@ -613 +611 @@ nsNode3Tearoff::LookupPrefix(const nsASt
- if (name->LocalName() != nsLayoutAtoms::xmlns) {
+ if (name->LocalName() != nsGkAtoms::xmlns) {
@@ -1893 +1891 @@ nsGenericElement::UnbindFromTree(PRBool
- if (HasAttr(kNameSpaceID_XLink, nsHTMLAtoms::href)) {
+ if (HasAttr(kNameSpaceID_XLink, nsGkAtoms::href)) {
@@ -2138 +2136 @@ nsGenericElement::GetBaseURI() const
- GetAttr(kNameSpaceID_XML, nsHTMLAtoms::base, value);
+ GetAttr(kNameSpaceID_XML, nsGkAtoms::base, value);
@@ -3149 +3147 @@ nsGenericElement::SetAttr(PRInt32 aNames
- if (kNameSpaceID_XLink == aNamespaceID && nsHTMLAtoms::href == aName) {
+ if (kNameSpaceID_XLink == aNamespaceID && nsGkAtoms::href == aName) {
@@ -3282 +3280 @@ nsGenericElement::SetAttrAndNotify(PRInt
- aName == nsHTMLAtoms::event && mNodeInfo->GetDocument()) {
+ aName == nsGkAtoms::event && mNodeInfo->GetDocument()) {
@@ -3442 +3440 @@ nsGenericElement::UnsetAttr(PRInt32 aNam
- if (kNameSpaceID_XLink == aNameSpaceID && nsHTMLAtoms::href == aName) {
+ if (kNameSpaceID_XLink == aNameSpaceID && nsGkAtoms::href == aName) {
Index: mozilla/content/base/src/nsHTMLContentSerializer.cpp
===================================================================
RCS file: /cvsroot/mozilla/content/base/src/nsHTMLContentSerializer.cpp,v
retrieving revision 1.105
diff -u -p -0 -r1.105 nsHTMLContentSerializer.cpp
--- mozilla/content/base/src/nsHTMLContentSerializer.cpp 6 Apr 2006 20:55:25 -0000 1.105
+++ mozilla/content/base/src/nsHTMLContentSerializer.cpp 3 Oct 2006 22:56:36 -0000
@@ -58,2 +57,0 @@
-#include "nsLayoutAtoms.h"
-#include "nsHTMLAtoms.h"
@@ -443,2 +441,2 @@ nsHTMLContentSerializer::IsJavaScript(ns
- if (aAttrNameAtom == nsHTMLAtoms::href ||
- aAttrNameAtom == nsHTMLAtoms::src) {
+ if (aAttrNameAtom == nsGkAtoms::href ||
+ aAttrNameAtom == nsGkAtoms::src) {
@@ -459,18 +457,18 @@ nsHTMLContentSerializer::IsJavaScript(ns
- (aAttrNameAtom == nsLayoutAtoms::onblur) || (aAttrNameAtom == nsLayoutAtoms::onchange)
- || (aAttrNameAtom == nsLayoutAtoms::onclick) || (aAttrNameAtom == nsLayoutAtoms::ondblclick)
- || (aAttrNameAtom == nsLayoutAtoms::onfocus) || (aAttrNameAtom == nsLayoutAtoms::onkeydown)
- || (aAttrNameAtom == nsLayoutAtoms::onkeypress) || (aAttrNameAtom == nsLayoutAtoms::onkeyup)
- || (aAttrNameAtom == nsLayoutAtoms::onload) || (aAttrNameAtom == nsLayoutAtoms::onmousedown)
- || (aAttrNameAtom == nsLayoutAtoms::onpageshow) || (aAttrNameAtom == nsLayoutAtoms::onpagehide)
- || (aAttrNameAtom == nsLayoutAtoms::onmousemove) || (aAttrNameAtom == nsLayoutAtoms::onmouseout)
- || (aAttrNameAtom == nsLayoutAtoms::onmouseover) || (aAttrNameAtom == nsLayoutAtoms::onmouseup)
- || (aAttrNameAtom == nsLayoutAtoms::onreset) || (aAttrNameAtom == nsLayoutAtoms::onselect)
- || (aAttrNameAtom == nsLayoutAtoms::onsubmit) || (aAttrNameAtom == nsLayoutAtoms::onunload)
- || (aAttrNameAtom == nsLayoutAtoms::onabort) || (aAttrNameAtom == nsLayoutAtoms::onerror)
- || (aAttrNameAtom == nsLayoutAtoms::onpaint) || (aAttrNameAtom == nsLayoutAtoms::onresize)
- || (aAttrNameAtom == nsLayoutAtoms::onscroll) || (aAttrNameAtom == nsLayoutAtoms::onbroadcast)
- || (aAttrNameAtom == nsLayoutAtoms::onclose) || (aAttrNameAtom == nsLayoutAtoms::oncontextmenu)
- || (aAttrNameAtom == nsLayoutAtoms::oncommand) || (aAttrNameAtom == nsLayoutAtoms::oncommandupdate)
- || (aAttrNameAtom == nsLayoutAtoms::ondragdrop) || (aAttrNameAtom == nsLayoutAtoms::ondragenter)
- || (aAttrNameAtom == nsLayoutAtoms::ondragexit) || (aAttrNameAtom == nsLayoutAtoms::ondraggesture)
- || (aAttrNameAtom == nsLayoutAtoms::ondragover) || (aAttrNameAtom == nsLayoutAtoms::oninput);
+ (aAttrNameAtom == nsGkAtoms::onblur) || (aAttrNameAtom == nsGkAtoms::onchange)
+ || (aAttrNameAtom == nsGkAtoms::onclick) || (aAttrNameAtom == nsGkAtoms::ondblclick)
+ || (aAttrNameAtom == nsGkAtoms::onfocus) || (aAttrNameAtom == nsGkAtoms::onkeydown)
+ || (aAttrNameAtom == nsGkAtoms::onkeypress) || (aAttrNameAtom == nsGkAtoms::onkeyup)
+ || (aAttrNameAtom == nsGkAtoms::onload) || (aAttrNameAtom == nsGkAtoms::onmousedown)
+ || (aAttrNameAtom == nsGkAtoms::onpageshow) || (aAttrNameAtom == nsGkAtoms::onpagehide)
+ || (aAttrNameAtom == nsGkAtoms::onmousemove) || (aAttrNameAtom == nsGkAtoms::onmouseout)
+ || (aAttrNameAtom == nsGkAtoms::onmouseover) || (aAttrNameAtom == nsGkAtoms::onmouseup)
+ || (aAttrNameAtom == nsGkAtoms::onreset) || (aAttrNameAtom == nsGkAtoms::onselect)
+ || (aAttrNameAtom == nsGkAtoms::onsubmit) || (aAttrNameAtom == nsGkAtoms::onunload)
+ || (aAttrNameAtom == nsGkAtoms::onabort) || (aAttrNameAtom == nsGkAtoms::onerror)
+ || (aAttrNameAtom == nsGkAtoms::onpaint) || (aAttrNameAtom == nsGkAtoms::onresize)
+ || (aAttrNameAtom == nsGkAtoms::onscroll) || (aAttrNameAtom == nsGkAtoms::onbroadcast)
+ || (aAttrNameAtom == nsGkAtoms::onclose) || (aAttrNameAtom == nsGkAtoms::oncontextmenu)
+ || (aAttrNameAtom == nsGkAtoms::oncommand) || (aAttrNameAtom == nsGkAtoms::oncommandupdate)
+ || (aAttrNameAtom == nsGkAtoms::ondragdrop) || (aAttrNameAtom == nsGkAtoms::ondragenter)
+ || (aAttrNameAtom == nsGkAtoms::ondragexit) || (aAttrNameAtom == nsGkAtoms::ondraggesture)
+ || (aAttrNameAtom == nsGkAtoms::ondragover) || (aAttrNameAtom == nsGkAtoms::oninput);
@@ -485 +483 @@ nsHTMLContentSerializer::EscapeURI(const
- if (IsJavaScript(nsHTMLAtoms::href, aURI)) {
+ if (IsJavaScript(nsGkAtoms::href, aURI)) {
@@ -579 +577 @@ nsHTMLContentSerializer::SerializeAttrib
- if (aTagName == nsHTMLAtoms::br && attrName == nsHTMLAtoms::type &&
+ if (aTagName == nsGkAtoms::br && attrName == nsGkAtoms::type &&
@@ -584,2 +582,2 @@ nsHTMLContentSerializer::SerializeAttrib
- if (mIsCopying && mIsFirstChildOfOL && (aTagName == nsHTMLAtoms::li) &&
- (attrName == nsHTMLAtoms::value)){
+ if (mIsCopying && mIsFirstChildOfOL && (aTagName == nsGkAtoms::li) &&
+ (attrName == nsGkAtoms::value)){
@@ -591,2 +589,2 @@ nsHTMLContentSerializer::SerializeAttrib
- if (((attrName == nsHTMLAtoms::href) ||
- (attrName == nsHTMLAtoms::src))) {
+ if (((attrName == nsGkAtoms::href) ||
+ (attrName == nsGkAtoms::src))) {
@@ -651 +649 @@ nsHTMLContentSerializer::AppendElementSt
- nsLayoutAtoms::mozdirty);
+ nsGkAtoms::mozdirty);
@@ -655 +653 @@ nsHTMLContentSerializer::AppendElementSt
- if (name == nsHTMLAtoms::br && mPreLevel > 0
+ if (name == nsGkAtoms::br && mPreLevel > 0
@@ -663 +661 @@ nsHTMLContentSerializer::AppendElementSt
- if (name == nsHTMLAtoms::body) {
+ if (name == nsGkAtoms::body) {
@@ -686,3 +684,3 @@ nsHTMLContentSerializer::AppendElementSt
- if (name == nsHTMLAtoms::pre ||
- name == nsHTMLAtoms::script ||
- name == nsHTMLAtoms::style) {
+ if (name == nsGkAtoms::pre ||
+ name == nsGkAtoms::script ||
+ name == nsGkAtoms::style) {
@@ -700 +698 @@ nsHTMLContentSerializer::AppendElementSt
- if (mIsCopying && name == nsHTMLAtoms::ol){
+ if (mIsCopying && name == nsGkAtoms::ol){
@@ -722 +720 @@ nsHTMLContentSerializer::AppendElementSt
- if (mIsCopying && name == nsHTMLAtoms::li) {
+ if (mIsCopying && name == nsGkAtoms::li) {
@@ -742,4 +740,4 @@ nsHTMLContentSerializer::AppendElementSt
- if (name == nsHTMLAtoms::script ||
- name == nsHTMLAtoms::style ||
- name == nsHTMLAtoms::noscript ||
- name == nsHTMLAtoms::noframes) {
+ if (name == nsGkAtoms::script ||
+ name == nsGkAtoms::style ||
+ name == nsGkAtoms::noscript ||
+ name == nsGkAtoms::noframes) {
@@ -762 +760 @@ nsHTMLContentSerializer::AppendElementEn
- nsLayoutAtoms::mozdirty);
+ nsGkAtoms::mozdirty);
@@ -766 +764 @@ nsHTMLContentSerializer::AppendElementEn
- if (name == nsHTMLAtoms::script) {
+ if (name == nsGkAtoms::script) {
@@ -778,3 +776,3 @@ nsHTMLContentSerializer::AppendElementEn
- if (name == nsHTMLAtoms::pre ||
- name == nsHTMLAtoms::script ||
- name == nsHTMLAtoms::style) {
+ if (name == nsGkAtoms::pre ||
+ name == nsGkAtoms::script ||
+ name == nsGkAtoms::style) {
@@ -784 +782 @@ nsHTMLContentSerializer::AppendElementEn
- if (mIsCopying && (name == nsHTMLAtoms::ol)){
+ if (mIsCopying && (name == nsGkAtoms::ol)){
@@ -797 +795 @@ nsHTMLContentSerializer::AppendElementEn
- if (parserService && (name != nsHTMLAtoms::style)) {
+ if (parserService && (name != nsGkAtoms::style)) {
@@ -1046,8 +1044,8 @@ nsHTMLContentSerializer::LineBreakBefore
- if (aName == nsHTMLAtoms::title ||
- aName == nsHTMLAtoms::meta ||
- aName == nsHTMLAtoms::link ||
- aName == nsHTMLAtoms::style ||
- aName == nsHTMLAtoms::select ||
- aName == nsHTMLAtoms::option ||
- aName == nsHTMLAtoms::script ||
- aName == nsHTMLAtoms::html) {
+ if (aName == nsGkAtoms::title ||
+ aName == nsGkAtoms::meta ||
+ aName == nsGkAtoms::link ||
+ aName == nsGkAtoms::style ||
+ aName == nsGkAtoms::select ||
+ aName == nsGkAtoms::option ||
+ aName == nsGkAtoms::script ||
+ aName == nsGkAtoms::html) {
@@ -1078,17 +1076,17 @@ nsHTMLContentSerializer::LineBreakAfterO
- if ((aName == nsHTMLAtoms::html) ||
- (aName == nsHTMLAtoms::head) ||
- (aName == nsHTMLAtoms::body) ||
- (aName == nsHTMLAtoms::ul) ||
- (aName == nsHTMLAtoms::ol) ||
- (aName == nsHTMLAtoms::dl) ||
- (aName == nsHTMLAtoms::table) ||
- (aName == nsHTMLAtoms::tbody) ||
- (aName == nsHTMLAtoms::tr) ||
- (aName == nsHTMLAtoms::br) ||
- (aName == nsHTMLAtoms::meta) ||
- (aName == nsHTMLAtoms::link) ||
- (aName == nsHTMLAtoms::script) ||
- (aName == nsHTMLAtoms::select) ||
- (aName == nsHTMLAtoms::map) ||
- (aName == nsHTMLAtoms::area) ||
- (aName == nsHTMLAtoms::style)) {
+ if ((aName == nsGkAtoms::html) ||
+ (aName == nsGkAtoms::head) ||
+ (aName == nsGkAtoms::body) ||
+ (aName == nsGkAtoms::ul) ||
+ (aName == nsGkAtoms::ol) ||
+ (aName == nsGkAtoms::dl) ||
+ (aName == nsGkAtoms::table) ||
+ (aName == nsGkAtoms::tbody) ||
+ (aName == nsGkAtoms::tr) ||
+ (aName == nsGkAtoms::br) ||
+ (aName == nsGkAtoms::meta) ||
+ (aName == nsGkAtoms::link) ||
+ (aName == nsGkAtoms::script) ||
+ (aName == nsGkAtoms::select) ||
+ (aName == nsGkAtoms::map) ||
+ (aName == nsGkAtoms::area) ||
+ (aName == nsGkAtoms::style)) {
@@ -1110,9 +1108,9 @@ nsHTMLContentSerializer::LineBreakBefore
- if ((aName == nsHTMLAtoms::html) ||
- (aName == nsHTMLAtoms::head) ||
- (aName == nsHTMLAtoms::body) ||
- (aName == nsHTMLAtoms::ul) ||
- (aName == nsHTMLAtoms::ol) ||
- (aName == nsHTMLAtoms::dl) ||
- (aName == nsHTMLAtoms::select) ||
- (aName == nsHTMLAtoms::table) ||
- (aName == nsHTMLAtoms::tbody)) {
+ if ((aName == nsGkAtoms::html) ||
+ (aName == nsGkAtoms::head) ||
+ (aName == nsGkAtoms::body) ||
+ (aName == nsGkAtoms::ul) ||
+ (aName == nsGkAtoms::ol) ||
+ (aName == nsGkAtoms::dl) ||
+ (aName == nsGkAtoms::select) ||
+ (aName == nsGkAtoms::table) ||
+ (aName == nsGkAtoms::tbody)) {
@@ -1134,17 +1132,17 @@ nsHTMLContentSerializer::LineBreakAfterC
- if ((aName == nsHTMLAtoms::html) ||
- (aName == nsHTMLAtoms::head) ||
- (aName == nsHTMLAtoms::body) ||
- (aName == nsHTMLAtoms::tr) ||
- (aName == nsHTMLAtoms::th) ||
- (aName == nsHTMLAtoms::td) ||
- (aName == nsHTMLAtoms::pre) ||
- (aName == nsHTMLAtoms::title) ||
- (aName == nsHTMLAtoms::li) ||
- (aName == nsHTMLAtoms::dt) ||
- (aName == nsHTMLAtoms::dd) ||
- (aName == nsHTMLAtoms::blockquote) ||
- (aName == nsHTMLAtoms::select) ||
- (aName == nsHTMLAtoms::option) ||
- (aName == nsHTMLAtoms::p) ||
- (aName == nsHTMLAtoms::map) ||
- (aName == nsHTMLAtoms::div)) {
+ if ((aName == nsGkAtoms::html) ||
+ (aName == nsGkAtoms::head) ||
+ (aName == nsGkAtoms::body) ||
+ (aName == nsGkAtoms::tr) ||
+ (aName == nsGkAtoms::th) ||
+ (aName == nsGkAtoms::td) ||
+ (aName == nsGkAtoms::pre) ||
+ (aName == nsGkAtoms::title) ||
+ (aName == nsGkAtoms::li) ||
+ (aName == nsGkAtoms::dt) ||
+ (aName == nsGkAtoms::dd) ||
+ (aName == nsGkAtoms::blockquote) ||
+ (aName == nsGkAtoms::select) ||
+ (aName == nsGkAtoms::option) ||
+ (aName == nsGkAtoms::p) ||
+ (aName == nsGkAtoms::map) ||
+ (aName == nsGkAtoms::div)) {
@@ -1177,13 +1175,13 @@ nsHTMLContentSerializer::StartIndentatio
- if ((aName == nsHTMLAtoms::head) ||
- (aName == nsHTMLAtoms::table) ||
- (aName == nsHTMLAtoms::tr) ||
- (aName == nsHTMLAtoms::ul) ||
- (aName == nsHTMLAtoms::ol) ||
- (aName == nsHTMLAtoms::dl) ||
- (aName == nsHTMLAtoms::tbody) ||
- (aName == nsHTMLAtoms::form) ||
- (aName == nsHTMLAtoms::frameset) ||
- (aName == nsHTMLAtoms::blockquote) ||
- (aName == nsHTMLAtoms::li) ||
- (aName == nsHTMLAtoms::dt) ||
- (aName == nsHTMLAtoms::dd)) {
+ if ((aName == nsGkAtoms::head) ||
+ (aName == nsGkAtoms::table) ||
+ (aName == nsGkAtoms::tr) ||
+ (aName == nsGkAtoms::ul) ||
+ (aName == nsGkAtoms::ol) ||
+ (aName == nsGkAtoms::dl) ||
+ (aName == nsGkAtoms::tbody) ||
+ (aName == nsGkAtoms::form) ||
+ (aName == nsGkAtoms::frameset) ||
+ (aName == nsGkAtoms::blockquote) ||
+ (aName == nsGkAtoms::li) ||
+ (aName == nsGkAtoms::dt) ||
+ (aName == nsGkAtoms::dd)) {
@@ -1199,13 +1197,13 @@ nsHTMLContentSerializer::EndIndentation(
- if ((aName == nsHTMLAtoms::head) ||
- (aName == nsHTMLAtoms::table) ||
- (aName == nsHTMLAtoms::tr) ||
- (aName == nsHTMLAtoms::ul) ||
- (aName == nsHTMLAtoms::ol) ||
- (aName == nsHTMLAtoms::dl) ||
- (aName == nsHTMLAtoms::li) ||
- (aName == nsHTMLAtoms::tbody) ||
- (aName == nsHTMLAtoms::form) ||
- (aName == nsHTMLAtoms::blockquote) ||
- (aName == nsHTMLAtoms::dt) ||
- (aName == nsHTMLAtoms::dd) ||
- (aName == nsHTMLAtoms::frameset)) {
+ if ((aName == nsGkAtoms::head) ||
+ (aName == nsGkAtoms::table) ||
+ (aName == nsGkAtoms::tr) ||
+ (aName == nsGkAtoms::ul) ||
+ (aName == nsGkAtoms::ol) ||
+ (aName == nsGkAtoms::dl) ||
+ (aName == nsGkAtoms::li) ||
+ (aName == nsGkAtoms::tbody) ||
+ (aName == nsGkAtoms::form) ||
+ (aName == nsGkAtoms::blockquote) ||
+ (aName == nsGkAtoms::dt) ||
+ (aName == nsGkAtoms::dd) ||
+ (aName == nsGkAtoms::frameset)) {
Index: mozilla/content/base/src/nsNodeInfoManager.cpp
===================================================================
RCS file: /cvsroot/mozilla/content/base/src/nsNodeInfoManager.cpp,v
retrieving revision 1.45
diff -u -p -0 -r1.45 nsNodeInfoManager.cpp
--- mozilla/content/base/src/nsNodeInfoManager.cpp 27 Apr 2006 18:20:50 -0000 1.45
+++ mozilla/content/base/src/nsNodeInfoManager.cpp 3 Oct 2006 22:56:36 -0000
@@ -52 +51,0 @@
-#include "nsLayoutAtoms.h"
@@ -271 +270 @@ nsNodeInfoManager::GetTextNodeInfo()
- GetNodeInfo(nsLayoutAtoms::textTagName, nsnull, kNameSpaceID_None,
+ GetNodeInfo(nsGkAtoms::textTagName, nsnull, kNameSpaceID_None,
@@ -285 +284 @@ nsNodeInfoManager::GetCommentNodeInfo()
- GetNodeInfo(nsLayoutAtoms::commentTagName, nsnull, kNameSpaceID_None,
+ GetNodeInfo(nsGkAtoms::commentTagName, nsnull, kNameSpaceID_None,
@@ -299 +298 @@ nsNodeInfoManager::GetDocumentNodeInfo()
- GetNodeInfo(nsLayoutAtoms::documentNodeName, nsnull, kNameSpaceID_None,
+ GetNodeInfo(nsGkAtoms::documentNodeName, nsnull, kNameSpaceID_None,
Index: mozilla/content/base/src/nsXMLContentSerializer.cpp
===================================================================
RCS file: /cvsroot/mozilla/content/base/src/nsXMLContentSerializer.cpp,v
retrieving revision 1.64
diff -u -p -0 -r1.64 nsXMLContentSerializer.cpp
--- mozilla/content/base/src/nsXMLContentSerializer.cpp 19 Jul 2006 04:27:33 -0000 1.64
+++ mozilla/content/base/src/nsXMLContentSerializer.cpp 3 Oct 2006 22:56:36 -0000
@@ -46 +45,0 @@
-#include "nsHTMLAtoms.h"
@@ -63 +61,0 @@
-#include "nsLayoutAtoms.h"
@@ -621 +619 @@ nsXMLContentSerializer::AppendElementSta
- attrName == nsLayoutAtoms::xmlns)) {
+ attrName == nsGkAtoms::xmlns)) {
@@ -877,2 +875,2 @@ nsXMLContentSerializer::IsShorthandAttr(
- if ((aAttrName == nsHTMLAtoms::checked) &&
- (aElementName == nsHTMLAtoms::input)) {
+ if ((aAttrName == nsGkAtoms::checked) &&
+ (aElementName == nsGkAtoms::input)) {
@@ -883,6 +881,6 @@ nsXMLContentSerializer::IsShorthandAttr(
- if ((aAttrName == nsHTMLAtoms::compact) &&
- (aElementName == nsHTMLAtoms::dir ||
- aElementName == nsHTMLAtoms::dl ||
- aElementName == nsHTMLAtoms::menu ||
- aElementName == nsHTMLAtoms::ol ||
- aElementName == nsHTMLAtoms::ul)) {
+ if ((aAttrName == nsGkAtoms::compact) &&
+ (aElementName == nsGkAtoms::dir ||
+ aElementName == nsGkAtoms::dl ||
+ aElementName == nsGkAtoms::menu ||
+ aElementName == nsGkAtoms::ol ||
+ aElementName == nsGkAtoms::ul)) {
@@ -893,2 +891,2 @@ nsXMLContentSerializer::IsShorthandAttr(
- if ((aAttrName == nsHTMLAtoms::declare) &&
- (aElementName == nsHTMLAtoms::object)) {
+ if ((aAttrName == nsGkAtoms::declare) &&
+ (aElementName == nsGkAtoms::object)) {
@@ -899,2 +897,2 @@ nsXMLContentSerializer::IsShorthandAttr(
- if ((aAttrName == nsHTMLAtoms::defer) &&
- (aElementName == nsHTMLAtoms::script)) {
+ if ((aAttrName == nsGkAtoms::defer) &&
+ (aElementName == nsGkAtoms::script)) {
@@ -905,7 +903,7 @@ nsXMLContentSerializer::IsShorthandAttr(
- if ((aAttrName == nsHTMLAtoms::disabled) &&
- (aElementName == nsHTMLAtoms::button ||
- aElementName == nsHTMLAtoms::input ||
- aElementName == nsHTMLAtoms::optgroup ||
- aElementName == nsHTMLAtoms::option ||
- aElementName == nsHTMLAtoms::select ||
- aElementName == nsHTMLAtoms::textarea)) {
+ if ((aAttrName == nsGkAtoms::disabled) &&
+ (aElementName == nsGkAtoms::button ||
+ aElementName == nsGkAtoms::input ||
+ aElementName == nsGkAtoms::optgroup ||
+ aElementName == nsGkAtoms::option ||
+ aElementName == nsGkAtoms::select ||
+ aElementName == nsGkAtoms::textarea)) {
@@ -916,3 +914,3 @@ nsXMLContentSerializer::IsShorthandAttr(
- if ((aAttrName == nsHTMLAtoms::ismap) &&
- (aElementName == nsHTMLAtoms::img ||
- aElementName == nsHTMLAtoms::input)) {
+ if ((aAttrName == nsGkAtoms::ismap) &&
+ (aElementName == nsGkAtoms::img ||
+ aElementName == nsGkAtoms::input)) {
@@ -923,2 +921,2 @@ nsXMLContentSerializer::IsShorthandAttr(
- if ((aAttrName == nsHTMLAtoms::multiple) &&
- (aElementName == nsHTMLAtoms::select)) {
+ if ((aAttrName == nsGkAtoms::multiple) &&
+ (aElementName == nsGkAtoms::select)) {
@@ -929,2 +927,2 @@ nsXMLContentSerializer::IsShorthandAttr(
- if ((aAttrName == nsHTMLAtoms::noresize) &&
- (aElementName == nsHTMLAtoms::frame)) {
+ if ((aAttrName == nsGkAtoms::noresize) &&
+ (aElementName == nsGkAtoms::frame)) {
@@ -935,2 +933,2 @@ nsXMLContentSerializer::IsShorthandAttr(
- if ((aAttrName == nsHTMLAtoms::noshade) &&
- (aElementName == nsHTMLAtoms::hr)) {
+ if ((aAttrName == nsGkAtoms::noshade) &&
+ (aElementName == nsGkAtoms::hr)) {
@@ -941,3 +939,3 @@ nsXMLContentSerializer::IsShorthandAttr(
- if ((aAttrName == nsHTMLAtoms::nowrap) &&
- (aElementName == nsHTMLAtoms::td ||
- aElementName == nsHTMLAtoms::th)) {
+ if ((aAttrName == nsGkAtoms::nowrap) &&
+ (aElementName == nsGkAtoms::td ||
+ aElementName == nsGkAtoms::th)) {
@@ -948,3 +946,3 @@ nsXMLContentSerializer::IsShorthandAttr(
- if ((aAttrName == nsHTMLAtoms::readonly) &&
- (aElementName == nsHTMLAtoms::input ||
- aElementName == nsHTMLAtoms::textarea)) {
+ if ((aAttrName == nsGkAtoms::readonly) &&
+ (aElementName == nsGkAtoms::input ||
+ aElementName == nsGkAtoms::textarea)) {
@@ -955,2 +953,2 @@ nsXMLContentSerializer::IsShorthandAttr(
- if ((aAttrName == nsHTMLAtoms::selected) &&
- (aElementName == nsHTMLAtoms::option)) {
+ if ((aAttrName == nsGkAtoms::selected) &&
+ (aElementName == nsGkAtoms::option)) {
Index: mozilla/content/base/src/nsXMLNameSpaceMap.cpp
===================================================================
RCS file: /cvsroot/mozilla/content/base/src/nsXMLNameSpaceMap.cpp,v
retrieving revision 1.4
diff -u -p -0 -r1.4 nsXMLNameSpaceMap.cpp
--- mozilla/content/base/src/nsXMLNameSpaceMap.cpp 31 Mar 2006 08:41:49 -0000 1.4
+++ mozilla/content/base/src/nsXMLNameSpaceMap.cpp 3 Oct 2006 22:56:36 -0000
@@ -48 +47,0 @@
-#include "nsLayoutAtoms.h"
@@ -65 +64 @@ nsXMLNameSpaceMap::Create()
- nsresult rv = map->AddPrefix(nsLayoutAtoms::xmlns,
+ nsresult rv = map->AddPrefix(nsGkAtoms::xmlns,
@@ -67 +66 @@ nsXMLNameSpaceMap::Create()
- rv |= map->AddPrefix(nsLayoutAtoms::xml, kNameSpaceID_XML);
+ rv |= map->AddPrefix(nsGkAtoms::xml, kNameSpaceID_XML);
Index: mozilla/content/events/src/nsDOMEvent.cpp
===================================================================
RCS file: /cvsroot/mozilla/content/events/src/nsDOMEvent.cpp,v
retrieving revision 1.222
diff -u -p -0 -r1.222 nsDOMEvent.cpp
--- mozilla/content/events/src/nsDOMEvent.cpp 10 Sep 2006 11:53:54 -0000 1.222
+++ mozilla/content/events/src/nsDOMEvent.cpp 3 Oct 2006 22:56:37 -0000
@@ -52 +51,0 @@
-#include "nsLayoutAtoms.h"
@@ -382 +381 @@ nsDOMEvent::SetEventType(const nsAString
- if (atom == nsLayoutAtoms::onmousedown)
+ if (atom == nsGkAtoms::onmousedown)
@@ -384 +383 @@ nsDOMEvent::SetEventType(const nsAString
- else if (atom == nsLayoutAtoms::onmouseup)
+ else if (atom == nsGkAtoms::onmouseup)
@@ -386 +385 @@ nsDOMEvent::SetEventType(const nsAString
- else if (atom == nsLayoutAtoms::onclick)
+ else if (atom == nsGkAtoms::onclick)
@@ -388 +387 @@ nsDOMEvent::SetEventType(const nsAString
- else if (atom == nsLayoutAtoms::ondblclick)
+ else if (atom == nsGkAtoms::ondblclick)
@@ -390 +389 @@ nsDOMEvent::SetEventType(const nsAString
- else if (atom == nsLayoutAtoms::onmouseover)
+ else if (atom == nsGkAtoms::onmouseover)
@@ -392 +391 @@ nsDOMEvent::SetEventType(const nsAString
- else if (atom == nsLayoutAtoms::onmouseout)
+ else if (atom == nsGkAtoms::onmouseout)
@@ -394 +393 @@ nsDOMEvent::SetEventType(const nsAString
- else if (atom == nsLayoutAtoms::onmousemove)
+ else if (atom == nsGkAtoms::onmousemove)
@@ -396 +395 @@ nsDOMEvent::SetEventType(const nsAString
- else if (atom == nsLayoutAtoms::oncontextmenu)
+ else if (atom == nsGkAtoms::oncontextmenu)
@@ -399 +398 @@ nsDOMEvent::SetEventType(const nsAString
- if (atom == nsLayoutAtoms::onkeydown)
+ if (atom == nsGkAtoms::onkeydown)
@@ -401 +400 @@ nsDOMEvent::SetEventType(const nsAString
- else if (atom == nsLayoutAtoms::onkeyup)
+ else if (atom == nsGkAtoms::onkeyup)
@@ -403 +402 @@ nsDOMEvent::SetEventType(const nsAString
- else if (atom == nsLayoutAtoms::onkeypress)
+ else if (atom == nsGkAtoms::onkeypress)
@@ -406 +405 @@ nsDOMEvent::SetEventType(const nsAString
- if (atom == nsLayoutAtoms::oncompositionstart)
+ if (atom == nsGkAtoms::oncompositionstart)
@@ -408 +407 @@ nsDOMEvent::SetEventType(const nsAString
- else if (atom == nsLayoutAtoms::oncompositionend)
+ else if (atom == nsGkAtoms::oncompositionend)
@@ -411 +410 @@ nsDOMEvent::SetEventType(const nsAString
- if (atom == nsLayoutAtoms::onfocus)
+ if (atom == nsGkAtoms::onfocus)
@@ -413 +412 @@ nsDOMEvent::SetEventType(const nsAString
- else if (atom == nsLayoutAtoms::onblur)
+ else if (atom == nsGkAtoms::onblur)
@@ -415 +414 @@ nsDOMEvent::SetEventType(const nsAString
- else if (atom == nsLayoutAtoms::onsubmit)
+ else if (atom == nsGkAtoms::onsubmit)
@@ -417 +416 @@ nsDOMEvent::SetEventType(const nsAString
- else if (atom == nsLayoutAtoms::onreset)
+ else if (atom == nsGkAtoms::onreset)
@@ -419 +418 @@ nsDOMEvent::SetEventType(const nsAString
- else if (atom == nsLayoutAtoms::onchange)
+ else if (atom == nsGkAtoms::onchange)
@@ -421 +420 @@ nsDOMEvent::SetEventType(const nsAString
- else if (atom == nsLayoutAtoms::onselect)
+ else if (atom == nsGkAtoms::onselect)
@@ -423 +422 @@ nsDOMEvent::SetEventType(const nsAString
- else if (atom == nsLayoutAtoms::onload)
+ else if (atom == nsGkAtoms::onload)
@@ -425 +424 @@ nsDOMEvent::SetEventType(const nsAString
- else if (atom == nsLayoutAtoms::onunload)
+ else if (atom == nsGkAtoms::onunload)
@@ -427 +426 @@ nsDOMEvent::SetEventType(const nsAString
- else if (atom == nsLayoutAtoms::onabort)
+ else if (atom == nsGkAtoms::onabort)
@@ -429 +428 @@ nsDOMEvent::SetEventType(const nsAString
- else if (atom == nsLayoutAtoms::onerror)
+ else if (atom == nsGkAtoms::onerror)
@@ -432 +431 @@ nsDOMEvent::SetEventType(const nsAString
- if (atom == nsLayoutAtoms::onDOMAttrModified)
+ if (atom == nsGkAtoms::onDOMAttrModified)
@@ -434 +433 @@ nsDOMEvent::SetEventType(const nsAString
- else if (atom == nsLayoutAtoms::onDOMCharacterDataModified)
+ else if (atom == nsGkAtoms::onDOMCharacterDataModified)
@@ -436 +435 @@ nsDOMEvent::SetEventType(const nsAString
- else if (atom == nsLayoutAtoms::onDOMNodeInserted)
+ else if (atom == nsGkAtoms::onDOMNodeInserted)
@@ -438 +437 @@ nsDOMEvent::SetEventType(const nsAString
- else if (atom == nsLayoutAtoms::onDOMNodeRemoved)
+ else if (atom == nsGkAtoms::onDOMNodeRemoved)
@@ -440 +439 @@ nsDOMEvent::SetEventType(const nsAString
- else if (atom == nsLayoutAtoms::onDOMNodeInsertedIntoDocument)
+ else if (atom == nsGkAtoms::onDOMNodeInsertedIntoDocument)
@@ -442 +441 @@ nsDOMEvent::SetEventType(const nsAString
- else if (atom == nsLayoutAtoms::onDOMNodeRemovedFromDocument)
+ else if (atom == nsGkAtoms::onDOMNodeRemovedFromDocument)
@@ -444 +443 @@ nsDOMEvent::SetEventType(const nsAString
- else if (atom == nsLayoutAtoms::onDOMSubtreeModified)
+ else if (atom == nsGkAtoms::onDOMSubtreeModified)
@@ -447 +446 @@ nsDOMEvent::SetEventType(const nsAString
- if (atom == nsLayoutAtoms::onDOMActivate)
+ if (atom == nsGkAtoms::onDOMActivate)
@@ -449 +448 @@ nsDOMEvent::SetEventType(const nsAString
- else if (atom == nsLayoutAtoms::onDOMFocusIn)
+ else if (atom == nsGkAtoms::onDOMFocusIn)
@@ -451 +450 @@ nsDOMEvent::SetEventType(const nsAString
- else if (atom == nsLayoutAtoms::onDOMFocusOut)
+ else if (atom == nsGkAtoms::onDOMFocusOut)
@@ -453 +452 @@ nsDOMEvent::SetEventType(const nsAString
- else if (atom == nsLayoutAtoms::oninput)
+ else if (atom == nsGkAtoms::oninput)
@@ -456 +455 @@ nsDOMEvent::SetEventType(const nsAString
- if (atom == nsLayoutAtoms::onpageshow)
+ if (atom == nsGkAtoms::onpageshow)
@@ -458 +457 @@ nsDOMEvent::SetEventType(const nsAString
- else if (atom == nsLayoutAtoms::onpagehide)
+ else if (atom == nsGkAtoms::onpagehide)
@@ -463 +462 @@ nsDOMEvent::SetEventType(const nsAString
- if (atom == nsLayoutAtoms::onSVGLoad)
+ if (atom == nsGkAtoms::onSVGLoad)
@@ -465 +464 @@ nsDOMEvent::SetEventType(const nsAString
- else if (atom == nsLayoutAtoms::onSVGUnload)
+ else if (atom == nsGkAtoms::onSVGUnload)
@@ -467 +466 @@ nsDOMEvent::SetEventType(const nsAString
- else if (atom == nsLayoutAtoms::onSVGAbort)
+ else if (atom == nsGkAtoms::onSVGAbort)
@@ -469 +468 @@ nsDOMEvent::SetEventType(const nsAString
- else if (atom == nsLayoutAtoms::onSVGError)
+ else if (atom == nsGkAtoms::onSVGError)
@@ -471 +470 @@ nsDOMEvent::SetEventType(const nsAString
- else if (atom == nsLayoutAtoms::onSVGResize)
+ else if (atom == nsGkAtoms::onSVGResize)
@@ -473 +472 @@ nsDOMEvent::SetEventType(const nsAString
- else if (atom == nsLayoutAtoms::onSVGScroll)
+ else if (atom == nsGkAtoms::onSVGScroll)
@@ -476 +475 @@ nsDOMEvent::SetEventType(const nsAString
- if (atom == nsLayoutAtoms::onSVGZoom)
+ if (atom == nsGkAtoms::onSVGZoom)
Index: mozilla/content/events/src/nsEventListenerManager.cpp
===================================================================
RCS file: /cvsroot/mozilla/content/events/src/nsEventListenerManager.cpp,v
retrieving revision 1.243
diff -u -p -0 -r1.243 nsEventListenerManager.cpp
--- mozilla/content/events/src/nsEventListenerManager.cpp 20 Sep 2006 01:13:59 -0000 1.243
+++ mozilla/content/events/src/nsEventListenerManager.cpp 3 Oct 2006 22:56:37 -0000
@@ -65 +64,0 @@
-#include "nsSVGAtoms.h"
@@ -74 +72,0 @@
-#include "nsLayoutAtoms.h"
@@ -819 +817 @@ nsEventListenerManager::GetIdentifiersFo
- if (aType == nsLayoutAtoms::onmousedown) {
+ if (aType == nsGkAtoms::onmousedown) {
@@ -823 +821 @@ nsEventListenerManager::GetIdentifiersFo
- else if (aType == nsLayoutAtoms::onmouseup) {
+ else if (aType == nsGkAtoms::onmouseup) {
@@ -827 +825 @@ nsEventListenerManager::GetIdentifiersFo
- else if (aType == nsLayoutAtoms::onclick) {
+ else if (aType == nsGkAtoms::onclick) {
@@ -831 +829 @@ nsEventListenerManager::GetIdentifiersFo
- else if (aType == nsLayoutAtoms::ondblclick) {
+ else if (aType == nsGkAtoms::ondblclick) {
@@ -835 +833 @@ nsEventListenerManager::GetIdentifiersFo
- else if (aType == nsLayoutAtoms::onmouseover) {
+ else if (aType == nsGkAtoms::onmouseover) {
@@ -839 +837 @@ nsEventListenerManager::GetIdentifiersFo
- else if (aType == nsLayoutAtoms::onmouseout) {
+ else if (aType == nsGkAtoms::onmouseout) {
@@ -843 +841 @@ nsEventListenerManager::GetIdentifiersFo
- else if (aType == nsLayoutAtoms::onkeydown) {
+ else if (aType == nsGkAtoms::onkeydown) {
@@ -847 +845 @@ nsEventListenerManager::GetIdentifiersFo
- else if (aType == nsLayoutAtoms::onkeyup) {
+ else if (aType == nsGkAtoms::onkeyup) {
@@ -851 +849 @@ nsEventListenerManager::GetIdentifiersFo
- else if (aType == nsLayoutAtoms::onkeypress) {
+ else if (aType == nsGkAtoms::onkeypress) {
@@ -855 +853 @@ nsEventListenerManager::GetIdentifiersFo
- else if (aType == nsLayoutAtoms::onmousemove) {
+ else if (aType == nsGkAtoms::onmousemove) {
@@ -859 +857 @@ nsEventListenerManager::GetIdentifiersFo
- else if (aType == nsLayoutAtoms::oncontextmenu) {
+ else if (aType == nsGkAtoms::oncontextmenu) {
@@ -863 +861 @@ nsEventListenerManager::GetIdentifiersFo
- else if (aType == nsLayoutAtoms::onfocus) {
+ else if (aType == nsGkAtoms::onfocus) {
@@ -867 +865 @@ nsEventListenerManager::GetIdentifiersFo
- else if (aType == nsLayoutAtoms::onblur) {
+ else if (aType == nsGkAtoms::onblur) {
@@ -871 +869 @@ nsEventListenerManager::GetIdentifiersFo
- else if (aType == nsLayoutAtoms::onsubmit) {
+ else if (aType == nsGkAtoms::onsubmit) {
@@ -875 +873 @@ nsEventListenerManager::GetIdentifiersFo
- else if (aType == nsLayoutAtoms::onreset) {
+ else if (aType == nsGkAtoms::onreset) {
@@ -879 +877 @@ nsEventListenerManager::GetIdentifiersFo
- else if (aType == nsLayoutAtoms::onchange) {
+ else if (aType == nsGkAtoms::onchange) {
@@ -883 +881 @@ nsEventListenerManager::GetIdentifiersFo
- else if (aType == nsLayoutAtoms::onselect) {
+ else if (aType == nsGkAtoms::onselect) {
@@ -887 +885 @@ nsEventListenerManager::GetIdentifiersFo
- else if (aType == nsLayoutAtoms::oninput) {
+ else if (aType == nsGkAtoms::oninput) {
@@ -891 +889 @@ nsEventListenerManager::GetIdentifiersFo
- else if (aType == nsLayoutAtoms::onload) {
+ else if (aType == nsGkAtoms::onload) {
@@ -895 +893 @@ nsEventListenerManager::GetIdentifiersFo
- else if (aType == nsLayoutAtoms::onbeforeunload) {
+ else if (aType == nsGkAtoms::onbeforeunload) {
@@ -899 +897 @@ nsEventListenerManager::GetIdentifiersFo
- else if (aType == nsLayoutAtoms::onunload) {
+ else if (aType == nsGkAtoms::onunload) {
@@ -903 +901 @@ nsEventListenerManager::GetIdentifiersFo
- else if (aType == nsLayoutAtoms::onabort) {
+ else if (aType == nsGkAtoms::onabort) {
@@ -907 +905 @@ nsEventListenerManager::GetIdentifiersFo
- else if (aType == nsLayoutAtoms::onerror) {
+ else if (aType == nsGkAtoms::onerror) {
@@ -911 +909 @@ nsEventListenerManager::GetIdentifiersFo
- else if (aType == nsLayoutAtoms::onpaint) {
+ else if (aType == nsGkAtoms::onpaint) {
@@ -915 +913 @@ nsEventListenerManager::GetIdentifiersFo
- else if (aType == nsLayoutAtoms::onresize) {
+ else if (aType == nsGkAtoms::onresize) {
@@ -919 +917 @@ nsEventListenerManager::GetIdentifiersFo
- else if (aType == nsLayoutAtoms::onscroll) {
+ else if (aType == nsGkAtoms::onscroll) {
@@ -923 +921 @@ nsEventListenerManager::GetIdentifiersFo
- else if (aType == nsLayoutAtoms::onpopupshowing) {
+ else if (aType == nsGkAtoms::onpopupshowing) {
@@ -927 +925 @@ nsEventListenerManager::GetIdentifiersFo
- else if (aType == nsLayoutAtoms::onpopupshown) {
+ else if (aType == nsGkAtoms::onpopupshown) {
@@ -931 +929 @@ nsEventListenerManager::GetIdentifiersFo
- else if (aType == nsLayoutAtoms::onpopuphiding) {
+ else if (aType == nsGkAtoms::onpopuphiding) {
@@ -935 +933 @@ nsEventListenerManager::GetIdentifiersFo
- else if (aType == nsLayoutAtoms::onpopuphidden) {
+ else if (aType == nsGkAtoms::onpopuphidden) {
@@ -939 +937 @@ nsEventListenerManager::GetIdentifiersFo
- else if (aType == nsLayoutAtoms::onclose) {
+ else if (aType == nsGkAtoms::onclose) {
@@ -943 +941 @@ nsEventListenerManager::GetIdentifiersFo
- else if (aType == nsLayoutAtoms::oncommand) {
+ else if (aType == nsGkAtoms::oncommand) {
@@ -947 +945 @@ nsEventListenerManager::GetIdentifiersFo
- else if (aType == nsLayoutAtoms::onbroadcast) {
+ else if (aType == nsGkAtoms::onbroadcast) {
@@ -951 +949 @@ nsEventListenerManager::GetIdentifiersFo
- else if (aType == nsLayoutAtoms::oncommandupdate) {
+ else if (aType == nsGkAtoms::oncommandupdate) {
@@ -955 +953 @@ nsEventListenerManager::GetIdentifiersFo
- else if (aType == nsLayoutAtoms::onoverflow) {
+ else if (aType == nsGkAtoms::onoverflow) {
@@ -959 +957 @@ nsEventListenerManager::GetIdentifiersFo
- else if (aType == nsLayoutAtoms::onunderflow) {
+ else if (aType == nsGkAtoms::onunderflow) {
@@ -963 +961 @@ nsEventListenerManager::GetIdentifiersFo
- else if (aType == nsLayoutAtoms::onoverflowchanged) {
+ else if (aType == nsGkAtoms::onoverflowchanged) {
@@ -967 +965 @@ nsEventListenerManager::GetIdentifiersFo
- else if (aType == nsLayoutAtoms::ondragenter) {
+ else if (aType == nsGkAtoms::ondragenter) {
@@ -971 +969 @@ nsEventListenerManager::GetIdentifiersFo
- else if (aType == nsLayoutAtoms::ondragover) {
+ else if (aType == nsGkAtoms::ondragover) {
@@ -975 +973 @@ nsEventListenerManager::GetIdentifiersFo
- else if (aType == nsLayoutAtoms::ondragexit) {
+ else if (aType == nsGkAtoms::ondragexit) {
@@ -979 +977 @@ nsEventListenerManager::GetIdentifiersFo
- else if (aType == nsLayoutAtoms::ondragdrop) {
+ else if (aType == nsGkAtoms::ondragdrop) {
@@ -983 +981 @@ nsEventListenerManager::GetIdentifiersFo
- else if (aType == nsLayoutAtoms::ondraggesture) {
+ else if (aType == nsGkAtoms::ondraggesture) {
@@ -987 +985 @@ nsEventListenerManager::GetIdentifiersFo
- else if (aType == nsLayoutAtoms::onDOMSubtreeModified) {
+ else if (aType == nsGkAtoms::onDOMSubtreeModified) {
@@ -991 +989 @@ nsEventListenerManager::GetIdentifiersFo
- else if (aType == nsLayoutAtoms::onDOMNodeInserted) {
+ else if (aType == nsGkAtoms::onDOMNodeInserted) {
@@ -995 +993 @@ nsEventListenerManager::GetIdentifiersFo
- else if (aType == nsLayoutAtoms::onDOMNodeRemoved) {
+ else if (aType == nsGkAtoms::onDOMNodeRemoved) {
@@ -999 +997 @@ nsEventListenerManager::GetIdentifiersFo
- else if (aType == nsLayoutAtoms::onDOMNodeInsertedIntoDocument) {
+ else if (aType == nsGkAtoms::onDOMNodeInsertedIntoDocument) {
@@ -1003 +1001 @@ nsEventListenerManager::GetIdentifiersFo
- else if (aType == nsLayoutAtoms::onDOMNodeRemovedFromDocument) {
+ else if (aType == nsGkAtoms::onDOMNodeRemovedFromDocument) {
@@ -1007 +1005 @@ nsEventListenerManager::GetIdentifiersFo
- else if (aType == nsLayoutAtoms::onDOMAttrModified) {
+ else if (aType == nsGkAtoms::onDOMAttrModified) {
@@ -1011 +1009 @@ nsEventListenerManager::GetIdentifiersFo
- else if (aType == nsLayoutAtoms::onDOMCharacterDataModified) {
+ else if (aType == nsGkAtoms::onDOMCharacterDataModified) {
@@ -1015 +1013 @@ nsEventListenerManager::GetIdentifiersFo
- else if (aType == nsLayoutAtoms::onDOMActivate) {
+ else if (aType == nsGkAtoms::onDOMActivate) {
@@ -1019 +1017 @@ nsEventListenerManager::GetIdentifiersFo
- else if (aType == nsLayoutAtoms::onDOMFocusIn) {
+ else if (aType == nsGkAtoms::onDOMFocusIn) {
@@ -1023 +1021 @@ nsEventListenerManager::GetIdentifiersFo
- else if (aType == nsLayoutAtoms::onDOMFocusOut) {
+ else if (aType == nsGkAtoms::onDOMFocusOut) {
@@ -1027 +1025 @@ nsEventListenerManager::GetIdentifiersFo
- else if (aType == nsLayoutAtoms::oncompositionstart) {
+ else if (aType == nsGkAtoms::oncompositionstart) {
@@ -1031 +1029 @@ nsEventListenerManager::GetIdentifiersFo
- else if (aType == nsLayoutAtoms::oncompositionend) {
+ else if (aType == nsGkAtoms::oncompositionend) {
@@ -1035 +1033 @@ nsEventListenerManager::GetIdentifiersFo
- else if (aType == nsLayoutAtoms::ontext) {
+ else if (aType == nsGkAtoms::ontext) {
@@ -1039 +1037 @@ nsEventListenerManager::GetIdentifiersFo
- else if (aType == nsLayoutAtoms::onpageshow) {
+ else if (aType == nsGkAtoms::onpageshow) {
@@ -1043 +1041 @@ nsEventListenerManager::GetIdentifiersFo
- else if (aType == nsLayoutAtoms::onpagehide) {
+ else if (aType == nsGkAtoms::onpagehide) {
@@ -1048 +1046 @@ nsEventListenerManager::GetIdentifiersFo
- else if (aType == nsLayoutAtoms::onSVGLoad) {
+ else if (aType == nsGkAtoms::onSVGLoad) {
@@ -1052 +1050 @@ nsEventListenerManager::GetIdentifiersFo
- else if (aType == nsLayoutAtoms::onSVGUnload) {
+ else if (aType == nsGkAtoms::onSVGUnload) {
@@ -1056 +1054 @@ nsEventListenerManager::GetIdentifiersFo
- else if (aType == nsLayoutAtoms::onSVGAbort) {
+ else if (aType == nsGkAtoms::onSVGAbort) {
@@ -1060 +1058 @@ nsEventListenerManager::GetIdentifiersFo
- else if (aType == nsLayoutAtoms::onSVGError) {
+ else if (aType == nsGkAtoms::onSVGError) {
@@ -1064 +1062 @@ nsEventListenerManager::GetIdentifiersFo
- else if (aType == nsLayoutAtoms::onSVGResize) {
+ else if (aType == nsGkAtoms::onSVGResize) {
@@ -1068 +1066 @@ nsEventListenerManager::GetIdentifiersFo
- else if (aType == nsLayoutAtoms::onSVGScroll) {
+ else if (aType == nsGkAtoms::onSVGScroll) {
@@ -1072 +1070 @@ nsEventListenerManager::GetIdentifiersFo
- else if (aType == nsLayoutAtoms::onSVGZoom) {
+ else if (aType == nsGkAtoms::onSVGZoom) {
@@ -1541,14 +1539,14 @@ nsEventListenerManager::CompileEventHand
- if (aName == nsLayoutAtoms::onSVGLoad)
- attrName = nsSVGAtoms::onload;
- else if (aName == nsLayoutAtoms::onSVGUnload)
- attrName = nsSVGAtoms::onunload;
- else if (aName == nsLayoutAtoms::onSVGAbort)
- attrName = nsSVGAtoms::onabort;
- else if (aName == nsLayoutAtoms::onSVGError)
- attrName = nsSVGAtoms::onerror;
- else if (aName == nsLayoutAtoms::onSVGResize)
- attrName = nsSVGAtoms::onresize;
- else if (aName == nsLayoutAtoms::onSVGScroll)
- attrName = nsSVGAtoms::onscroll;
- else if (aName == nsLayoutAtoms::onSVGZoom)
- attrName = nsSVGAtoms::onzoom;
+ if (aName == nsGkAtoms::onSVGLoad)
+ attrName = nsGkAtoms::onload;
+ else if (aName == nsGkAtoms::onSVGUnload)
+ attrName = nsGkAtoms::onunload;
+ else if (aName == nsGkAtoms::onSVGAbort)
+ attrName = nsGkAtoms::onabort;
+ else if (aName == nsGkAtoms::onSVGError)
+ attrName = nsGkAtoms::onerror;
+ else if (aName == nsGkAtoms::onSVGResize)
+ attrName = nsGkAtoms::onresize;
+ else if (aName == nsGkAtoms::onSVGScroll)
+ attrName = nsGkAtoms::onscroll;
+ else if (aName == nsGkAtoms::onSVGZoom)
+ attrName = nsGkAtoms::onzoom;
Index: mozilla/content/events/src/nsEventStateManager.cpp
===================================================================
RCS file: /cvsroot/mozilla/content/events/src/nsEventStateManager.cpp,v
retrieving revision 1.667
diff -u -p -0 -r1.667 nsEventStateManager.cpp
--- mozilla/content/events/src/nsEventStateManager.cpp 30 Aug 2006 13:38:15 -0000 1.667
+++ mozilla/content/events/src/nsEventStateManager.cpp 3 Oct 2006 22:56:40 -0000
@@ -58 +57,0 @@
-#include "nsHTMLAtoms.h"
@@ -101 +99,0 @@
-#include "nsXULAtoms.h"
@@ -124 +121,0 @@
-#include "nsLayoutAtoms.h"
@@ -1194 +1191 @@ nsEventStateManager::HandleAccessKey(nsP
- if (content->Tag() == nsXULAtoms::label) {
+ if (content->Tag() == nsGkAtoms::label) {
@@ -1199 +1196 @@ nsEventStateManager::HandleAccessKey(nsP
- content->GetAttr(kNameSpaceID_None, nsXULAtoms::control, control);
+ content->GetAttr(kNameSpaceID_None, nsGkAtoms::control, control);
@@ -1233 +1230 @@ nsEventStateManager::HandleAccessKey(nsP
- if (atom == nsXULAtoms::textbox || atom == nsXULAtoms::menulist) {
+ if (atom == nsGkAtoms::textbox || atom == nsGkAtoms::menulist) {
@@ -1236 +1233 @@ nsEventStateManager::HandleAccessKey(nsP
- } else if (atom == nsXULAtoms::toolbarbutton) {
+ } else if (atom == nsGkAtoms::toolbarbutton) {
@@ -1250 +1247 @@ nsEventStateManager::HandleAccessKey(nsP
- if (content->Tag() != nsHTMLAtoms::label || !sKeyCausesActivation) {
+ if (content->Tag() != nsGkAtoms::label || !sKeyCausesActivation) {
@@ -1387 +1384 @@ nsEventStateManager::CreateClickHoldTime
- nsXULAtoms::popup))
+ nsGkAtoms::popup))
@@ -1391 +1388 @@ nsEventStateManager::CreateClickHoldTime
- if (mGestureDownContent->Tag() == nsXULAtoms::menubutton)
+ if (mGestureDownContent->Tag() == nsGkAtoms::menubutton)
@@ -1486,3 +1483,3 @@ nsEventStateManager::FireContextClick()
- if (tag == nsXULAtoms::scrollbar ||
- tag == nsXULAtoms::scrollbarbutton ||
- tag == nsXULAtoms::button)
+ if (tag == nsGkAtoms::scrollbar ||
+ tag == nsGkAtoms::scrollbarbutton ||
+ tag == nsGkAtoms::button)
@@ -1490 +1487 @@ nsEventStateManager::FireContextClick()
- else if (tag == nsXULAtoms::toolbarbutton) {
+ else if (tag == nsGkAtoms::toolbarbutton) {
@@ -1494 +1491 @@ nsEventStateManager::FireContextClick()
- kNameSpaceID_None, nsXULAtoms::container)) {
+ kNameSpaceID_None, nsGkAtoms::container)) {
@@ -1499,2 +1496,2 @@ nsEventStateManager::FireContextClick()
- if (mGestureDownContent->AttrValueIs(kNameSpaceID_None, nsXULAtoms::open,
- nsXULAtoms::_true, eCaseMatters)) {
+ if (mGestureDownContent->AttrValueIs(kNameSpaceID_None, nsGkAtoms::open,
+ nsGkAtoms::_true, eCaseMatters)) {
@@ -1519,3 +1516,3 @@ nsEventStateManager::FireContextClick()
- else if (tag == nsHTMLAtoms::applet ||
- tag == nsHTMLAtoms::embed ||
- tag == nsHTMLAtoms::object) {
+ else if (tag == nsGkAtoms::applet ||
+ tag == nsGkAtoms::embed ||
+ tag == nsGkAtoms::object) {
@@ -3432 +3429 @@ nsEventStateManager::ShiftFocusInternal(
- if (!mCurrentFocus || (mLastFocusedWith != eEventFocusedByMouse && mCurrentFocus->Tag() != nsHTMLAtoms::area)) {
+ if (!mCurrentFocus || (mLastFocusedWith != eEventFocusedByMouse && mCurrentFocus->Tag() != nsGkAtoms::area)) {
@@ -3474 +3471 @@ nsEventStateManager::ShiftFocusInternal(
- if (aStart->HasAttr(kNameSpaceID_None, nsHTMLAtoms::tabindex)) {
+ if (aStart->HasAttr(kNameSpaceID_None, nsGkAtoms::tabindex)) {
@@ -3733 +3730 @@ nsEventStateManager::GetNextTabbableCont
- if (!aStartContent || aStartContent->Tag() != nsHTMLAtoms::area ||
+ if (!aStartContent || aStartContent->Tag() != nsGkAtoms::area ||
@@ -3761,2 +3758,2 @@ nsEventStateManager::GetNextTabbableCont
- if (currentContent->Tag() == nsHTMLAtoms::img &&
- currentContent->HasAttr(kNameSpaceID_None, nsHTMLAtoms::usemap)) {
+ if (currentContent->Tag() == nsGkAtoms::img &&
+ currentContent->HasAttr(kNameSpaceID_None, nsGkAtoms::usemap)) {
@@ -3799 +3796 @@ nsEventStateManager::GetNextTabbableMapA
- aImageContent->GetAttr(kNameSpaceID_None, nsHTMLAtoms::usemap, useMap);
+ aImageContent->GetAttr(kNameSpaceID_None, nsGkAtoms::usemap, useMap);
@@ -3848 +3845 @@ nsEventStateManager::GetNextTabIndex(nsI
- child->GetAttr(kNameSpaceID_None, nsHTMLAtoms::tabindex, tabIndexStr);
+ child->GetAttr(kNameSpaceID_None, nsGkAtoms::tabindex, tabIndexStr);
@@ -3866 +3863 @@ nsEventStateManager::GetNextTabIndex(nsI
- child->GetAttr(kNameSpaceID_None, nsHTMLAtoms::tabindex, tabIndexStr);
+ child->GetAttr(kNameSpaceID_None, nsGkAtoms::tabindex, tabIndexStr);
@@ -4285 +4282 @@ IsFocusable(nsIPresShell* aPresShell, ns
- if (aContent->Tag() != nsHTMLAtoms::area) {
+ if (aContent->Tag() != nsGkAtoms::area) {
@@ -4532 +4529 @@ nsEventStateManager::SendFocusBlur(nsPre
- aContent->GetAttr(kNameSpaceID_None, nsHTMLAtoms::tabindex, tabIndex);
+ aContent->GetAttr(kNameSpaceID_None, nsGkAtoms::tabindex, tabIndex);
@@ -4856 +4853 @@ nsEventStateManager::GetDocSelectionLoca
- if (parentContent->Tag() == nsHTMLAtoms::label) {
+ if (parentContent->Tag() == nsGkAtoms::label) {
@@ -5034 +5031 @@ nsEventStateManager::MoveFocusToCaret(PR
- if (tag == nsHTMLAtoms::a &&
+ if (tag == nsGkAtoms::a &&
@@ -5041,3 +5038,3 @@ nsEventStateManager::MoveFocusToCaret(PR
- testContent->HasAttr(kNameSpaceID_XLink, nsHTMLAtoms::href) &&
- testContent->AttrValueIs(kNameSpaceID_XLink, nsHTMLAtoms::type,
- nsHTMLAtoms::simple, eCaseMatters);
+ testContent->HasAttr(kNameSpaceID_XLink, nsGkAtoms::href) &&
+ testContent->AttrValueIs(kNameSpaceID_XLink, nsGkAtoms::type,
+ nsGkAtoms::simple, eCaseMatters);
@@ -5077 +5074 @@ nsEventStateManager::MoveFocusToCaret(PR
- if (testContent->Tag() == nsHTMLAtoms::a &&
+ if (testContent->Tag() == nsGkAtoms::a &&
@@ -5339 +5336 @@ nsEventStateManager::IsFrameSetDoc(nsIDo
- ni->Equals(nsHTMLAtoms::frameset)) {
+ ni->Equals(nsGkAtoms::frameset)) {
@@ -5372 +5369 @@ nsEventStateManager::IsIFrameDoc(nsIDocS
- return docContent->Tag() == nsHTMLAtoms::iframe;
+ return docContent->Tag() == nsGkAtoms::iframe;
Index: mozilla/content/events/src/nsXMLEventsManager.cpp
===================================================================
RCS file: /cvsroot/mozilla/content/events/src/nsXMLEventsManager.cpp,v
retrieving revision 1.10
diff -u -p -0 -r1.10 nsXMLEventsManager.cpp
--- mozilla/content/events/src/nsXMLEventsManager.cpp 2 Jul 2006 07:23:05 -0000 1.10
+++ mozilla/content/events/src/nsXMLEventsManager.cpp 3 Oct 2006 22:56:40 -0000
@@ -41 +40,0 @@
-#include "nsHTMLAtoms.h"
@@ -50 +48,0 @@
-#include "nsLayoutAtoms.h"
@@ -60 +58 @@ PRBool nsXMLEventsListener::InitXMLEvent
- if (aContent->NodeInfo()->Equals(nsHTMLAtoms::listener,
+ if (aContent->NodeInfo()->Equals(nsGkAtoms::listener,
@@ -66 +64 @@ PRBool nsXMLEventsListener::InitXMLEvent
- aContent->GetAttr(nameSpaceID, nsHTMLAtoms::event, eventType);
+ aContent->GetAttr(nameSpaceID, nsGkAtoms::event, eventType);
@@ -75 +73 @@ PRBool nsXMLEventsListener::InitXMLEvent
- if (aContent->GetAttr(nameSpaceID, nsHTMLAtoms::handler, handlerURIStr)) {
+ if (aContent->GetAttr(nameSpaceID, nsGkAtoms::handler, handlerURIStr)) {
@@ -107 +105 @@ PRBool nsXMLEventsListener::InitXMLEvent
- aContent->GetAttr(nameSpaceID, nsHTMLAtoms::target, targetIdref);
+ aContent->GetAttr(nameSpaceID, nsGkAtoms::target, targetIdref);
@@ -110 +108 @@ PRBool nsXMLEventsListener::InitXMLEvent
- aContent->GetAttr(nameSpaceID, nsHTMLAtoms::observer, observerID);
+ aContent->GetAttr(nameSpaceID, nsGkAtoms::observer, observerID);
@@ -113,2 +111,2 @@ PRBool nsXMLEventsListener::InitXMLEvent
- aContent->AttrValueIs(nameSpaceID, nsHTMLAtoms::phase,
- nsLayoutAtoms::capture, eCaseMatters);
+ aContent->AttrValueIs(nameSpaceID, nsGkAtoms::phase,
+ nsGkAtoms::capture, eCaseMatters);
@@ -117,2 +115,2 @@ PRBool nsXMLEventsListener::InitXMLEvent
- aContent->AttrValueIs(nameSpaceID, nsHTMLAtoms::propagate,
- nsLayoutAtoms::stop, eCaseMatters);
+ aContent->AttrValueIs(nameSpaceID, nsGkAtoms::propagate,
+ nsGkAtoms::stop, eCaseMatters);
@@ -121,2 +119,2 @@ PRBool nsXMLEventsListener::InitXMLEvent
- aContent->AttrValueIs(nameSpaceID, nsHTMLAtoms::defaultAction,
- nsLayoutAtoms::cancel, eCaseMatters);
+ aContent->AttrValueIs(nameSpaceID, nsGkAtoms::defaultAction,
+ nsGkAtoms::cancel, eCaseMatters);
@@ -363,6 +361,6 @@ nsXMLEventsManager::AttributeChanged(nsI
- (aAttribute == nsHTMLAtoms::event ||
- aAttribute == nsHTMLAtoms::handler ||
- aAttribute == nsHTMLAtoms::target ||
- aAttribute == nsHTMLAtoms::observer ||
- aAttribute == nsHTMLAtoms::phase ||
- aAttribute == nsHTMLAtoms::propagate)) {
+ (aAttribute == nsGkAtoms::event ||
+ aAttribute == nsGkAtoms::handler ||
+ aAttribute == nsGkAtoms::target ||
+ aAttribute == nsGkAtoms::observer ||
+ aAttribute == nsGkAtoms::phase ||
+ aAttribute == nsGkAtoms::propagate)) {
@@ -374 +372 @@ nsXMLEventsManager::AttributeChanged(nsI
- if (aContent->NodeInfo()->Equals(nsHTMLAtoms::listener,
+ if (aContent->NodeInfo()->Equals(nsGkAtoms::listener,
Index: mozilla/content/html/content/src/nsGenericHTMLElement.cpp
===================================================================
RCS file: /cvsroot/mozilla/content/html/content/src/nsGenericHTMLElement.cpp,v
retrieving revision 1.672
diff -u -p -0 -r1.672 nsGenericHTMLElement.cpp
--- mozilla/content/html/content/src/nsGenericHTMLElement.cpp 16 Sep 2006 17:15:37 -0000 1.672
+++ mozilla/content/html/content/src/nsGenericHTMLElement.cpp 3 Oct 2006 22:56:41 -0000
@@ -101,2 +100,0 @@
-#include "nsLayoutAtoms.h"
-#include "nsHTMLAtoms.h"
@@ -128 +125,0 @@
-#include "nsLayoutAtoms.h"
@@ -287 +284 @@ nsGenericHTMLElement::CopyInnerTo(nsGene
- if (name->Equals(nsHTMLAtoms::style, kNameSpaceID_None) &&
+ if (name->Equals(nsGkAtoms::style, kNameSpaceID_None) &&
@@ -314,2 +311,2 @@ nsGenericHTMLElement::CopyInnerTo(nsGene
- if ((prop = GetProperty(nsHTMLAtoms::htmlBaseHref))) {
- rv = aDst->SetProperty(nsHTMLAtoms::htmlBaseHref, prop,
+ if ((prop = GetProperty(nsGkAtoms::htmlBaseHref))) {
+ rv = aDst->SetProperty(nsGkAtoms::htmlBaseHref, prop,
@@ -321,2 +318,2 @@ nsGenericHTMLElement::CopyInnerTo(nsGene
- if ((prop = GetProperty(nsHTMLAtoms::htmlBaseTarget))) {
- rv = aDst->SetProperty(nsHTMLAtoms::htmlBaseTarget, prop,
+ if ((prop = GetProperty(nsGkAtoms::htmlBaseTarget))) {
+ rv = aDst->SetProperty(nsGkAtoms::htmlBaseTarget, prop,
@@ -426 +423 @@ nsGenericHTMLElement::GetId(nsAString& a
- GetAttr(kNameSpaceID_None, nsHTMLAtoms::id, aId);
+ GetAttr(kNameSpaceID_None, nsGkAtoms::id, aId);
@@ -433 +430 @@ nsGenericHTMLElement::SetId(const nsAStr
- SetAttr(kNameSpaceID_None, nsHTMLAtoms::id, aId, PR_TRUE);
+ SetAttr(kNameSpaceID_None, nsGkAtoms::id, aId, PR_TRUE);
@@ -440 +437 @@ nsGenericHTMLElement::GetTitle(nsAString
- GetAttr(kNameSpaceID_None, nsHTMLAtoms::title, aTitle);
+ GetAttr(kNameSpaceID_None, nsGkAtoms::title, aTitle);
@@ -447 +444 @@ nsGenericHTMLElement::SetTitle(const nsA
- SetAttr(kNameSpaceID_None, nsHTMLAtoms::title, aTitle, PR_TRUE);
+ SetAttr(kNameSpaceID_None, nsGkAtoms::title, aTitle, PR_TRUE);
@@ -454 +451 @@ nsGenericHTMLElement::GetLang(nsAString&
- GetAttr(kNameSpaceID_None, nsHTMLAtoms::lang, aLang);
+ GetAttr(kNameSpaceID_None, nsGkAtoms::lang, aLang);
@@ -461 +458 @@ nsGenericHTMLElement::SetLang(const nsAS
- SetAttr(kNameSpaceID_None, nsHTMLAtoms::lang, aLang, PR_TRUE);
+ SetAttr(kNameSpaceID_None, nsGkAtoms::lang, aLang, PR_TRUE);
@@ -474 +471 @@ nsGenericHTMLElement::GetDir(nsAString&
- const nsAttrValue* attr = mAttrsAndChildren.GetAttr(nsHTMLAtoms::dir);
+ const nsAttrValue* attr = mAttrsAndChildren.GetAttr(nsGkAtoms::dir);
@@ -489 +486 @@ nsGenericHTMLElement::SetDir(const nsASt
- SetAttr(kNameSpaceID_None, nsHTMLAtoms::dir, aDir, PR_TRUE);
+ SetAttr(kNameSpaceID_None, nsGkAtoms::dir, aDir, PR_TRUE);
@@ -496 +493 @@ nsGenericHTMLElement::GetClassName(nsASt
- GetAttr(kNameSpaceID_None, nsHTMLAtoms::_class, aClassName);
+ GetAttr(kNameSpaceID_None, nsGkAtoms::_class, aClassName);
@@ -503 +500 @@ nsGenericHTMLElement::SetClassName(const
- SetAttr(kNameSpaceID_None, nsHTMLAtoms::_class, aClassName, PR_TRUE);
+ SetAttr(kNameSpaceID_None, nsGkAtoms::_class, aClassName, PR_TRUE);
@@ -560 +557 @@ IsBody(nsIContent *aContent)
- return (aContent->NodeInfo()->Equals(nsHTMLAtoms::body) &&
+ return (aContent->NodeInfo()->Equals(nsGkAtoms::body) &&
@@ -569,3 +566,3 @@ IsOffsetParent(nsIContent *aContent)
- return ((ni->Equals(nsHTMLAtoms::td) ||
- ni->Equals(nsHTMLAtoms::table) ||
- ni->Equals(nsHTMLAtoms::th)) &&
+ return ((ni->Equals(nsGkAtoms::td) ||
+ ni->Equals(nsGkAtoms::table) ||
+ ni->Equals(nsGkAtoms::th)) &&
@@ -983,2 +980,2 @@ nsGenericHTMLElement::GetScrollInfo(nsIS
- if ((quirksMode && mNodeInfo->Equals(nsHTMLAtoms::body)) ||
- (!quirksMode && mNodeInfo->Equals(nsHTMLAtoms::html))) {
+ if ((quirksMode && mNodeInfo->Equals(nsGkAtoms::body)) ||
+ (!quirksMode && mNodeInfo->Equals(nsGkAtoms::html))) {
@@ -1271 +1268 @@ nsGenericHTMLElement::GetSpellcheck(PRBo
- {&nsHTMLAtoms::_true, &nsHTMLAtoms::_false, nsnull};
+ {&nsGkAtoms::_true, &nsGkAtoms::_false, nsnull};
@@ -1273 +1270 @@ nsGenericHTMLElement::GetSpellcheck(PRBo
- FindAttrValueIn(kNameSpaceID_None, nsHTMLAtoms::spellcheck,
+ FindAttrValueIn(kNameSpaceID_None, nsGkAtoms::spellcheck,
@@ -1339 +1336 @@ nsGenericHTMLElement::SetSpellcheck(PRBo
- return SetAttrHelper(nsHTMLAtoms::spellcheck, NS_LITERAL_STRING("true"));
+ return SetAttrHelper(nsGkAtoms::spellcheck, NS_LITERAL_STRING("true"));
@@ -1342 +1339 @@ nsGenericHTMLElement::SetSpellcheck(PRBo
- return SetAttrHelper(nsHTMLAtoms::spellcheck, NS_LITERAL_STRING("false"));
+ return SetAttrHelper(nsGkAtoms::spellcheck, NS_LITERAL_STRING("false"));
@@ -1388 +1385 @@ nsGenericHTMLElement::FindForm(nsIForm*
- if (content->Tag() == nsHTMLAtoms::form &&
+ if (content->Tag() == nsGkAtoms::form &&
@@ -1441 +1438 @@ IsArea(nsIContent *aContent)
- return (aContent->Tag() == nsHTMLAtoms::area &&
+ return (aContent->Tag() == nsGkAtoms::area &&
@@ -1546 +1543 @@ nsGenericHTMLElement::PostHandleEventFor
- GetAttr(kNameSpaceID_None, nsHTMLAtoms::target, target);
+ GetAttr(kNameSpaceID_None, nsGkAtoms::target, target);
@@ -1576 +1573 @@ nsGenericHTMLElement::PostHandleEventFor
- GetAttr(kNameSpaceID_None, nsHTMLAtoms::target, target);
+ GetAttr(kNameSpaceID_None, nsGkAtoms::target, target);
@@ -1611 +1608 @@ nsGenericHTMLElement::GetHrefURIForAncho
- const nsAttrValue* attr = mAttrsAndChildren.GetAttr(nsHTMLAtoms::href);
+ const nsAttrValue* attr = mAttrsAndChildren.GetAttr(nsGkAtoms::href);
@@ -1642,38 +1639,38 @@ PRBool nsGenericHTMLElement::IsEventName
- return (aName == nsLayoutAtoms::onclick ||
- aName == nsLayoutAtoms::ondblclick ||
- aName == nsLayoutAtoms::onmousedown ||
- aName == nsLayoutAtoms::onmouseup ||
- aName == nsLayoutAtoms::onmouseover ||
- aName == nsLayoutAtoms::onmouseout ||
- aName == nsLayoutAtoms::onkeydown ||
- aName == nsLayoutAtoms::onkeyup ||
- aName == nsLayoutAtoms::onkeypress ||
- aName == nsLayoutAtoms::onmousemove ||
- aName == nsLayoutAtoms::onload ||
- aName == nsLayoutAtoms::onunload ||
- aName == nsLayoutAtoms::onbeforeunload ||
- aName == nsLayoutAtoms::onpageshow ||
- aName == nsLayoutAtoms::onpagehide ||
- aName == nsLayoutAtoms::onabort ||
- aName == nsLayoutAtoms::onerror ||
- aName == nsLayoutAtoms::onfocus ||
- aName == nsLayoutAtoms::onblur ||
- aName == nsLayoutAtoms::onsubmit ||
- aName == nsLayoutAtoms::onreset ||
- aName == nsLayoutAtoms::onchange ||
- aName == nsLayoutAtoms::onselect ||
- aName == nsLayoutAtoms::onpaint ||
- aName == nsLayoutAtoms::onresize ||
- aName == nsLayoutAtoms::onscroll ||
- aName == nsLayoutAtoms::oninput ||
- aName == nsLayoutAtoms::oncontextmenu ||
- aName == nsLayoutAtoms::onDOMAttrModified ||
- aName == nsLayoutAtoms::onDOMCharacterDataModified ||
- aName == nsLayoutAtoms::onDOMSubtreeModified ||
- aName == nsLayoutAtoms::onDOMNodeInsertedIntoDocument ||
- aName == nsLayoutAtoms::onDOMNodeRemovedFromDocument ||
- aName == nsLayoutAtoms::onDOMNodeInserted ||
- aName == nsLayoutAtoms::onDOMNodeRemoved ||
- aName == nsLayoutAtoms::onDOMActivate ||
- aName == nsLayoutAtoms::onDOMFocusIn ||
- aName == nsLayoutAtoms::onDOMFocusOut);
+ return (aName == nsGkAtoms::onclick ||
+ aName == nsGkAtoms::ondblclick ||
+ aName == nsGkAtoms::onmousedown ||
+ aName == nsGkAtoms::onmouseup ||
+ aName == nsGkAtoms::onmouseover ||
+ aName == nsGkAtoms::onmouseout ||
+ aName == nsGkAtoms::onkeydown ||
+ aName == nsGkAtoms::onkeyup ||
+ aName == nsGkAtoms::onkeypress ||
+ aName == nsGkAtoms::onmousemove ||
+ aName == nsGkAtoms::onload ||
+ aName == nsGkAtoms::onunload ||
+ aName == nsGkAtoms::onbeforeunload ||
+ aName == nsGkAtoms::onpageshow ||
+ aName == nsGkAtoms::onpagehide ||
+ aName == nsGkAtoms::onabort ||
+ aName == nsGkAtoms::onerror ||
+ aName == nsGkAtoms::onfocus ||
+ aName == nsGkAtoms::onblur ||
+ aName == nsGkAtoms::onsubmit ||
+ aName == nsGkAtoms::onreset ||
+ aName == nsGkAtoms::onchange ||
+ aName == nsGkAtoms::onselect ||
+ aName == nsGkAtoms::onpaint ||
+ aName == nsGkAtoms::onresize ||
+ aName == nsGkAtoms::onscroll ||
+ aName == nsGkAtoms::oninput ||
+ aName == nsGkAtoms::oncontextmenu ||
+ aName == nsGkAtoms::onDOMAttrModified ||
+ aName == nsGkAtoms::onDOMCharacterDataModified ||
+ aName == nsGkAtoms::onDOMSubtreeModified ||
+ aName == nsGkAtoms::onDOMNodeInsertedIntoDocument ||
+ aName == nsGkAtoms::onDOMNodeRemovedFromDocument ||
+ aName == nsGkAtoms::onDOMNodeInserted ||
+ aName == nsGkAtoms::onDOMNodeRemoved ||
+ aName == nsGkAtoms::onDOMActivate ||
+ aName == nsGkAtoms::onDOMFocusIn ||
+ aName == nsGkAtoms::onDOMFocusOut);
@@ -1691 +1688 @@ nsGenericHTMLElement::AfterSetAttr(PRInt
- else if (aNotify && aName == nsHTMLAtoms::spellcheck) {
+ else if (aNotify && aName == nsGkAtoms::spellcheck) {
@@ -1706,2 +1703,2 @@ nsGenericHTMLElement::GetEventListenerMa
- if (mNodeInfo->Equals(nsHTMLAtoms::body) ||
- mNodeInfo->Equals(nsHTMLAtoms::frameset)) {
+ if (mNodeInfo->Equals(nsGkAtoms::body) ||
+ mNodeInfo->Equals(nsGkAtoms::frameset)) {
@@ -1761 +1758 @@ nsGenericHTMLElement::GetClasses() const
- return mAttrsAndChildren.GetAttr(nsHTMLAtoms::_class);
+ return mAttrsAndChildren.GetAttr(nsGkAtoms::_class);
@@ -1767 +1764 @@ nsGenericHTMLElement::GetIDAttributeName
- return nsHTMLAtoms::id;
+ return nsGkAtoms::id;
@@ -1773 +1770 @@ nsGenericHTMLElement::GetClassAttributeN
- return nsHTMLAtoms::_class;
+ return nsGkAtoms::_class;
@@ -1786 +1783 @@ nsGenericHTMLElement::GetInlineStyleRule
- const nsAttrValue* attrVal = mAttrsAndChildren.GetAttr(nsHTMLAtoms::style);
+ const nsAttrValue* attrVal = mAttrsAndChildren.GetAttr(nsGkAtoms::style);
@@ -1791 +1788 @@ nsGenericHTMLElement::GetInlineStyleRule
- attrVal = mAttrsAndChildren.GetAttr(nsHTMLAtoms::style);
+ attrVal = mAttrsAndChildren.GetAttr(nsGkAtoms::style);
@@ -1822 +1819 @@ nsGenericHTMLElement::SetInlineStyleRule
- modification = GetAttr(kNameSpaceID_None, nsHTMLAtoms::style,
+ modification = GetAttr(kNameSpaceID_None, nsGkAtoms::style,
@@ -1826 +1823 @@ nsGenericHTMLElement::SetInlineStyleRule
- modification = !!mAttrsAndChildren.GetAttr(nsHTMLAtoms::style);
+ modification = !!mAttrsAndChildren.GetAttr(nsGkAtoms::style);
@@ -1831 +1828 @@ nsGenericHTMLElement::SetInlineStyleRule
- return SetAttrAndNotify(kNameSpaceID_None, nsHTMLAtoms::style, nsnull, oldValueStr,
+ return SetAttrAndNotify(kNameSpaceID_None, nsGkAtoms::style, nsnull, oldValueStr,
@@ -1841 +1838 @@ nsGenericHTMLElement::GetBaseURI() const
- if (HasFlag(NODE_HAS_PROPERTIES) && (prop = GetProperty(nsHTMLAtoms::htmlBaseHref))) {
+ if (HasFlag(NODE_HAS_PROPERTIES) && (prop = GetProperty(nsGkAtoms::htmlBaseHref))) {
@@ -1868 +1865 @@ nsGenericHTMLElement::GetBaseTarget(nsAS
- if (HasFlag(NODE_HAS_PROPERTIES) && (prop = GetProperty(nsHTMLAtoms::htmlBaseTarget))) {
+ if (HasFlag(NODE_HAS_PROPERTIES) && (prop = GetProperty(nsGkAtoms::htmlBaseTarget))) {
@@ -1988 +1985 @@ nsGenericHTMLElement::ParseAttribute(PRI
- if (aAttribute == nsHTMLAtoms::dir) {
+ if (aAttribute == nsGkAtoms::dir) {
@@ -1991 +1988 @@ nsGenericHTMLElement::ParseAttribute(PRI
- if (aAttribute == nsHTMLAtoms::style) {
+ if (aAttribute == nsGkAtoms::style) {
@@ -1996 +1993 @@ nsGenericHTMLElement::ParseAttribute(PRI
- if (aAttribute == nsHTMLAtoms::_class) {
+ if (aAttribute == nsGkAtoms::_class) {
@@ -2002 +1999 @@ nsGenericHTMLElement::ParseAttribute(PRI
- if (aAttribute == nsHTMLAtoms::tabindex) {
+ if (aAttribute == nsGkAtoms::tabindex) {
@@ -2006 +2003 @@ nsGenericHTMLElement::ParseAttribute(PRI
- if (aAttribute == nsHTMLAtoms::name && !aValue.IsEmpty()) {
+ if (aAttribute == nsGkAtoms::name && !aValue.IsEmpty()) {
@@ -2352,2 +2349,2 @@ nsGenericHTMLElement::ParseImageAttribut
- if ((aAttribute == nsHTMLAtoms::width) ||
- (aAttribute == nsHTMLAtoms::height)) {
+ if ((aAttribute == nsGkAtoms::width) ||
+ (aAttribute == nsGkAtoms::height)) {
@@ -2356,3 +2353,3 @@ nsGenericHTMLElement::ParseImageAttribut
- else if ((aAttribute == nsHTMLAtoms::hspace) ||
- (aAttribute == nsHTMLAtoms::vspace) ||
- (aAttribute == nsHTMLAtoms::border)) {
+ else if ((aAttribute == nsGkAtoms::hspace) ||
+ (aAttribute == nsGkAtoms::vspace) ||
+ (aAttribute == nsGkAtoms::border)) {
@@ -2381 +2378 @@ nsGenericHTMLElement::ReparseStyleAttrib
- const nsAttrValue* oldVal = mAttrsAndChildren.GetAttr(nsHTMLAtoms::style);
+ const nsAttrValue* oldVal = mAttrsAndChildren.GetAttr(nsGkAtoms::style);
@@ -2391 +2388 @@ nsGenericHTMLElement::ReparseStyleAttrib
- nsresult rv = mAttrsAndChildren.SetAndTakeAttr(nsHTMLAtoms::style, attrValue);
+ nsresult rv = mAttrsAndChildren.SetAndTakeAttr(nsGkAtoms::style, attrValue);
@@ -2413 +2410 @@ nsGenericHTMLElement::ParseStyleAttribut
- doc->GetHeaderData(nsHTMLAtoms::headerContentStyleType, styleType);
+ doc->GetHeaderData(nsGkAtoms::headerContentStyleType, styleType);
@@ -2453 +2450 @@ nsGenericHTMLElement::MapCommonAttribute
- const nsAttrValue* value = aAttributes->GetAttr(nsHTMLAtoms::lang);
+ const nsAttrValue* value = aAttributes->GetAttr(nsGkAtoms::lang);
@@ -2465 +2462 @@ nsGenericHTMLElement::sCommonAttributeMa
- { &nsHTMLAtoms::lang },
+ { &nsGkAtoms::lang },
@@ -2471,4 +2468,4 @@ nsGenericHTMLElement::sImageMarginSizeAt
- { &nsHTMLAtoms::width },
- { &nsHTMLAtoms::height },
- { &nsHTMLAtoms::hspace },
- { &nsHTMLAtoms::vspace },
+ { &nsGkAtoms::width },
+ { &nsGkAtoms::height },
+ { &nsGkAtoms::hspace },
+ { &nsGkAtoms::vspace },
@@ -2480 +2477 @@ nsGenericHTMLElement::sImageAlignAttribu
- { &nsHTMLAtoms::align },
+ { &nsGkAtoms::align },
@@ -2486 +2483 @@ nsGenericHTMLElement::sDivAlignAttribute
- { &nsHTMLAtoms::align },
+ { &nsGkAtoms::align },
@@ -2492 +2489 @@ nsGenericHTMLElement::sImageBorderAttrib
- { &nsHTMLAtoms::border },
+ { &nsGkAtoms::border },
@@ -2498,2 +2495,2 @@ nsGenericHTMLElement::sBackgroundAttribu
- { &nsHTMLAtoms::background },
- { &nsHTMLAtoms::bgcolor },
+ { &nsGkAtoms::background },
+ { &nsGkAtoms::bgcolor },
@@ -2505 +2502 @@ nsGenericHTMLElement::sBackgroundColorAt
- { &nsHTMLAtoms::bgcolor },
+ { &nsGkAtoms::bgcolor },
@@ -2511 +2508 @@ nsGenericHTMLElement::sScrollingAttribut
- { &nsHTMLAtoms::scrolling },
+ { &nsGkAtoms::scrolling },
@@ -2520 +2517 @@ nsGenericHTMLElement::MapImageAlignAttri
- const nsAttrValue* value = aAttributes->GetAttr(nsHTMLAtoms::align);
+ const nsAttrValue* value = aAttributes->GetAttr(nsGkAtoms::align);
@@ -2550 +2547 @@ nsGenericHTMLElement::MapDivAlignAttribu
- const nsAttrValue* value = aAttributes->GetAttr(nsHTMLAtoms::align);
+ const nsAttrValue* value = aAttributes->GetAttr(nsGkAtoms::align);
@@ -2568 +2565 @@ nsGenericHTMLElement::MapImageMarginAttr
- value = aAttributes->GetAttr(nsHTMLAtoms::hspace);
+ value = aAttributes->GetAttr(nsGkAtoms::hspace);
@@ -2586 +2583 @@ nsGenericHTMLElement::MapImageMarginAttr
- value = aAttributes->GetAttr(nsHTMLAtoms::vspace);
+ value = aAttributes->GetAttr(nsGkAtoms::vspace);
@@ -2613 +2610 @@ nsGenericHTMLElement::MapImageSizeAttrib
- const nsAttrValue* value = aAttributes->GetAttr(nsHTMLAtoms::width);
+ const nsAttrValue* value = aAttributes->GetAttr(nsGkAtoms::width);
@@ -2622 +2619 @@ nsGenericHTMLElement::MapImageSizeAttrib
- const nsAttrValue* value = aAttributes->GetAttr(nsHTMLAtoms::height);
+ const nsAttrValue* value = aAttributes->GetAttr(nsGkAtoms::height);
@@ -2638 +2635 @@ nsGenericHTMLElement::MapImageBorderAttr
- const nsAttrValue* value = aAttributes->GetAttr(nsHTMLAtoms::border);
+ const nsAttrValue* value = aAttributes->GetAttr(nsGkAtoms::border);
@@ -2686 +2683 @@ nsGenericHTMLElement::MapBackgroundInto(
- const nsAttrValue* value = aAttributes->GetAttr(nsHTMLAtoms::background);
+ const nsAttrValue* value = aAttributes->GetAttr(nsGkAtoms::background);
@@ -2731 +2728 @@ nsGenericHTMLElement::MapBGColorInto(con
- const nsAttrValue* value = aAttributes->GetAttr(nsHTMLAtoms::bgcolor);
+ const nsAttrValue* value = aAttributes->GetAttr(nsGkAtoms::bgcolor);
@@ -2761 +2758 @@ nsGenericHTMLElement::MapScrollingAttrib
- const nsAttrValue* value = aAttributes->GetAttr(nsHTMLAtoms::scrolling);
+ const nsAttrValue* value = aAttributes->GetAttr(nsGkAtoms::scrolling);
@@ -2994,2 +2991,2 @@ nsGenericHTMLFormElement::SetForm(nsIDOM
- GetAttr(kNameSpaceID_None, nsHTMLAtoms::name, nameVal);
- GetAttr(kNameSpaceID_None, nsHTMLAtoms::id, idVal);
+ GetAttr(kNameSpaceID_None, nsGkAtoms::name, nameVal);
+ GetAttr(kNameSpaceID_None, nsGkAtoms::id, idVal);
@@ -3161 +3158 @@ nsGenericHTMLFormElement::BeforeSetAttr(
- if (mForm && (aName == nsHTMLAtoms::name || aName == nsHTMLAtoms::id)) {
+ if (mForm && (aName == nsGkAtoms::name || aName == nsGkAtoms::id)) {
@@ -3169,2 +3166,2 @@ nsGenericHTMLFormElement::BeforeSetAttr(
- if (mForm && aName == nsHTMLAtoms::type) {
- GetAttr(kNameSpaceID_None, nsHTMLAtoms::name, tmp);
+ if (mForm && aName == nsGkAtoms::type) {
+ GetAttr(kNameSpaceID_None, nsGkAtoms::name, tmp);
@@ -3176 +3173 @@ nsGenericHTMLFormElement::BeforeSetAttr(
- GetAttr(kNameSpaceID_None, nsHTMLAtoms::id, tmp);
+ GetAttr(kNameSpaceID_None, nsGkAtoms::id, tmp);
@@ -3197 +3194 @@ nsGenericHTMLFormElement::AfterSetAttr(P
- if (mForm && (aName == nsHTMLAtoms::name || aName == nsHTMLAtoms::id) &&
+ if (mForm && (aName == nsGkAtoms::name || aName == nsGkAtoms::id) &&
@@ -3204 +3201 @@ nsGenericHTMLFormElement::AfterSetAttr(P
- if (mForm && aName == nsHTMLAtoms::type) {
+ if (mForm && aName == nsGkAtoms::type) {
@@ -3207 +3204 @@ nsGenericHTMLFormElement::AfterSetAttr(P
- GetAttr(kNameSpaceID_None, nsHTMLAtoms::name, tmp);
+ GetAttr(kNameSpaceID_None, nsGkAtoms::name, tmp);
@@ -3213 +3210 @@ nsGenericHTMLFormElement::AfterSetAttr(P
- GetAttr(kNameSpaceID_None, nsHTMLAtoms::id, tmp);
+ GetAttr(kNameSpaceID_None, nsGkAtoms::id, tmp);
@@ -3224 +3221 @@ nsGenericHTMLFormElement::AfterSetAttr(P
- if (aNotify && aName == nsHTMLAtoms::disabled && CanBeDisabled()) {
+ if (aNotify && aName == nsGkAtoms::disabled && CanBeDisabled()) {
@@ -3289 +3286 @@ nsGenericHTMLFormElement::IntrinsicState
- GetBoolAttr(nsHTMLAtoms::disabled, &disabled);
+ GetBoolAttr(nsGkAtoms::disabled, &disabled);
@@ -3465 +3462 @@ nsGenericHTMLFrameElement::SetAttr(PRInt
- aName == nsHTMLAtoms::src) {
+ aName == nsGkAtoms::src) {
@@ -3557 +3554 @@ nsGenericHTMLElement::IsFocusable(PRInt3
- PRBool disabled = HasAttr(kNameSpaceID_None, nsHTMLAtoms::disabled);
+ PRBool disabled = HasAttr(kNameSpaceID_None, nsGkAtoms::disabled);
@@ -3567 +3564 @@ nsGenericHTMLElement::IsFocusable(PRInt3
- return tabIndex >= 0 || (!disabled && HasAttr(kNameSpaceID_None, nsHTMLAtoms::tabindex));
+ return tabIndex >= 0 || (!disabled && HasAttr(kNameSpaceID_None, nsGkAtoms::tabindex));
@@ -3575 +3572 @@ nsGenericHTMLElement::RegUnRegAccessKey(
- GetAttr(kNameSpaceID_None, nsHTMLAtoms::accesskey, accessKey);
+ GetAttr(kNameSpaceID_None, nsGkAtoms::accesskey, accessKey);
Index: mozilla/content/svg/content/src/nsSVGAngle.cpp
===================================================================
RCS file: /cvsroot/mozilla/content/svg/content/src/nsSVGAngle.cpp,v
retrieving revision 1.9
diff -u -p -0 -r1.9 nsSVGAngle.cpp
--- mozilla/content/svg/content/src/nsSVGAngle.cpp 28 Jun 2006 21:54:12 -0000 1.9
+++ mozilla/content/svg/content/src/nsSVGAngle.cpp 3 Oct 2006 22:56:41 -0000
@@ -39 +38,0 @@
-#include "nsSVGAtoms.h"
@@ -379 +378 @@ void nsSVGAngle::GetUnitString(nsAString
- UnitAtom = nsSVGAtoms::deg;
+ UnitAtom = nsGkAtoms::deg;
@@ -382 +381 @@ void nsSVGAngle::GetUnitString(nsAString
- UnitAtom = nsSVGAtoms::grad;
+ UnitAtom = nsGkAtoms::grad;
@@ -385 +384 @@ void nsSVGAngle::GetUnitString(nsAString
- UnitAtom = nsSVGAtoms::rad;
+ UnitAtom = nsGkAtoms::rad;
@@ -402 +401 @@ PRUint16 nsSVGAngle::GetUnitTypeForStrin
- if (unitAtom == nsSVGAtoms::deg)
+ if (unitAtom == nsGkAtoms::deg)
@@ -404 +403 @@ PRUint16 nsSVGAngle::GetUnitTypeForStrin
- else if (unitAtom == nsSVGAtoms::grad)
+ else if (unitAtom == nsGkAtoms::grad)
@@ -406 +405 @@ PRUint16 nsSVGAngle::GetUnitTypeForStrin
- else if (unitAtom == nsSVGAtoms::rad)
+ else if (unitAtom == nsGkAtoms::rad)
Index: mozilla/content/svg/content/src/nsSVGAtoms.h
===================================================================
RCS file: /cvsroot/mozilla/content/svg/content/src/nsSVGAtoms.h,v
retrieving revision 1.9
diff -u -p -0 -r1.9 nsSVGAtoms.h
--- mozilla/content/svg/content/src/nsSVGAtoms.h 19 Jan 2006 00:57:48 -0000 1.9
+++ mozilla/content/svg/content/src/nsSVGAtoms.h 3 Oct 2006 22:56:41 -0000
@@ -38,2 +38,2 @@
-#ifndef nsSVGAtoms_h___
-#define nsSVGAtoms_h___
+#ifndef nsGkAtoms_h___
+#define nsGkAtoms_h___
@@ -41,2 +41 @@
-#include "nsGkAtoms.h"
-typedef class nsGkAtoms nsSVGAtoms;
+typedef class nsGkAtoms nsGkAtoms;
@@ -44 +43 @@ typedef class nsGkAtoms nsSVGAtoms;
-#endif /* nsSVGAtoms_h___ */
+#endif /* nsGkAtoms_h___ */
Index: mozilla/content/svg/content/src/nsSVGClipPathElement.cpp
===================================================================
RCS file: /cvsroot/mozilla/content/svg/content/src/nsSVGClipPathElement.cpp,v
retrieving revision 1.3
diff -u -p -0 -r1.3 nsSVGClipPathElement.cpp
--- mozilla/content/svg/content/src/nsSVGClipPathElement.cpp 5 Sep 2006 10:22:53 -0000 1.3
+++ mozilla/content/svg/content/src/nsSVGClipPathElement.cpp 3 Oct 2006 22:56:41 -0000
@@ -39 +38,0 @@
-#include "nsSVGAtoms.h"
@@ -112,2 +111,2 @@ nsSVGClipPathElement::Init()
- {&nsSVGAtoms::objectBoundingBox, nsIDOMSVGClipPathElement::SVG_CPUNITS_OBJECTBOUNDINGBOX},
- {&nsSVGAtoms::userSpaceOnUse, nsIDOMSVGClipPathElement::SVG_CPUNITS_USERSPACEONUSE},
+ {&nsGkAtoms::objectBoundingBox, nsIDOMSVGClipPathElement::SVG_CPUNITS_OBJECTBOUNDINGBOX},
+ {&nsGkAtoms::userSpaceOnUse, nsIDOMSVGClipPathElement::SVG_CPUNITS_USERSPACEONUSE},
@@ -126 +125 @@ nsSVGClipPathElement::Init()
- rv = AddMappedSVGValue(nsSVGAtoms::clipPathUnits, mClipPathUnits);
+ rv = AddMappedSVGValue(nsGkAtoms::clipPathUnits, mClipPathUnits);
Index: mozilla/content/svg/content/src/nsSVGElement.cpp
===================================================================
RCS file: /cvsroot/mozilla/content/svg/content/src/nsSVGElement.cpp,v
retrieving revision 1.103
diff -u -p -0 -r1.103 nsSVGElement.cpp
--- mozilla/content/svg/content/src/nsSVGElement.cpp 8 Aug 2006 14:36:43 -0000 1.103
+++ mozilla/content/svg/content/src/nsSVGElement.cpp 3 Oct 2006 22:56:41 -0000
@@ -55,3 +54,0 @@
-#include "nsSVGAtoms.h"
-#include "nsLayoutAtoms.h"
-#include "nsHTMLAtoms.h"
@@ -160 +157 @@ nsSVGElement::GetIDAttributeName() const
- return nsSVGAtoms::id;
+ return nsGkAtoms::id;
@@ -166 +163 @@ nsSVGElement::GetClassAttributeName() co
- return nsSVGAtoms::_class;
+ return nsGkAtoms::_class;
@@ -250 +247 @@ nsSVGElement::ParseAttribute(PRInt32 aNa
- if (aAttribute == nsSVGAtoms::style) {
+ if (aAttribute == nsGkAtoms::style) {
@@ -378 +375 @@ nsSVGElement::SetInlineStyleRule(nsICSSS
- modification = GetAttr(kNameSpaceID_None, nsHTMLAtoms::style,
+ modification = GetAttr(kNameSpaceID_None, nsGkAtoms::style,
@@ -382 +379 @@ nsSVGElement::SetInlineStyleRule(nsICSSS
- modification = !!mAttrsAndChildren.GetAttr(nsHTMLAtoms::style);
+ modification = !!mAttrsAndChildren.GetAttr(nsGkAtoms::style);
@@ -387 +384 @@ nsSVGElement::SetInlineStyleRule(nsICSSS
- return SetAttrAndNotify(kNameSpaceID_None, nsHTMLAtoms::style, nsnull, oldValueStr,
+ return SetAttrAndNotify(kNameSpaceID_None, nsGkAtoms::style, nsnull, oldValueStr,
@@ -394 +391 @@ nsSVGElement::GetInlineStyleRule()
- const nsAttrValue* attrVal = mAttrsAndChildren.GetAttr(nsSVGAtoms::style);
+ const nsAttrValue* attrVal = mAttrsAndChildren.GetAttr(nsGkAtoms::style);
@@ -406,11 +403,11 @@ nsSVGElement::sFillStrokeMap[] = {
- { &nsSVGAtoms::fill },
- { &nsSVGAtoms::fill_opacity },
- { &nsSVGAtoms::fill_rule },
- { &nsSVGAtoms::stroke },
- { &nsSVGAtoms::stroke_dasharray },
- { &nsSVGAtoms::stroke_dashoffset },
- { &nsSVGAtoms::stroke_linecap },
- { &nsSVGAtoms::stroke_linejoin },
- { &nsSVGAtoms::stroke_miterlimit },
- { &nsSVGAtoms::stroke_opacity },
- { &nsSVGAtoms::stroke_width },
+ { &nsGkAtoms::fill },
+ { &nsGkAtoms::fill_opacity },
+ { &nsGkAtoms::fill_rule },
+ { &nsGkAtoms::stroke },
+ { &nsGkAtoms::stroke_dasharray },
+ { &nsGkAtoms::stroke_dashoffset },
+ { &nsGkAtoms::stroke_linecap },
+ { &nsGkAtoms::stroke_linejoin },
+ { &nsGkAtoms::stroke_miterlimit },
+ { &nsGkAtoms::stroke_opacity },
+ { &nsGkAtoms::stroke_width },
@@ -423,12 +420,12 @@ nsSVGElement::sGraphicsMap[] = {
- { &nsSVGAtoms::clip_path },
- { &nsSVGAtoms::clip_rule },
- { &nsSVGAtoms::cursor },
- { &nsSVGAtoms::display },
- { &nsSVGAtoms::filter },
- { &nsSVGAtoms::image_rendering },
- { &nsSVGAtoms::mask },
- { &nsSVGAtoms::opacity },
- { &nsSVGAtoms::pointer_events },
- { &nsSVGAtoms::shape_rendering },
- { &nsSVGAtoms::text_rendering },
- { &nsSVGAtoms::visibility },
+ { &nsGkAtoms::clip_path },
+ { &nsGkAtoms::clip_rule },
+ { &nsGkAtoms::cursor },
+ { &nsGkAtoms::display },
+ { &nsGkAtoms::filter },
+ { &nsGkAtoms::image_rendering },
+ { &nsGkAtoms::mask },
+ { &nsGkAtoms::opacity },
+ { &nsGkAtoms::pointer_events },
+ { &nsGkAtoms::shape_rendering },
+ { &nsGkAtoms::text_rendering },
+ { &nsGkAtoms::visibility },
@@ -441,12 +438,12 @@ nsSVGElement::sTextContentElementsMap[]
- { &nsSVGAtoms::alignment_baseline },
- { &nsSVGAtoms::baseline_shift },
- { &nsSVGAtoms::direction },
- { &nsSVGAtoms::dominant_baseline },
- { &nsSVGAtoms::glyph_orientation_horizontal },
- { &nsSVGAtoms::glyph_orientation_vertical },
- { &nsSVGAtoms::kerning },
- { &nsSVGAtoms::letter_spacing },
- { &nsSVGAtoms::text_anchor },
- { &nsSVGAtoms::text_decoration },
- { &nsSVGAtoms::unicode_bidi },
- { &nsSVGAtoms::word_spacing },
+ { &nsGkAtoms::alignment_baseline },
+ { &nsGkAtoms::baseline_shift },
+ { &nsGkAtoms::direction },
+ { &nsGkAtoms::dominant_baseline },
+ { &nsGkAtoms::glyph_orientation_horizontal },
+ { &nsGkAtoms::glyph_orientation_vertical },
+ { &nsGkAtoms::kerning },
+ { &nsGkAtoms::letter_spacing },
+ { &nsGkAtoms::text_anchor },
+ { &nsGkAtoms::text_decoration },
+ { &nsGkAtoms::unicode_bidi },
+ { &nsGkAtoms::word_spacing },
@@ -459,7 +456,7 @@ nsSVGElement::sFontSpecificationMap[] =
- { &nsSVGAtoms::font_family },
- { &nsSVGAtoms::font_size },
- { &nsSVGAtoms::font_size_adjust },
- { &nsSVGAtoms::font_stretch },
- { &nsSVGAtoms::font_style },
- { &nsSVGAtoms::font_variant },
- { &nsSVGAtoms::fontWeight },
+ { &nsGkAtoms::font_family },
+ { &nsGkAtoms::font_size },
+ { &nsGkAtoms::font_size_adjust },
+ { &nsGkAtoms::font_stretch },
+ { &nsGkAtoms::font_style },
+ { &nsGkAtoms::font_variant },
+ { &nsGkAtoms::fontWeight },
@@ -472,2 +469,2 @@ nsSVGElement::sGradientStopMap[] = {
- { &nsSVGAtoms::stop_color },
- { &nsSVGAtoms::stop_opacity },
+ { &nsGkAtoms::stop_color },
+ { &nsGkAtoms::stop_opacity },
@@ -480,2 +477,2 @@ nsSVGElement::sViewportsMap[] = {
- { &nsSVGAtoms::overflow },
- { &nsSVGAtoms::clip },
+ { &nsGkAtoms::overflow },
+ { &nsGkAtoms::clip },
@@ -488,3 +485,3 @@ nsSVGElement::sMarkersMap[] = {
- { &nsSVGAtoms::marker_end },
- { &nsSVGAtoms::marker_mid },
- { &nsSVGAtoms::marker_start },
+ { &nsGkAtoms::marker_end },
+ { &nsGkAtoms::marker_mid },
+ { &nsGkAtoms::marker_start },
@@ -497 +494 @@ nsSVGElement::sColorMap[] = {
- { &nsSVGAtoms::color },
+ { &nsGkAtoms::color },
@@ -524 +521 @@ NS_IMETHODIMP nsSVGElement::GetId(nsAStr
- GetAttr(kNameSpaceID_None, nsSVGAtoms::id, aId);
+ GetAttr(kNameSpaceID_None, nsGkAtoms::id, aId);
@@ -531 +528 @@ NS_IMETHODIMP nsSVGElement::SetId(const
- return SetAttr(kNameSpaceID_None, nsSVGAtoms::id, aId, PR_TRUE);
+ return SetAttr(kNameSpaceID_None, nsGkAtoms::id, aId, PR_TRUE);
@@ -841,9 +838,9 @@ nsSVGElement::IsGraphicElementEventName(
- return (aName == nsSVGAtoms::onabort ||
- aName == nsSVGAtoms::onclick ||
- aName == nsSVGAtoms::onerror ||
- aName == nsSVGAtoms::onload ||
- aName == nsSVGAtoms::onmousedown ||
- aName == nsSVGAtoms::onmouseup ||
- aName == nsSVGAtoms::onmouseover ||
- aName == nsSVGAtoms::onmousemove ||
- aName == nsSVGAtoms::onmouseout);
+ return (aName == nsGkAtoms::onabort ||
+ aName == nsGkAtoms::onclick ||
+ aName == nsGkAtoms::onerror ||
+ aName == nsGkAtoms::onload ||
+ aName == nsGkAtoms::onmousedown ||
+ aName == nsGkAtoms::onmouseup ||
+ aName == nsGkAtoms::onmouseover ||
+ aName == nsGkAtoms::onmousemove ||
+ aName == nsGkAtoms::onmouseout);
@@ -855,14 +852,14 @@ nsIAtom* nsSVGElement::GetEventNameForAt
- if (aAttr == nsSVGAtoms::onload)
- return nsLayoutAtoms::onSVGLoad;
- if (aAttr == nsSVGAtoms::onunload)
- return nsLayoutAtoms::onSVGUnload;
- if (aAttr == nsSVGAtoms::onabort)
- return nsLayoutAtoms::onSVGAbort;
- if (aAttr == nsSVGAtoms::onerror)
- return nsLayoutAtoms::onSVGError;
- if (aAttr == nsSVGAtoms::onresize)
- return nsLayoutAtoms::onSVGResize;
- if (aAttr == nsSVGAtoms::onscroll)
- return nsLayoutAtoms::onSVGScroll;
- if (aAttr == nsSVGAtoms::onzoom)
- return nsLayoutAtoms::onSVGZoom;
+ if (aAttr == nsGkAtoms::onload)
+ return nsGkAtoms::onSVGLoad;
+ if (aAttr == nsGkAtoms::onunload)
+ return nsGkAtoms::onSVGUnload;
+ if (aAttr == nsGkAtoms::onabort)
+ return nsGkAtoms::onSVGAbort;
+ if (aAttr == nsGkAtoms::onerror)
+ return nsGkAtoms::onSVGError;
+ if (aAttr == nsGkAtoms::onresize)
+ return nsGkAtoms::onSVGResize;
+ if (aAttr == nsGkAtoms::onscroll)
+ return nsGkAtoms::onSVGScroll;
+ if (aAttr == nsGkAtoms::onzoom)
+ return nsGkAtoms::onSVGZoom;
Index: mozilla/content/svg/content/src/nsSVGElementFactory.cpp
===================================================================
RCS file: /cvsroot/mozilla/content/svg/content/src/nsSVGElementFactory.cpp,v
retrieving revision 1.32
diff -u -p -0 -r1.32 nsSVGElementFactory.cpp
--- mozilla/content/svg/content/src/nsSVGElementFactory.cpp 11 Sep 2006 15:26:18 -0000 1.32
+++ mozilla/content/svg/content/src/nsSVGElementFactory.cpp 3 Oct 2006 22:56:42 -0000
@@ -43 +42,0 @@
-#include "nsSVGAtoms.h"
@@ -147 +146 @@ NS_NewSVGElement(nsIContent** aResult, n
- if (name == nsSVGAtoms::polyline)
+ if (name == nsGkAtoms::polyline)
@@ -149 +148 @@ NS_NewSVGElement(nsIContent** aResult, n
- if (name == nsSVGAtoms::polygon)
+ if (name == nsGkAtoms::polygon)
@@ -151 +150 @@ NS_NewSVGElement(nsIContent** aResult, n
- if (name == nsSVGAtoms::circle)
+ if (name == nsGkAtoms::circle)
@@ -153 +152 @@ NS_NewSVGElement(nsIContent** aResult, n
- if (name == nsSVGAtoms::ellipse)
+ if (name == nsGkAtoms::ellipse)
@@ -155 +154 @@ NS_NewSVGElement(nsIContent** aResult, n
- if (name == nsSVGAtoms::line)
+ if (name == nsGkAtoms::line)
@@ -157 +156 @@ NS_NewSVGElement(nsIContent** aResult, n
- if (name == nsSVGAtoms::rect)
+ if (name == nsGkAtoms::rect)
@@ -159 +158 @@ NS_NewSVGElement(nsIContent** aResult, n
- if (name == nsSVGAtoms::svg)
+ if (name == nsGkAtoms::svg)
@@ -161 +160 @@ NS_NewSVGElement(nsIContent** aResult, n
- if (name == nsSVGAtoms::g)
+ if (name == nsGkAtoms::g)
@@ -164 +163 @@ NS_NewSVGElement(nsIContent** aResult, n
- if (name == nsSVGAtoms::foreignObject)
+ if (name == nsGkAtoms::foreignObject)
@@ -167 +166 @@ NS_NewSVGElement(nsIContent** aResult, n
- if (name == nsSVGAtoms::path)
+ if (name == nsGkAtoms::path)
@@ -169 +168 @@ NS_NewSVGElement(nsIContent** aResult, n
- if (name == nsSVGAtoms::text)
+ if (name == nsGkAtoms::text)
@@ -171 +170 @@ NS_NewSVGElement(nsIContent** aResult, n
- if (name == nsSVGAtoms::tspan)
+ if (name == nsGkAtoms::tspan)
@@ -173 +172 @@ NS_NewSVGElement(nsIContent** aResult, n
- if (name == nsSVGAtoms::image)
+ if (name == nsGkAtoms::image)
@@ -175 +174 @@ NS_NewSVGElement(nsIContent** aResult, n
- if (name == nsSVGAtoms::style)
+ if (name == nsGkAtoms::style)
@@ -177 +176 @@ NS_NewSVGElement(nsIContent** aResult, n
- if (name == nsSVGAtoms::linearGradient)
+ if (name == nsGkAtoms::linearGradient)
@@ -179 +178 @@ NS_NewSVGElement(nsIContent** aResult, n
- if (name == nsSVGAtoms::metadata)
+ if (name == nsGkAtoms::metadata)
@@ -181 +180 @@ NS_NewSVGElement(nsIContent** aResult, n
- if (name == nsSVGAtoms::radialGradient)
+ if (name == nsGkAtoms::radialGradient)
@@ -183 +182 @@ NS_NewSVGElement(nsIContent** aResult, n
- if (name == nsSVGAtoms::stop)
+ if (name == nsGkAtoms::stop)
@@ -185 +184 @@ NS_NewSVGElement(nsIContent** aResult, n
- if (name == nsSVGAtoms::defs)
+ if (name == nsGkAtoms::defs)
@@ -187 +186 @@ NS_NewSVGElement(nsIContent** aResult, n
- if (name == nsSVGAtoms::desc)
+ if (name == nsGkAtoms::desc)
@@ -189 +188 @@ NS_NewSVGElement(nsIContent** aResult, n
- if (name == nsSVGAtoms::script)
+ if (name == nsGkAtoms::script)
@@ -191 +190 @@ NS_NewSVGElement(nsIContent** aResult, n
- if (name == nsSVGAtoms::use)
+ if (name == nsGkAtoms::use)
@@ -193 +192 @@ NS_NewSVGElement(nsIContent** aResult, n
- if (name == nsSVGAtoms::symbol)
+ if (name == nsGkAtoms::symbol)
@@ -195 +194 @@ NS_NewSVGElement(nsIContent** aResult, n
- if (name == nsSVGAtoms::marker)
+ if (name == nsGkAtoms::marker)
@@ -197 +196 @@ NS_NewSVGElement(nsIContent** aResult, n
- if (name == nsSVGAtoms::title)
+ if (name == nsGkAtoms::title)
@@ -199 +198 @@ NS_NewSVGElement(nsIContent** aResult, n
- if (name == nsSVGAtoms::clipPath)
+ if (name == nsGkAtoms::clipPath)
@@ -201 +200 @@ NS_NewSVGElement(nsIContent** aResult, n
- if (name == nsSVGAtoms::textPath)
+ if (name == nsGkAtoms::textPath)
@@ -203 +202 @@ NS_NewSVGElement(nsIContent** aResult, n
- if (name == nsSVGAtoms::filter)
+ if (name == nsGkAtoms::filter)
@@ -205 +204 @@ NS_NewSVGElement(nsIContent** aResult, n
- if (name == nsSVGAtoms::feGaussianBlur)
+ if (name == nsGkAtoms::feGaussianBlur)
@@ -207 +206 @@ NS_NewSVGElement(nsIContent** aResult, n
- if (name == nsSVGAtoms::feComponentTransfer)
+ if (name == nsGkAtoms::feComponentTransfer)
@@ -209 +208 @@ NS_NewSVGElement(nsIContent** aResult, n
- if (name == nsSVGAtoms::feFuncR)
+ if (name == nsGkAtoms::feFuncR)
@@ -211 +210 @@ NS_NewSVGElement(nsIContent** aResult, n
- if (name == nsSVGAtoms::feFuncG)
+ if (name == nsGkAtoms::feFuncG)
@@ -213 +212 @@ NS_NewSVGElement(nsIContent** aResult, n
- if (name == nsSVGAtoms::feFuncB)
+ if (name == nsGkAtoms::feFuncB)
@@ -215 +214 @@ NS_NewSVGElement(nsIContent** aResult, n
- if (name == nsSVGAtoms::feFuncA)
+ if (name == nsGkAtoms::feFuncA)
@@ -217 +216 @@ NS_NewSVGElement(nsIContent** aResult, n
- if (name == nsSVGAtoms::feMerge)
+ if (name == nsGkAtoms::feMerge)
@@ -219 +218 @@ NS_NewSVGElement(nsIContent** aResult, n
- if (name == nsSVGAtoms::feMergeNode)
+ if (name == nsGkAtoms::feMergeNode)
@@ -221 +220 @@ NS_NewSVGElement(nsIContent** aResult, n
- if (name == nsSVGAtoms::feOffset)
+ if (name == nsGkAtoms::feOffset)
@@ -223,12 +222,12 @@ NS_NewSVGElement(nsIContent** aResult, n
- if (name == nsSVGAtoms::feBlend ||
- name == nsSVGAtoms::feColorMatrix ||
- name == nsSVGAtoms::feComposite ||
- name == nsSVGAtoms::feConvolveMatrix ||
- name == nsSVGAtoms::feDiffuseLighting ||
- name == nsSVGAtoms::feDisplacementMap ||
- name == nsSVGAtoms::feFlood ||
- name == nsSVGAtoms::feImage ||
- name == nsSVGAtoms::feMorphology ||
- name == nsSVGAtoms::feSpecularLighting ||
- name == nsSVGAtoms::feTile ||
- name == nsSVGAtoms::feTurbulence)
+ if (name == nsGkAtoms::feBlend ||
+ name == nsGkAtoms::feColorMatrix ||
+ name == nsGkAtoms::feComposite ||
+ name == nsGkAtoms::feConvolveMatrix ||
+ name == nsGkAtoms::feDiffuseLighting ||
+ name == nsGkAtoms::feDisplacementMap ||
+ name == nsGkAtoms::feFlood ||
+ name == nsGkAtoms::feImage ||
+ name == nsGkAtoms::feMorphology ||
+ name == nsGkAtoms::feSpecularLighting ||
+ name == nsGkAtoms::feTile ||
+ name == nsGkAtoms::feTurbulence)
@@ -236 +235 @@ NS_NewSVGElement(nsIContent** aResult, n
- if (name == nsSVGAtoms::pattern)
+ if (name == nsGkAtoms::pattern)
@@ -238 +237 @@ NS_NewSVGElement(nsIContent** aResult, n
- if (name == nsSVGAtoms::mask)
+ if (name == nsGkAtoms::mask)
Index: mozilla/content/svg/content/src/nsSVGFeatures.cpp
===================================================================
RCS file: /cvsroot/mozilla/content/svg/content/src/nsSVGFeatures.cpp,v
retrieving revision 1.5
diff -u -p -0 -r1.5 nsSVGFeatures.cpp
--- mozilla/content/svg/content/src/nsSVGFeatures.cpp 11 Sep 2006 15:26:18 -0000 1.5
+++ mozilla/content/svg/content/src/nsSVGFeatures.cpp 3 Oct 2006 22:56:42 -0000
@@ -42 +41,0 @@
-#include "nsSVGAtoms.h"
@@ -90 +89 @@ NS_SVG_Conditional(const nsIAtom *atom,
-#define SVG_ELEMENT(_atom, _supports) if (atom == nsSVGAtoms::_atom) return (_supports & cond) != 0;
+#define SVG_ELEMENT(_atom, _supports) if (atom == nsGkAtoms::_atom) return (_supports & cond) != 0;
Index: mozilla/content/svg/content/src/nsSVGFilterElement.cpp
===================================================================
RCS file: /cvsroot/mozilla/content/svg/content/src/nsSVGFilterElement.cpp,v
retrieving revision 1.4
diff -u -p -0 -r1.4 nsSVGFilterElement.cpp
--- mozilla/content/svg/content/src/nsSVGFilterElement.cpp 5 Sep 2006 10:22:53 -0000 1.4
+++ mozilla/content/svg/content/src/nsSVGFilterElement.cpp 3 Oct 2006 22:56:42 -0000
@@ -37 +36,0 @@
-#include "nsSVGAtoms.h"
@@ -88,2 +87,2 @@ nsSVGFilterElement::Init()
- {&nsSVGAtoms::objectBoundingBox, nsIDOMSVGFilterElement::SVG_FUNITS_OBJECTBOUNDINGBOX},
- {&nsSVGAtoms::userSpaceOnUse, nsIDOMSVGFilterElement::SVG_FUNITS_USERSPACEONUSE},
+ {&nsGkAtoms::objectBoundingBox, nsIDOMSVGFilterElement::SVG_FUNITS_OBJECTBOUNDINGBOX},
+ {&nsGkAtoms::userSpaceOnUse, nsIDOMSVGFilterElement::SVG_FUNITS_USERSPACEONUSE},
@@ -103 +102 @@ nsSVGFilterElement::Init()
- rv = AddMappedSVGValue(nsSVGAtoms::filterUnits, mFilterUnits);
+ rv = AddMappedSVGValue(nsGkAtoms::filterUnits, mFilterUnits);
@@ -115 +114 @@ nsSVGFilterElement::Init()
- rv = AddMappedSVGValue(nsSVGAtoms::primitiveUnits, mPrimitiveUnits);
+ rv = AddMappedSVGValue(nsGkAtoms::primitiveUnits, mPrimitiveUnits);
@@ -242 +241 @@ nsSVGFilterElement::SetAttr(PRInt32 aNam
- if (aName == nsSVGAtoms::filterRes && aNameSpaceID == kNameSpaceID_None) {
+ if (aName == nsGkAtoms::filterRes && aNameSpaceID == kNameSpaceID_None) {
Index: mozilla/content/svg/content/src/nsSVGFilters.cpp
===================================================================
RCS file: /cvsroot/mozilla/content/svg/content/src/nsSVGFilters.cpp,v
retrieving revision 1.13
diff -u -p -0 -r1.13 nsSVGFilters.cpp
--- mozilla/content/svg/content/src/nsSVGFilters.cpp 25 Sep 2006 16:46:21 -0000 1.13
+++ mozilla/content/svg/content/src/nsSVGFilters.cpp 3 Oct 2006 22:56:42 -0000
@@ -40 +39,0 @@
-#include "nsSVGAtoms.h"
@@ -42 +40,0 @@
-#include "nsGkAtoms.h"
@@ -93 +91 @@ nsSVGFE::Init()
- rv = AddMappedSVGValue(nsSVGAtoms::result, mResult);
+ rv = AddMappedSVGValue(nsGkAtoms::result, mResult);
@@ -469 +467 @@ nsSVGFEGaussianBlurElement::Init()
- rv = AddMappedSVGValue(nsSVGAtoms::in, mIn1);
+ rv = AddMappedSVGValue(nsGkAtoms::in, mIn1);
@@ -522 +520 @@ nsSVGFEGaussianBlurElement::SetAttr(PRIn
- if (aName == nsSVGAtoms::stdDeviation && aNameSpaceID == kNameSpaceID_None) {
+ if (aName == nsGkAtoms::stdDeviation && aNameSpaceID == kNameSpaceID_None) {
@@ -827 +825 @@ nsSVGFEComponentTransferElement::Init()
- rv = AddMappedSVGValue(nsSVGAtoms::in, mIn1);
+ rv = AddMappedSVGValue(nsGkAtoms::in, mIn1);
@@ -1023 +1021 @@ nsSVGComponentTransferFunctionElement::I
- {&nsSVGAtoms::identity,
+ {&nsGkAtoms::identity,
@@ -1025 +1023 @@ nsSVGComponentTransferFunctionElement::I
- {&nsSVGAtoms::table,
+ {&nsGkAtoms::table,
@@ -1027 +1025 @@ nsSVGComponentTransferFunctionElement::I
- {&nsSVGAtoms::discrete,
+ {&nsGkAtoms::discrete,
@@ -1029 +1027 @@ nsSVGComponentTransferFunctionElement::I
- {&nsSVGAtoms::linear,
+ {&nsGkAtoms::linear,
@@ -1031 +1029 @@ nsSVGComponentTransferFunctionElement::I
- {&nsSVGAtoms::gamma,
+ {&nsGkAtoms::gamma,
@@ -1047 +1045 @@ nsSVGComponentTransferFunctionElement::I
- rv = AddMappedSVGValue(nsSVGAtoms::type, mType);
+ rv = AddMappedSVGValue(nsGkAtoms::type, mType);
@@ -1058 +1056 @@ nsSVGComponentTransferFunctionElement::I
- rv = AddMappedSVGValue(nsSVGAtoms::tableValues, mTableValues);
+ rv = AddMappedSVGValue(nsGkAtoms::tableValues, mTableValues);
@@ -1658 +1656 @@ nsSVGFEMergeNodeElement::Init()
- rv = AddMappedSVGValue(nsSVGAtoms::in, mIn1);
+ rv = AddMappedSVGValue(nsGkAtoms::in, mIn1);
@@ -1800 +1798 @@ nsSVGFEOffsetElement::Init()
- rv = AddMappedSVGValue(nsSVGAtoms::in, mIn1);
+ rv = AddMappedSVGValue(nsGkAtoms::in, mIn1);
Index: mozilla/content/svg/content/src/nsSVGGradientElement.cpp
===================================================================
RCS file: /cvsroot/mozilla/content/svg/content/src/nsSVGGradientElement.cpp,v
retrieving revision 1.8
diff -u -p -0 -r1.8 nsSVGGradientElement.cpp
--- mozilla/content/svg/content/src/nsSVGGradientElement.cpp 5 Sep 2006 10:22:53 -0000 1.8
+++ mozilla/content/svg/content/src/nsSVGGradientElement.cpp 3 Oct 2006 22:56:43 -0000
@@ -50 +49,0 @@
-#include "nsSVGAtoms.h"
@@ -81,2 +80,2 @@ nsSVGGradientElement::Init()
- {&nsSVGAtoms::objectBoundingBox, nsIDOMSVGGradientElement::SVG_GRUNITS_OBJECTBOUNDINGBOX},
- {&nsSVGAtoms::userSpaceOnUse, nsIDOMSVGGradientElement::SVG_GRUNITS_USERSPACEONUSE},
+ {&nsGkAtoms::objectBoundingBox, nsIDOMSVGGradientElement::SVG_GRUNITS_OBJECTBOUNDINGBOX},
+ {&nsGkAtoms::userSpaceOnUse, nsIDOMSVGGradientElement::SVG_GRUNITS_USERSPACEONUSE},
@@ -87,3 +86,3 @@ nsSVGGradientElement::Init()
- {&nsSVGAtoms::pad, nsIDOMSVGGradientElement::SVG_SPREADMETHOD_PAD},
- {&nsSVGAtoms::reflect, nsIDOMSVGGradientElement::SVG_SPREADMETHOD_REFLECT},
- {&nsSVGAtoms::repeat, nsIDOMSVGGradientElement::SVG_SPREADMETHOD_REPEAT},
+ {&nsGkAtoms::pad, nsIDOMSVGGradientElement::SVG_SPREADMETHOD_PAD},
+ {&nsGkAtoms::reflect, nsIDOMSVGGradientElement::SVG_SPREADMETHOD_REFLECT},
+ {&nsGkAtoms::repeat, nsIDOMSVGGradientElement::SVG_SPREADMETHOD_REPEAT},
@@ -103 +102 @@ nsSVGGradientElement::Init()
- rv = AddMappedSVGValue(nsSVGAtoms::gradientUnits, mGradientUnits);
+ rv = AddMappedSVGValue(nsGkAtoms::gradientUnits, mGradientUnits);
@@ -115 +114 @@ nsSVGGradientElement::Init()
- rv = AddMappedSVGValue(nsSVGAtoms::gradientTransform, mGradientTransform);
+ rv = AddMappedSVGValue(nsGkAtoms::gradientTransform, mGradientTransform);
@@ -127 +126 @@ nsSVGGradientElement::Init()
- rv = AddMappedSVGValue(nsSVGAtoms::spreadMethod, mSpreadMethod);
+ rv = AddMappedSVGValue(nsGkAtoms::spreadMethod, mSpreadMethod);
@@ -137 +136 @@ nsSVGGradientElement::Init()
- rv = AddMappedSVGValue(nsSVGAtoms::href, mHref, kNameSpaceID_XLink);
+ rv = AddMappedSVGValue(nsGkAtoms::href, mHref, kNameSpaceID_XLink);
Index: mozilla/content/svg/content/src/nsSVGGraphicElement.cpp
===================================================================
RCS file: /cvsroot/mozilla/content/svg/content/src/nsSVGGraphicElement.cpp,v
retrieving revision 1.34
diff -u -p -0 -r1.34 nsSVGGraphicElement.cpp
--- mozilla/content/svg/content/src/nsSVGGraphicElement.cpp 15 Jun 2006 11:13:41 -0000 1.34
+++ mozilla/content/svg/content/src/nsSVGGraphicElement.cpp 3 Oct 2006 22:56:43 -0000
@@ -43 +42,0 @@
-#include "nsSVGAtoms.h"
@@ -331 +330 @@ nsSVGGraphicElement::CreateTransformList
- rv = AddMappedSVGValue(nsSVGAtoms::transform, mTransforms);
+ rv = AddMappedSVGValue(nsGkAtoms::transform, mTransforms);
Index: mozilla/content/svg/content/src/nsSVGImageElement.cpp
===================================================================
RCS file: /cvsroot/mozilla/content/svg/content/src/nsSVGImageElement.cpp,v
retrieving revision 1.23
diff -u -p -0 -r1.23 nsSVGImageElement.cpp
--- mozilla/content/svg/content/src/nsSVGImageElement.cpp 5 Sep 2006 10:22:53 -0000 1.23
+++ mozilla/content/svg/content/src/nsSVGImageElement.cpp 3 Oct 2006 22:56:43 -0000
@@ -39 +38,0 @@
-#include "nsSVGAtoms.h"
@@ -173 +172 @@ nsSVGImageElement::Init()
- rv = AddMappedSVGValue(nsSVGAtoms::href, mHref, kNameSpaceID_XLink);
+ rv = AddMappedSVGValue(nsGkAtoms::href, mHref, kNameSpaceID_XLink);
@@ -186 +185 @@ nsSVGImageElement::Init()
- rv = AddMappedSVGValue(nsSVGAtoms::preserveAspectRatio,
+ rv = AddMappedSVGValue(nsGkAtoms::preserveAspectRatio,
@@ -324 +323 @@ nsSVGImageElement::BindToTree(nsIDocumen
- if (GetAttr(kNameSpaceID_XLink, nsSVGAtoms::href, href)) {
+ if (GetAttr(kNameSpaceID_XLink, nsGkAtoms::href, href)) {
Index: mozilla/content/svg/content/src/nsSVGLength.cpp
===================================================================
RCS file: /cvsroot/mozilla/content/svg/content/src/nsSVGLength.cpp,v
retrieving revision 1.23
diff -u -p -0 -r1.23 nsSVGLength.cpp
--- mozilla/content/svg/content/src/nsSVGLength.cpp 14 Apr 2006 15:09:38 -0000 1.23
+++ mozilla/content/svg/content/src/nsSVGLength.cpp 3 Oct 2006 22:56:43 -0000
@@ -42 +41,0 @@
-#include "nsSVGAtoms.h"
@@ -341 +340 @@ nsSVGLength::GetValueAsString(nsAString
- UnitAtom = nsSVGAtoms::px;
+ UnitAtom = nsGkAtoms::px;
@@ -344 +343 @@ nsSVGLength::GetValueAsString(nsAString
- UnitAtom = nsSVGAtoms::mm;
+ UnitAtom = nsGkAtoms::mm;
@@ -347 +346 @@ nsSVGLength::GetValueAsString(nsAString
- UnitAtom = nsSVGAtoms::cm;
+ UnitAtom = nsGkAtoms::cm;
@@ -350 +349 @@ nsSVGLength::GetValueAsString(nsAString
- UnitAtom = nsSVGAtoms::in;
+ UnitAtom = nsGkAtoms::in;
@@ -353 +352 @@ nsSVGLength::GetValueAsString(nsAString
- UnitAtom = nsSVGAtoms::pt;
+ UnitAtom = nsGkAtoms::pt;
@@ -356 +355 @@ nsSVGLength::GetValueAsString(nsAString
- UnitAtom = nsSVGAtoms::pc;
+ UnitAtom = nsGkAtoms::pc;
@@ -359 +358 @@ nsSVGLength::GetValueAsString(nsAString
- UnitAtom = nsSVGAtoms::em;
+ UnitAtom = nsGkAtoms::em;
@@ -362 +361 @@ nsSVGLength::GetValueAsString(nsAString
- UnitAtom = nsSVGAtoms::ex;
+ UnitAtom = nsGkAtoms::ex;
@@ -365 +364 @@ nsSVGLength::GetValueAsString(nsAString
- UnitAtom = nsSVGAtoms::percentage;
+ UnitAtom = nsGkAtoms::percentage;
@@ -401 +400 @@ nsSVGLength::SetValueAsString(const nsAS
- if (unitAtom == nsSVGAtoms::px)
+ if (unitAtom == nsGkAtoms::px)
@@ -403 +402 @@ nsSVGLength::SetValueAsString(const nsAS
- else if (unitAtom == nsSVGAtoms::mm)
+ else if (unitAtom == nsGkAtoms::mm)
@@ -405 +404 @@ nsSVGLength::SetValueAsString(const nsAS
- else if (unitAtom == nsSVGAtoms::cm)
+ else if (unitAtom == nsGkAtoms::cm)
@@ -407 +406 @@ nsSVGLength::SetValueAsString(const nsAS
- else if (unitAtom == nsSVGAtoms::in)
+ else if (unitAtom == nsGkAtoms::in)
@@ -409 +408 @@ nsSVGLength::SetValueAsString(const nsAS
- else if (unitAtom == nsSVGAtoms::pt)
+ else if (unitAtom == nsGkAtoms::pt)
@@ -411 +410 @@ nsSVGLength::SetValueAsString(const nsAS
- else if (unitAtom == nsSVGAtoms::pc)
+ else if (unitAtom == nsGkAtoms::pc)
@@ -413 +412 @@ nsSVGLength::SetValueAsString(const nsAS
- else if (unitAtom == nsSVGAtoms::em)
+ else if (unitAtom == nsGkAtoms::em)
@@ -415 +414 @@ nsSVGLength::SetValueAsString(const nsAS
- else if (unitAtom == nsSVGAtoms::ex)
+ else if (unitAtom == nsGkAtoms::ex)
@@ -417 +416 @@ nsSVGLength::SetValueAsString(const nsAS
- else if (unitAtom == nsSVGAtoms::percentage)
+ else if (unitAtom == nsGkAtoms::percentage)
Index: mozilla/content/svg/content/src/nsSVGMarkerElement.cpp
===================================================================
RCS file: /cvsroot/mozilla/content/svg/content/src/nsSVGMarkerElement.cpp,v
retrieving revision 1.15
diff -u -p -0 -r1.15 nsSVGMarkerElement.cpp
--- mozilla/content/svg/content/src/nsSVGMarkerElement.cpp 5 Sep 2006 10:22:53 -0000 1.15
+++ mozilla/content/svg/content/src/nsSVGMarkerElement.cpp 3 Oct 2006 22:56:43 -0000
@@ -37 +36,0 @@
-#include "nsSVGAtoms.h"
@@ -95,2 +94,2 @@ nsSVGMarkerElement::Init()
- {&nsSVGAtoms::strokeWidth, SVG_MARKERUNITS_STROKEWIDTH},
- {&nsSVGAtoms::userSpaceOnUse, SVG_MARKERUNITS_USERSPACEONUSE},
+ {&nsGkAtoms::strokeWidth, SVG_MARKERUNITS_STROKEWIDTH},
+ {&nsGkAtoms::userSpaceOnUse, SVG_MARKERUNITS_USERSPACEONUSE},
@@ -109 +108 @@ nsSVGMarkerElement::Init()
- rv = AddMappedSVGValue(nsSVGAtoms::markerUnits, mMarkerUnits);
+ rv = AddMappedSVGValue(nsGkAtoms::markerUnits, mMarkerUnits);
@@ -120 +119 @@ nsSVGMarkerElement::Init()
- rv = AddMappedSVGValue(nsSVGAtoms::orient, mOrient);
+ rv = AddMappedSVGValue(nsGkAtoms::orient, mOrient);
@@ -131 +130 @@ nsSVGMarkerElement::Init()
- rv = AddMappedSVGValue(nsSVGAtoms::viewBox, mViewBox);
+ rv = AddMappedSVGValue(nsGkAtoms::viewBox, mViewBox);
@@ -144 +143 @@ nsSVGMarkerElement::Init()
- rv = AddMappedSVGValue(nsSVGAtoms::preserveAspectRatio,
+ rv = AddMappedSVGValue(nsGkAtoms::preserveAspectRatio,
@@ -216 +215 @@ NS_IMETHODIMP nsSVGMarkerElement::GetOri
- {&nsSVGAtoms::_auto, SVG_MARKER_ORIENT_AUTO},
+ {&nsGkAtoms::_auto, SVG_MARKER_ORIENT_AUTO},
Index: mozilla/content/svg/content/src/nsSVGMaskElement.cpp
===================================================================
RCS file: /cvsroot/mozilla/content/svg/content/src/nsSVGMaskElement.cpp,v
retrieving revision 1.3
diff -u -p -0 -r1.3 nsSVGMaskElement.cpp
--- mozilla/content/svg/content/src/nsSVGMaskElement.cpp 5 Sep 2006 10:22:53 -0000 1.3
+++ mozilla/content/svg/content/src/nsSVGMaskElement.cpp 3 Oct 2006 22:56:43 -0000
@@ -42 +41,0 @@
-#include "nsSVGAtoms.h"
@@ -87,2 +86,2 @@ nsSVGMaskElement::Init()
- {&nsSVGAtoms::objectBoundingBox, nsIDOMSVGMaskElement::SVG_MUNITS_OBJECTBOUNDINGBOX},
- {&nsSVGAtoms::userSpaceOnUse, nsIDOMSVGMaskElement::SVG_MUNITS_USERSPACEONUSE},
+ {&nsGkAtoms::objectBoundingBox, nsIDOMSVGMaskElement::SVG_MUNITS_OBJECTBOUNDINGBOX},
+ {&nsGkAtoms::userSpaceOnUse, nsIDOMSVGMaskElement::SVG_MUNITS_USERSPACEONUSE},
@@ -102 +101 @@ nsSVGMaskElement::Init()
- rv = AddMappedSVGValue(nsSVGAtoms::maskUnits, mMaskUnits);
+ rv = AddMappedSVGValue(nsGkAtoms::maskUnits, mMaskUnits);
@@ -114 +113 @@ nsSVGMaskElement::Init()
- rv = AddMappedSVGValue(nsSVGAtoms::maskContentUnits, mMaskContentUnits);
+ rv = AddMappedSVGValue(nsGkAtoms::maskContentUnits, mMaskContentUnits);
Index: mozilla/content/svg/content/src/nsSVGPatternElement.cpp
===================================================================
RCS file: /cvsroot/mozilla/content/svg/content/src/nsSVGPatternElement.cpp,v
retrieving revision 1.5
diff -u -p -0 -r1.5 nsSVGPatternElement.cpp
--- mozilla/content/svg/content/src/nsSVGPatternElement.cpp 5 Sep 2006 10:22:53 -0000 1.5
+++ mozilla/content/svg/content/src/nsSVGPatternElement.cpp 3 Oct 2006 22:56:43 -0000
@@ -47 +46,0 @@
-#include "nsSVGAtoms.h"
@@ -102,2 +101,2 @@ nsSVGPatternElement::Init()
- {&nsSVGAtoms::objectBoundingBox, nsIDOMSVGPatternElement::SVG_PUNITS_OBJECTBOUNDINGBOX},
- {&nsSVGAtoms::userSpaceOnUse, nsIDOMSVGPatternElement::SVG_PUNITS_USERSPACEONUSE},
+ {&nsGkAtoms::objectBoundingBox, nsIDOMSVGPatternElement::SVG_PUNITS_OBJECTBOUNDINGBOX},
+ {&nsGkAtoms::userSpaceOnUse, nsIDOMSVGPatternElement::SVG_PUNITS_USERSPACEONUSE},
@@ -117 +116 @@ nsSVGPatternElement::Init()
- rv = AddMappedSVGValue(nsSVGAtoms::patternUnits, mPatternUnits);
+ rv = AddMappedSVGValue(nsGkAtoms::patternUnits, mPatternUnits);
@@ -129 +128 @@ nsSVGPatternElement::Init()
- rv = AddMappedSVGValue(nsSVGAtoms::patternContentUnits, mPatternContentUnits);
+ rv = AddMappedSVGValue(nsGkAtoms::patternContentUnits, mPatternContentUnits);
@@ -141 +140 @@ nsSVGPatternElement::Init()
- rv = AddMappedSVGValue(nsSVGAtoms::patternTransform, mPatternTransform);
+ rv = AddMappedSVGValue(nsGkAtoms::patternTransform, mPatternTransform);
@@ -151 +150 @@ nsSVGPatternElement::Init()
- rv = AddMappedSVGValue(nsSVGAtoms::href, mHref, kNameSpaceID_XLink);
+ rv = AddMappedSVGValue(nsGkAtoms::href, mHref, kNameSpaceID_XLink);
@@ -164 +163 @@ nsSVGPatternElement::Init()
- rv = AddMappedSVGValue(nsSVGAtoms::viewBox, mViewBox);
+ rv = AddMappedSVGValue(nsGkAtoms::viewBox, mViewBox);
@@ -177 +176 @@ nsSVGPatternElement::Init()
- rv = AddMappedSVGValue(nsSVGAtoms::preserveAspectRatio,
+ rv = AddMappedSVGValue(nsGkAtoms::preserveAspectRatio,
Index: mozilla/content/svg/content/src/nsSVGPolyElement.cpp
===================================================================
RCS file: /cvsroot/mozilla/content/svg/content/src/nsSVGPolyElement.cpp,v
retrieving revision 1.1
diff -u -p -0 -r1.1 nsSVGPolyElement.cpp
--- mozilla/content/svg/content/src/nsSVGPolyElement.cpp 10 Aug 2006 21:03:49 -0000 1.1
+++ mozilla/content/svg/content/src/nsSVGPolyElement.cpp 3 Oct 2006 22:56:43 -0000
@@ -69 +69 @@ nsSVGPolyElement::Init()
- rv = AddMappedSVGValue(nsSVGAtoms::points, mPoints);
+ rv = AddMappedSVGValue(nsGkAtoms::points, mPoints);
Index: mozilla/content/svg/content/src/nsSVGSVGElement.cpp
===================================================================
RCS file: /cvsroot/mozilla/content/svg/content/src/nsSVGSVGElement.cpp,v
retrieving revision 1.72
diff -u -p -0 -r1.72 nsSVGSVGElement.cpp
--- mozilla/content/svg/content/src/nsSVGSVGElement.cpp 5 Sep 2006 10:22:53 -0000 1.72
+++ mozilla/content/svg/content/src/nsSVGSVGElement.cpp 3 Oct 2006 22:56:44 -0000
@@ -40 +39,0 @@
-#include "nsSVGAtoms.h"
@@ -133 +132 @@ nsSVGSVGElement::Init()
- rv = AddMappedSVGValue(nsSVGAtoms::viewBox, mViewBox);
+ rv = AddMappedSVGValue(nsGkAtoms::viewBox, mViewBox);
@@ -148 +147 @@ nsSVGSVGElement::Init()
- rv = AddMappedSVGValue(nsSVGAtoms::preserveAspectRatio,
+ rv = AddMappedSVGValue(nsGkAtoms::preserveAspectRatio,
@@ -157,2 +156,2 @@ nsSVGSVGElement::Init()
- {&nsSVGAtoms::disable, nsIDOMSVGZoomAndPan::SVG_ZOOMANDPAN_DISABLE},
- {&nsSVGAtoms::magnify, nsIDOMSVGZoomAndPan::SVG_ZOOMANDPAN_MAGNIFY},
+ {&nsGkAtoms::disable, nsIDOMSVGZoomAndPan::SVG_ZOOMANDPAN_DISABLE},
+ {&nsGkAtoms::magnify, nsIDOMSVGZoomAndPan::SVG_ZOOMANDPAN_MAGNIFY},
@@ -167 +166 @@ nsSVGSVGElement::Init()
- rv = AddMappedSVGValue(nsSVGAtoms::zoomAndPan, mZoomAndPan);
+ rv = AddMappedSVGValue(nsGkAtoms::zoomAndPan, mZoomAndPan);
@@ -1230,3 +1229,3 @@ nsSVGSVGElement::IsEventName(nsIAtom* aN
- aName == nsSVGAtoms::onunload ||
- aName == nsSVGAtoms::onscroll ||
- aName == nsSVGAtoms::onzoom;
+ aName == nsGkAtoms::onunload ||
+ aName == nsGkAtoms::onscroll ||
+ aName == nsGkAtoms::onzoom;
Index: mozilla/content/svg/content/src/nsSVGScriptElement.cpp
===================================================================
RCS file: /cvsroot/mozilla/content/svg/content/src/nsSVGScriptElement.cpp,v
retrieving revision 1.25
diff -u -p -0 -r1.25 nsSVGScriptElement.cpp
--- mozilla/content/svg/content/src/nsSVGScriptElement.cpp 15 Sep 2006 19:54:44 -0000 1.25
+++ mozilla/content/svg/content/src/nsSVGScriptElement.cpp 3 Oct 2006 22:56:44 -0000
@@ -41 +40,0 @@
-#include "nsSVGAtoms.h"
@@ -175 +174 @@ nsSVGScriptElement::Init()
- rv = AddMappedSVGValue(nsSVGAtoms::href, mHref, kNameSpaceID_XLink);
+ rv = AddMappedSVGValue(nsGkAtoms::href, mHref, kNameSpaceID_XLink);
@@ -194 +193 @@ nsSVGScriptElement::GetType(nsAString &
- GetAttr(kNameSpaceID_None, nsSVGAtoms::type, aType);
+ GetAttr(kNameSpaceID_None, nsGkAtoms::type, aType);
@@ -427 +426 @@ nsSVGScriptElement::MaybeProcessScript()
- if (HasAttr(kNameSpaceID_XLink, nsSVGAtoms::href) ||
+ if (HasAttr(kNameSpaceID_XLink, nsGkAtoms::href) ||
Index: mozilla/content/svg/content/src/nsSVGStylableElement.cpp
===================================================================
RCS file: /cvsroot/mozilla/content/svg/content/src/nsSVGStylableElement.cpp,v
retrieving revision 1.6
diff -u -p -0 -r1.6 nsSVGStylableElement.cpp
--- mozilla/content/svg/content/src/nsSVGStylableElement.cpp 14 Apr 2006 15:09:38 -0000 1.6
+++ mozilla/content/svg/content/src/nsSVGStylableElement.cpp 3 Oct 2006 22:56:44 -0000
@@ -42 +41,0 @@
-#include "nsSVGAtoms.h"
@@ -79 +78 @@ nsSVGStylableElement::Init()
- rv = AddMappedSVGValue(nsSVGAtoms::_class,
+ rv = AddMappedSVGValue(nsGkAtoms::_class,
Index: mozilla/content/svg/content/src/nsSVGStyleElement.cpp
===================================================================
RCS file: /cvsroot/mozilla/content/svg/content/src/nsSVGStyleElement.cpp,v
retrieving revision 1.16
diff -u -p -0 -r1.16 nsSVGStyleElement.cpp
--- mozilla/content/svg/content/src/nsSVGStyleElement.cpp 5 Sep 2006 10:22:53 -0000 1.16
+++ mozilla/content/svg/content/src/nsSVGStyleElement.cpp 3 Oct 2006 22:56:44 -0000
@@ -40 +39,0 @@
-#include "nsSVGAtoms.h"
@@ -203,3 +202,3 @@ nsSVGStyleElement::SetAttr(PRInt32 aName
- (aName == nsSVGAtoms::title ||
- aName == nsSVGAtoms::media ||
- aName == nsSVGAtoms::type));
+ (aName == nsGkAtoms::title ||
+ aName == nsGkAtoms::media ||
+ aName == nsGkAtoms::type));
@@ -220,3 +219,3 @@ nsSVGStyleElement::UnsetAttr(PRInt32 aNa
- (aAttribute == nsSVGAtoms::title ||
- aAttribute == nsSVGAtoms::media ||
- aAttribute == nsSVGAtoms::type));
+ (aAttribute == nsGkAtoms::title ||
+ aAttribute == nsGkAtoms::media ||
+ aAttribute == nsGkAtoms::type));
@@ -234 +233 @@ NS_IMETHODIMP nsSVGStyleElement::GetXmls
- GetAttr(kNameSpaceID_XML, nsSVGAtoms::space, aXmlspace);
+ GetAttr(kNameSpaceID_XML, nsGkAtoms::space, aXmlspace);
@@ -240 +239 @@ NS_IMETHODIMP nsSVGStyleElement::SetXmls
- return SetAttr(kNameSpaceID_XML, nsSVGAtoms::space, aXmlspace, PR_TRUE);
+ return SetAttr(kNameSpaceID_XML, nsGkAtoms::space, aXmlspace, PR_TRUE);
@@ -246 +245 @@ NS_IMETHODIMP nsSVGStyleElement::GetType
- GetAttr(kNameSpaceID_None, nsSVGAtoms::type, aType);
+ GetAttr(kNameSpaceID_None, nsGkAtoms::type, aType);
@@ -252 +251 @@ NS_IMETHODIMP nsSVGStyleElement::SetType
- return SetAttr(kNameSpaceID_None, nsSVGAtoms::type, aType, PR_TRUE);
+ return SetAttr(kNameSpaceID_None, nsGkAtoms::type, aType, PR_TRUE);
@@ -258 +257 @@ NS_IMETHODIMP nsSVGStyleElement::GetMedi
- GetAttr(kNameSpaceID_None, nsSVGAtoms::media, aMedia);
+ GetAttr(kNameSpaceID_None, nsGkAtoms::media, aMedia);
@@ -264 +263 @@ NS_IMETHODIMP nsSVGStyleElement::SetMedi
- return SetAttr(kNameSpaceID_XML, nsSVGAtoms::media, aMedia, PR_TRUE);
+ return SetAttr(kNameSpaceID_XML, nsGkAtoms::media, aMedia, PR_TRUE);
@@ -270 +269 @@ NS_IMETHODIMP nsSVGStyleElement::GetTitl
- GetAttr(kNameSpaceID_None, nsSVGAtoms::title, aTitle);
+ GetAttr(kNameSpaceID_None, nsGkAtoms::title, aTitle);
@@ -276 +275 @@ NS_IMETHODIMP nsSVGStyleElement::SetTitl
- return SetAttr(kNameSpaceID_XML, nsSVGAtoms::title, aTitle, PR_TRUE);
+ return SetAttr(kNameSpaceID_XML, nsGkAtoms::title, aTitle, PR_TRUE);
@@ -301 +300 @@ nsSVGStyleElement::GetStyleSheetInfo(nsA
- GetAttr(kNameSpaceID_None, nsSVGAtoms::title, title);
+ GetAttr(kNameSpaceID_None, nsGkAtoms::title, title);
@@ -305 +304 @@ nsSVGStyleElement::GetStyleSheetInfo(nsA
- GetAttr(kNameSpaceID_None, nsSVGAtoms::media, aMedia);
+ GetAttr(kNameSpaceID_None, nsGkAtoms::media, aMedia);
@@ -310 +309 @@ nsSVGStyleElement::GetStyleSheetInfo(nsA
- GetAttr(kNameSpaceID_None, nsSVGAtoms::type, aType);
+ GetAttr(kNameSpaceID_None, nsGkAtoms::type, aType);
Index: mozilla/content/svg/content/src/nsSVGSymbolElement.cpp
===================================================================
RCS file: /cvsroot/mozilla/content/svg/content/src/nsSVGSymbolElement.cpp,v
retrieving revision 1.4
diff -u -p -0 -r1.4 nsSVGSymbolElement.cpp
--- mozilla/content/svg/content/src/nsSVGSymbolElement.cpp 5 Sep 2006 10:22:53 -0000 1.4
+++ mozilla/content/svg/content/src/nsSVGSymbolElement.cpp 3 Oct 2006 22:56:44 -0000
@@ -46 +45,0 @@
-#include "nsSVGAtoms.h"
@@ -123 +122 @@ nsSVGSymbolElement::Init()
- rv = AddMappedSVGValue(nsSVGAtoms::viewBox, mViewBox);
+ rv = AddMappedSVGValue(nsGkAtoms::viewBox, mViewBox);
@@ -136 +135 @@ nsSVGSymbolElement::Init()
- rv = AddMappedSVGValue(nsSVGAtoms::preserveAspectRatio,
+ rv = AddMappedSVGValue(nsGkAtoms::preserveAspectRatio,
Index: mozilla/content/svg/content/src/nsSVGTSpanElement.cpp
===================================================================
RCS file: /cvsroot/mozilla/content/svg/content/src/nsSVGTSpanElement.cpp,v
retrieving revision 1.24
diff -u -p -0 -r1.24 nsSVGTSpanElement.cpp
--- mozilla/content/svg/content/src/nsSVGTSpanElement.cpp 5 Sep 2006 10:22:53 -0000 1.24
+++ mozilla/content/svg/content/src/nsSVGTSpanElement.cpp 3 Oct 2006 22:56:44 -0000
@@ -40 +39,0 @@
-#include "nsSVGAtoms.h"
@@ -145 +144 @@ nsSVGTSpanElement::Init()
- rv = AddMappedSVGValue(nsSVGAtoms::x, mX);
+ rv = AddMappedSVGValue(nsGkAtoms::x, mX);
@@ -157 +156 @@ nsSVGTSpanElement::Init()
- rv = AddMappedSVGValue(nsSVGAtoms::y, mY);
+ rv = AddMappedSVGValue(nsGkAtoms::y, mY);
@@ -169 +168 @@ nsSVGTSpanElement::Init()
- rv = AddMappedSVGValue(nsSVGAtoms::dx, mdX);
+ rv = AddMappedSVGValue(nsGkAtoms::dx, mdX);
@@ -181 +180 @@ nsSVGTSpanElement::Init()
- rv = AddMappedSVGValue(nsSVGAtoms::dy, mdY);
+ rv = AddMappedSVGValue(nsGkAtoms::dy, mdY);
Index: mozilla/content/svg/content/src/nsSVGTextElement.cpp
===================================================================
RCS file: /cvsroot/mozilla/content/svg/content/src/nsSVGTextElement.cpp,v
retrieving revision 1.27
diff -u -p -0 -r1.27 nsSVGTextElement.cpp
--- mozilla/content/svg/content/src/nsSVGTextElement.cpp 5 Sep 2006 10:22:53 -0000 1.27
+++ mozilla/content/svg/content/src/nsSVGTextElement.cpp 3 Oct 2006 22:56:45 -0000
@@ -40 +39,0 @@
-#include "nsSVGAtoms.h"
@@ -142 +141 @@ nsSVGTextElement::Init()
- rv = AddMappedSVGValue(nsSVGAtoms::x, mX);
+ rv = AddMappedSVGValue(nsGkAtoms::x, mX);
@@ -154 +153 @@ nsSVGTextElement::Init()
- rv = AddMappedSVGValue(nsSVGAtoms::y, mY);
+ rv = AddMappedSVGValue(nsGkAtoms::y, mY);
@@ -166 +165 @@ nsSVGTextElement::Init()
- rv = AddMappedSVGValue(nsSVGAtoms::dx, mdX);
+ rv = AddMappedSVGValue(nsGkAtoms::dx, mdX);
@@ -178 +177 @@ nsSVGTextElement::Init()
- rv = AddMappedSVGValue(nsSVGAtoms::dy, mdY);
+ rv = AddMappedSVGValue(nsGkAtoms::dy, mdY);
Index: mozilla/content/svg/content/src/nsSVGTextPathElement.cpp
===================================================================
RCS file: /cvsroot/mozilla/content/svg/content/src/nsSVGTextPathElement.cpp,v
retrieving revision 1.8
diff -u -p -0 -r1.8 nsSVGTextPathElement.cpp
--- mozilla/content/svg/content/src/nsSVGTextPathElement.cpp 5 Sep 2006 10:22:53 -0000 1.8
+++ mozilla/content/svg/content/src/nsSVGTextPathElement.cpp 3 Oct 2006 22:56:45 -0000
@@ -39 +38,0 @@
-#include "nsSVGAtoms.h"
@@ -137,2 +136,2 @@ nsSVGTextPathElement::Init()
- {&nsSVGAtoms::align, TEXTPATH_METHODTYPE_ALIGN},
- {&nsSVGAtoms::stretch, TEXTPATH_METHODTYPE_STRETCH},
+ {&nsGkAtoms::align, TEXTPATH_METHODTYPE_ALIGN},
+ {&nsGkAtoms::stretch, TEXTPATH_METHODTYPE_STRETCH},
@@ -143,2 +142,2 @@ nsSVGTextPathElement::Init()
- {&nsSVGAtoms::_auto, TEXTPATH_SPACINGTYPE_AUTO},
- {&nsSVGAtoms::exact, TEXTPATH_SPACINGTYPE_EXACT},
+ {&nsGkAtoms::_auto, TEXTPATH_SPACINGTYPE_AUTO},
+ {&nsGkAtoms::exact, TEXTPATH_SPACINGTYPE_EXACT},
@@ -158 +157 @@ nsSVGTextPathElement::Init()
- rv = AddMappedSVGValue(nsSVGAtoms::method, mMethod);
+ rv = AddMappedSVGValue(nsGkAtoms::method, mMethod);
@@ -170 +169 @@ nsSVGTextPathElement::Init()
- rv = AddMappedSVGValue(nsSVGAtoms::spacing, mSpacing);
+ rv = AddMappedSVGValue(nsGkAtoms::spacing, mSpacing);
@@ -181 +180 @@ nsSVGTextPathElement::Init()
- rv = AddMappedSVGValue(nsSVGAtoms::href, mHref, kNameSpaceID_XLink);
+ rv = AddMappedSVGValue(nsGkAtoms::href, mHref, kNameSpaceID_XLink);
Index: mozilla/content/svg/content/src/nsSVGTransformListParser.cpp
===================================================================
RCS file: /cvsroot/mozilla/content/svg/content/src/nsSVGTransformListParser.cpp,v
retrieving revision 1.2
diff -u -p -0 -r1.2 nsSVGTransformListParser.cpp
--- mozilla/content/svg/content/src/nsSVGTransformListParser.cpp 21 Sep 2006 21:11:36 -0000 1.2
+++ mozilla/content/svg/content/src/nsSVGTransformListParser.cpp 3 Oct 2006 22:56:45 -0000
@@ -43 +42,0 @@
-#include "nsSVGAtoms.h"
@@ -156 +155 @@ nsSVGTransformListParser::MatchTransform
- if (keyatom == nsSVGAtoms::translate) {
+ if (keyatom == nsGkAtoms::translate) {
@@ -159 +158 @@ nsSVGTransformListParser::MatchTransform
- else if (keyatom == nsSVGAtoms::scale) {
+ else if (keyatom == nsGkAtoms::scale) {
@@ -162 +161 @@ nsSVGTransformListParser::MatchTransform
- else if (keyatom == nsSVGAtoms::rotate) {
+ else if (keyatom == nsGkAtoms::rotate) {
@@ -165 +164 @@ nsSVGTransformListParser::MatchTransform
- else if (keyatom == nsSVGAtoms::skewX) {
+ else if (keyatom == nsGkAtoms::skewX) {
@@ -168 +167 @@ nsSVGTransformListParser::MatchTransform
- else if (keyatom == nsSVGAtoms::skewY) {
+ else if (keyatom == nsGkAtoms::skewY) {
@@ -171 +170 @@ nsSVGTransformListParser::MatchTransform
- else if (keyatom == nsSVGAtoms::matrix) {
+ else if (keyatom == nsGkAtoms::matrix) {
@@ -190,6 +189,6 @@ nsSVGTransformListParser::IsTokenTransfo
- if (keyatom == nsSVGAtoms::translate ||
- keyatom == nsSVGAtoms::scale ||
- keyatom == nsSVGAtoms::rotate ||
- keyatom == nsSVGAtoms::skewX ||
- keyatom == nsSVGAtoms::skewY ||
- keyatom == nsSVGAtoms::matrix) {
+ if (keyatom == nsGkAtoms::translate ||
+ keyatom == nsGkAtoms::scale ||
+ keyatom == nsGkAtoms::rotate ||
+ keyatom == nsGkAtoms::skewX ||
+ keyatom == nsGkAtoms::skewY ||
+ keyatom == nsGkAtoms::matrix) {
Index: mozilla/content/svg/content/src/nsSVGUseElement.cpp
===================================================================
RCS file: /cvsroot/mozilla/content/svg/content/src/nsSVGUseElement.cpp,v
retrieving revision 1.17
diff -u -p -0 -r1.17 nsSVGUseElement.cpp
--- mozilla/content/svg/content/src/nsSVGUseElement.cpp 5 Sep 2006 16:20:01 -0000 1.17
+++ mozilla/content/svg/content/src/nsSVGUseElement.cpp 3 Oct 2006 22:56:45 -0000
@@ -38 +37,0 @@
-#include "nsSVGAtoms.h"
@@ -190 +189 @@ nsSVGUseElement::Init()
- rv = AddMappedSVGValue(nsSVGAtoms::href, mHref, kNameSpaceID_XLink);
+ rv = AddMappedSVGValue(nsGkAtoms::href, mHref, kNameSpaceID_XLink);
@@ -363,13 +362,13 @@ nsSVGUseElement::CreateAnonymousContent(
- if (tag != nsSVGAtoms::svg &&
- tag != nsSVGAtoms::symbol &&
- tag != nsSVGAtoms::g &&
- tag != nsSVGAtoms::path &&
- tag != nsSVGAtoms::text &&
- tag != nsSVGAtoms::rect &&
- tag != nsSVGAtoms::circle &&
- tag != nsSVGAtoms::ellipse &&
- tag != nsSVGAtoms::line &&
- tag != nsSVGAtoms::polyline &&
- tag != nsSVGAtoms::polygon &&
- tag != nsSVGAtoms::image &&
- tag != nsSVGAtoms::use)
+ if (tag != nsGkAtoms::svg &&
+ tag != nsGkAtoms::symbol &&
+ tag != nsGkAtoms::g &&
+ tag != nsGkAtoms::path &&
+ tag != nsGkAtoms::text &&
+ tag != nsGkAtoms::rect &&
+ tag != nsGkAtoms::circle &&
+ tag != nsGkAtoms::ellipse &&
+ tag != nsGkAtoms::line &&
+ tag != nsGkAtoms::polyline &&
+ tag != nsGkAtoms::polygon &&
+ tag != nsGkAtoms::image &&
+ tag != nsGkAtoms::use)
@@ -425 +424 @@ nsSVGUseElement::CreateAnonymousContent(
- nodeInfoManager->GetNodeInfo(nsSVGAtoms::svg, nsnull, kNameSpaceID_SVG,
+ nodeInfoManager->GetNodeInfo(nsGkAtoms::svg, nsnull, kNameSpaceID_SVG,
@@ -436 +435 @@ nsSVGUseElement::CreateAnonymousContent(
- if (newcontent->HasAttr(kNameSpaceID_None, nsSVGAtoms::viewBox)) {
+ if (newcontent->HasAttr(kNameSpaceID_None, nsGkAtoms::viewBox)) {
@@ -438,2 +437,2 @@ nsSVGUseElement::CreateAnonymousContent(
- newcontent->GetAttr(kNameSpaceID_None, nsSVGAtoms::viewBox, viewbox);
- svgNode->SetAttr(kNameSpaceID_None, nsSVGAtoms::viewBox, viewbox, PR_FALSE);
+ newcontent->GetAttr(kNameSpaceID_None, nsGkAtoms::viewBox, viewbox);
+ svgNode->SetAttr(kNameSpaceID_None, nsGkAtoms::viewBox, viewbox, PR_FALSE);
@@ -466 +465 @@ nsSVGUseElement::CreateAnonymousContent(
- if (HasAttr(kNameSpaceID_None, nsSVGAtoms::width)) {
+ if (HasAttr(kNameSpaceID_None, nsGkAtoms::width)) {
@@ -468,2 +467,2 @@ nsSVGUseElement::CreateAnonymousContent(
- GetAttr(kNameSpaceID_None, nsSVGAtoms::width, width);
- newcontent->SetAttr(kNameSpaceID_None, nsSVGAtoms::width, width, PR_FALSE);
+ GetAttr(kNameSpaceID_None, nsGkAtoms::width, width);
+ newcontent->SetAttr(kNameSpaceID_None, nsGkAtoms::width, width, PR_FALSE);
@@ -472 +471 @@ nsSVGUseElement::CreateAnonymousContent(
- if (HasAttr(kNameSpaceID_None, nsSVGAtoms::height)) {
+ if (HasAttr(kNameSpaceID_None, nsGkAtoms::height)) {
@@ -474,2 +473,2 @@ nsSVGUseElement::CreateAnonymousContent(
- GetAttr(kNameSpaceID_None, nsSVGAtoms::height, height);
- newcontent->SetAttr(kNameSpaceID_None, nsSVGAtoms::height, height, PR_FALSE);
+ GetAttr(kNameSpaceID_None, nsGkAtoms::height, height);
+ newcontent->SetAttr(kNameSpaceID_None, nsGkAtoms::height, height, PR_FALSE);
@@ -508,2 +507,2 @@ nsSVGUseElement::SyncWidthHeight(PRUint8
- GetAttr(kNameSpaceID_None, nsSVGAtoms::width, width);
- mClone->SetAttr(kNameSpaceID_None, nsSVGAtoms::width, width, PR_FALSE);
+ GetAttr(kNameSpaceID_None, nsGkAtoms::width, width);
+ mClone->SetAttr(kNameSpaceID_None, nsGkAtoms::width, width, PR_FALSE);
@@ -512,2 +511,2 @@ nsSVGUseElement::SyncWidthHeight(PRUint8
- GetAttr(kNameSpaceID_None, nsSVGAtoms::height, height);
- mClone->SetAttr(kNameSpaceID_None, nsSVGAtoms::height, height, PR_FALSE);
+ GetAttr(kNameSpaceID_None, nsGkAtoms::height, height);
+ mClone->SetAttr(kNameSpaceID_None, nsGkAtoms::height, height, PR_FALSE);
Index: mozilla/content/xbl/src/nsXBLAtoms.h
===================================================================
RCS file: /cvsroot/mozilla/content/xbl/src/nsXBLAtoms.h,v
retrieving revision 1.6
diff -u -p -0 -r1.6 nsXBLAtoms.h
--- mozilla/content/xbl/src/nsXBLAtoms.h 19 Jan 2006 00:57:48 -0000 1.6
+++ mozilla/content/xbl/src/nsXBLAtoms.h 3 Oct 2006 22:56:45 -0000
@@ -38,2 +38,2 @@
-#ifndef nsXBLAtoms_h___
-#define nsXBLAtoms_h___
+#ifndef nsGkAtoms_h___
+#define nsGkAtoms_h___
@@ -41,2 +41 @@
-#include "nsGkAtoms.h"
-typedef class nsGkAtoms nsXBLAtoms;
+typedef class nsGkAtoms nsGkAtoms;
@@ -44 +43 @@ typedef class nsGkAtoms nsXBLAtoms;
-#endif /* nsXBLAtoms_h___ */
+#endif /* nsGkAtoms_h___ */
Index: mozilla/content/xbl/src/nsXBLBinding.cpp
===================================================================
RCS file: /cvsroot/mozilla/content/xbl/src/nsXBLBinding.cpp,v
retrieving revision 1.219
diff -u -p -0 -r1.219 nsXBLBinding.cpp
--- mozilla/content/xbl/src/nsXBLBinding.cpp 18 Sep 2006 21:35:21 -0000 1.219
+++ mozilla/content/xbl/src/nsXBLBinding.cpp 3 Oct 2006 22:56:45 -0000
@@ -90,2 +89,0 @@
-#include "nsXBLAtoms.h"
-#include "nsXULAtoms.h"
@@ -446 +444 @@ nsXBLBinding::GenerateAnonymousContent()
- mPrototypeBinding->GetImmediateChild(nsXBLAtoms::content);
+ mPrototypeBinding->GetImmediateChild(nsGkAtoms::content);
@@ -467 +465 @@ nsXBLBinding::GenerateAnonymousContent()
- nsXBLAtoms::includes)) {
+ nsGkAtoms::includes)) {
@@ -509,2 +507,2 @@ nsXBLBinding::GenerateAnonymousContent()
- (localName != nsXULAtoms::observes &&
- localName != nsXULAtoms::_template)) {
+ (localName != nsGkAtoms::observes &&
+ localName != nsGkAtoms::_template)) {
@@ -593,2 +591,2 @@ nsXBLBinding::GenerateAnonymousContent()
- (localName != nsXULAtoms::observes &&
- localName != nsXULAtoms::_template)) {
+ (localName != nsGkAtoms::observes &&
+ localName != nsGkAtoms::_template)) {
@@ -645 +643 @@ nsXBLBinding::GenerateAnonymousContent()
- if (name != nsXBLAtoms::includes) {
+ if (name != nsGkAtoms::includes) {
@@ -681,3 +679,3 @@ nsXBLBinding::InstallEventHandlers()
- eventAtom == nsXBLAtoms::keyup ||
- eventAtom == nsXBLAtoms::keydown ||
- eventAtom == nsXBLAtoms::keypress)
+ eventAtom == nsGkAtoms::keyup ||
+ eventAtom == nsGkAtoms::keydown ||
+ eventAtom == nsGkAtoms::keypress)
@@ -833,3 +831,3 @@ nsXBLBinding::UnhookEventHandlers()
- eventAtom == nsXBLAtoms::keyup ||
- eventAtom == nsXBLAtoms::keydown ||
- eventAtom == nsXBLAtoms::keypress)
+ eventAtom == nsGkAtoms::keyup ||
+ eventAtom == nsGkAtoms::keydown ||
+ eventAtom == nsGkAtoms::keypress)
@@ -902 +900 @@ nsXBLBinding::ChangeDocument(nsIDocument
- mPrototypeBinding->GetImmediateChild(nsXBLAtoms::implementation);
+ mPrototypeBinding->GetImmediateChild(nsGkAtoms::implementation);
Index: mozilla/content/xbl/src/nsXBLContentSink.cpp
===================================================================
RCS file: /cvsroot/mozilla/content/xbl/src/nsXBLContentSink.cpp,v
retrieving revision 1.71
diff -u -p -0 -r1.71 nsXBLContentSink.cpp
--- mozilla/content/xbl/src/nsXBLContentSink.cpp 25 Aug 2006 16:34:57 -0000 1.71
+++ mozilla/content/xbl/src/nsXBLContentSink.cpp 3 Oct 2006 22:56:46 -0000
@@ -44 +43,0 @@
-#include "nsXBLAtoms.h"
@@ -46,2 +44,0 @@
-#include "nsHTMLAtoms.h"
-#include "nsLayoutAtoms.h"
@@ -54 +50,0 @@
-#include "nsXULAtoms.h"
@@ -177,2 +173,2 @@ nsXBLContentSink::FlushText(PRBool aCrea
- content->Tag() != nsXULAtoms::label &&
- content->Tag() != nsXULAtoms::description))) {
+ content->Tag() != nsGkAtoms::label &&
+ content->Tag() != nsGkAtoms::description))) {
@@ -317 +313 @@ nsXBLContentSink::HandleEndElement(const
- if (localName == nsXBLAtoms::handlers) {
+ if (localName == nsGkAtoms::handlers) {
@@ -321 +317 @@ nsXBLContentSink::HandleEndElement(const
- else if (localName == nsXBLAtoms::handler)
+ else if (localName == nsGkAtoms::handler)
@@ -326 +322 @@ nsXBLContentSink::HandleEndElement(const
- if (localName == nsXBLAtoms::resources)
+ if (localName == nsGkAtoms::resources)
@@ -331 +327 @@ nsXBLContentSink::HandleEndElement(const
- if (localName == nsXBLAtoms::implementation)
+ if (localName == nsGkAtoms::implementation)
@@ -333 +329 @@ nsXBLContentSink::HandleEndElement(const
- else if (localName == nsXBLAtoms::property) {
+ else if (localName == nsGkAtoms::property) {
@@ -337 +333 @@ nsXBLContentSink::HandleEndElement(const
- else if (localName == nsXBLAtoms::method) {
+ else if (localName == nsGkAtoms::method) {
@@ -341 +337 @@ nsXBLContentSink::HandleEndElement(const
- else if (localName == nsXBLAtoms::field) {
+ else if (localName == nsGkAtoms::field) {
@@ -345,2 +341,2 @@ nsXBLContentSink::HandleEndElement(const
- else if (localName == nsXBLAtoms::constructor ||
- localName == nsXBLAtoms::destructor)
+ else if (localName == nsGkAtoms::constructor ||
+ localName == nsGkAtoms::destructor)
@@ -348,2 +344,2 @@ nsXBLContentSink::HandleEndElement(const
- else if (localName == nsXBLAtoms::getter ||
- localName == nsXBLAtoms::setter)
+ else if (localName == nsGkAtoms::getter ||
+ localName == nsGkAtoms::setter)
@@ -351,2 +347,2 @@ nsXBLContentSink::HandleEndElement(const
- else if (localName == nsXBLAtoms::parameter ||
- localName == nsXBLAtoms::body)
+ else if (localName == nsGkAtoms::parameter ||
+ localName == nsGkAtoms::body)
@@ -357 +353 @@ nsXBLContentSink::HandleEndElement(const
- localName == nsXBLAtoms::bindings) {
+ localName == nsGkAtoms::bindings) {
@@ -365 +361 @@ nsXBLContentSink::HandleEndElement(const
- if (mState == eXBL_InBinding && localName == nsXBLAtoms::binding) {
+ if (mState == eXBL_InBinding && localName == nsGkAtoms::binding) {
@@ -411 +407 @@ nsXBLContentSink::OnOpenContainer(const
- if (aTagName == nsXBLAtoms::bindings) {
+ if (aTagName == nsGkAtoms::bindings) {
@@ -435 +431 @@ nsXBLContentSink::OnOpenContainer(const
- else if (aTagName == nsXBLAtoms::binding) {
+ else if (aTagName == nsGkAtoms::binding) {
@@ -439 +435 @@ nsXBLContentSink::OnOpenContainer(const
- else if (aTagName == nsXBLAtoms::handlers) {
+ else if (aTagName == nsGkAtoms::handlers) {
@@ -444 +440 @@ nsXBLContentSink::OnOpenContainer(const
- else if (aTagName == nsXBLAtoms::handler) {
+ else if (aTagName == nsGkAtoms::handler) {
@@ -450 +446 @@ nsXBLContentSink::OnOpenContainer(const
- else if (aTagName == nsXBLAtoms::resources) {
+ else if (aTagName == nsGkAtoms::resources) {
@@ -456 +452 @@ nsXBLContentSink::OnOpenContainer(const
- else if (aTagName == nsXBLAtoms::stylesheet || aTagName == nsXBLAtoms::image) {
+ else if (aTagName == nsGkAtoms::stylesheet || aTagName == nsGkAtoms::image) {
@@ -461 +457 @@ nsXBLContentSink::OnOpenContainer(const
- else if (aTagName == nsXBLAtoms::implementation) {
+ else if (aTagName == nsGkAtoms::implementation) {
@@ -468 +464 @@ nsXBLContentSink::OnOpenContainer(const
- else if (aTagName == nsXBLAtoms::constructor) {
+ else if (aTagName == nsGkAtoms::constructor) {
@@ -482 +478 @@ nsXBLContentSink::OnOpenContainer(const
- else if (aTagName == nsXBLAtoms::destructor) {
+ else if (aTagName == nsGkAtoms::destructor) {
@@ -495 +491 @@ nsXBLContentSink::OnOpenContainer(const
- else if (aTagName == nsXBLAtoms::field) {
+ else if (aTagName == nsGkAtoms::field) {
@@ -502 +498 @@ nsXBLContentSink::OnOpenContainer(const
- else if (aTagName == nsXBLAtoms::property) {
+ else if (aTagName == nsGkAtoms::property) {
@@ -509 +505 @@ nsXBLContentSink::OnOpenContainer(const
- else if (aTagName == nsXBLAtoms::getter) {
+ else if (aTagName == nsGkAtoms::getter) {
@@ -515 +511 @@ nsXBLContentSink::OnOpenContainer(const
- else if (aTagName == nsXBLAtoms::setter) {
+ else if (aTagName == nsGkAtoms::setter) {
@@ -521 +517 @@ nsXBLContentSink::OnOpenContainer(const
- else if (aTagName == nsXBLAtoms::method) {
+ else if (aTagName == nsGkAtoms::method) {
@@ -528 +524 @@ nsXBLContentSink::OnOpenContainer(const
- else if (aTagName == nsXBLAtoms::parameter) {
+ else if (aTagName == nsGkAtoms::parameter) {
@@ -533 +529 @@ nsXBLContentSink::OnOpenContainer(const
- else if (aTagName == nsXBLAtoms::body) {
+ else if (aTagName == nsGkAtoms::body) {
@@ -551 +547 @@ nsXBLContentSink::ConstructBinding()
- binding->GetAttr(kNameSpaceID_None, nsHTMLAtoms::id, id);
+ binding->GetAttr(kNameSpaceID_None, nsGkAtoms::id, id);
@@ -564 +560 @@ nsXBLContentSink::ConstructBinding()
- binding->UnsetAttr(kNameSpaceID_None, nsHTMLAtoms::id, PR_FALSE);
+ binding->UnsetAttr(kNameSpaceID_None, nsGkAtoms::id, PR_FALSE);
@@ -621 +617 @@ nsXBLContentSink::ConstructHandler(const
- if (localName == nsXBLAtoms::event)
+ if (localName == nsGkAtoms::event)
@@ -623 +619 @@ nsXBLContentSink::ConstructHandler(const
- else if (localName == nsXBLAtoms::modifiers)
+ else if (localName == nsGkAtoms::modifiers)
@@ -625 +621 @@ nsXBLContentSink::ConstructHandler(const
- else if (localName == nsXBLAtoms::button)
+ else if (localName == nsGkAtoms::button)
@@ -627 +623 @@ nsXBLContentSink::ConstructHandler(const
- else if (localName == nsXBLAtoms::clickcount)
+ else if (localName == nsGkAtoms::clickcount)
@@ -629 +625 @@ nsXBLContentSink::ConstructHandler(const
- else if (localName == nsXBLAtoms::keycode)
+ else if (localName == nsGkAtoms::keycode)
@@ -631 +627 @@ nsXBLContentSink::ConstructHandler(const
- else if (localName == nsXBLAtoms::key || localName == nsXBLAtoms::charcode)
+ else if (localName == nsGkAtoms::key || localName == nsGkAtoms::charcode)
@@ -633 +629 @@ nsXBLContentSink::ConstructHandler(const
- else if (localName == nsXBLAtoms::phase)
+ else if (localName == nsGkAtoms::phase)
@@ -635 +631 @@ nsXBLContentSink::ConstructHandler(const
- else if (localName == nsXBLAtoms::command)
+ else if (localName == nsGkAtoms::command)
@@ -637 +633 @@ nsXBLContentSink::ConstructHandler(const
- else if (localName == nsXBLAtoms::action)
+ else if (localName == nsGkAtoms::action)
@@ -639 +635 @@ nsXBLContentSink::ConstructHandler(const
- else if (localName == nsXBLAtoms::group)
+ else if (localName == nsGkAtoms::group)
@@ -641 +637 @@ nsXBLContentSink::ConstructHandler(const
- else if (localName == nsXBLAtoms::preventdefault)
+ else if (localName == nsGkAtoms::preventdefault)
@@ -643 +639 @@ nsXBLContentSink::ConstructHandler(const
- else if (localName == nsXBLAtoms::allowuntrusted)
+ else if (localName == nsGkAtoms::allowuntrusted)
@@ -686 +682 @@ nsXBLContentSink::ConstructResource(cons
- if (FindValue(aAtts, nsHTMLAtoms::src, &src)) {
+ if (FindValue(aAtts, nsGkAtoms::src, &src)) {
@@ -713 +709 @@ nsXBLContentSink::ConstructImplementatio
- if (localName == nsXBLAtoms::name) {
+ if (localName == nsGkAtoms::name) {
@@ -716 +712 @@ nsXBLContentSink::ConstructImplementatio
- else if (localName == nsXBLAtoms::implements) {
+ else if (localName == nsGkAtoms::implements) {
@@ -756 +752 @@ nsXBLContentSink::ConstructField(const P
- if (localName == nsXBLAtoms::name) {
+ if (localName == nsGkAtoms::name) {
@@ -759 +755 @@ nsXBLContentSink::ConstructField(const P
- else if (localName == nsXBLAtoms::readonly) {
+ else if (localName == nsGkAtoms::readonly) {
@@ -794 +790 @@ nsXBLContentSink::ConstructProperty(cons
- if (localName == nsXBLAtoms::name) {
+ if (localName == nsGkAtoms::name) {
@@ -797 +793 @@ nsXBLContentSink::ConstructProperty(cons
- else if (localName == nsXBLAtoms::readonly) {
+ else if (localName == nsGkAtoms::readonly) {
@@ -800 +796 @@ nsXBLContentSink::ConstructProperty(cons
- else if (localName == nsXBLAtoms::onget) {
+ else if (localName == nsGkAtoms::onget) {
@@ -803 +799 @@ nsXBLContentSink::ConstructProperty(cons
- else if (localName == nsXBLAtoms::onset) {
+ else if (localName == nsGkAtoms::onset) {
@@ -824 +820 @@ nsXBLContentSink::ConstructMethod(const
- if (FindValue(aAtts, nsXBLAtoms::name, &name)) {
+ if (FindValue(aAtts, nsGkAtoms::name, &name)) {
@@ -840 +836 @@ nsXBLContentSink::ConstructParameter(con
- if (FindValue(aAtts, nsXBLAtoms::name, &name)) {
+ if (FindValue(aAtts, nsGkAtoms::name, &name)) {
Index: mozilla/content/xbl/src/nsXBLEventHandler.cpp
===================================================================
RCS file: /cvsroot/mozilla/content/xbl/src/nsXBLEventHandler.cpp,v
retrieving revision 1.67
diff -u -p -0 -r1.67 nsXBLEventHandler.cpp
--- mozilla/content/xbl/src/nsXBLEventHandler.cpp 21 Aug 2005 22:20:36 -0000 1.67
+++ mozilla/content/xbl/src/nsXBLEventHandler.cpp 3 Oct 2006 22:56:46 -0000
@@ -48 +47,0 @@
-#include "nsXBLAtoms.h"
@@ -165,13 +164,13 @@ NS_NewXBLEventHandler(nsXBLPrototypeHand
- 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) {
Index: mozilla/content/xbl/src/nsXBLPrototypeBinding.cpp
===================================================================
RCS file: /cvsroot/mozilla/content/xbl/src/nsXBLPrototypeBinding.cpp,v
retrieving revision 1.120
diff -u -p -0 -r1.120 nsXBLPrototypeBinding.cpp
--- mozilla/content/xbl/src/nsXBLPrototypeBinding.cpp 18 Sep 2006 21:35:21 -0000 1.120
+++ mozilla/content/xbl/src/nsXBLPrototypeBinding.cpp 3 Oct 2006 22:56:46 -0000
@@ -70,3 +69,0 @@
-#include "nsHTMLAtoms.h"
-#include "nsXULAtoms.h"
-#include "nsXBLAtoms.h"
@@ -287 +284 @@ nsXBLPrototypeBinding::Initialize()
- nsIContent* content = GetImmediateChild(nsXBLAtoms::content);
+ nsIContent* content = GetImmediateChild(nsGkAtoms::content);
@@ -338,2 +335,2 @@ nsXBLPrototypeBinding::SetBindingElement
- if (mBinding->AttrValueIs(kNameSpaceID_None, nsXBLAtoms::inheritstyle,
- nsXBLAtoms::_false, eCaseMatters))
+ if (mBinding->AttrValueIs(kNameSpaceID_None, nsGkAtoms::inheritstyle,
+ nsGkAtoms::_false, eCaseMatters))
@@ -466 +463 @@ nsXBLPrototypeBinding::AttributeChanged(
- nsIContent* content = GetImmediateChild(nsXBLAtoms::content);
+ nsIContent* content = GetImmediateChild(nsGkAtoms::content);
@@ -484 +481 @@ nsXBLPrototypeBinding::AttributeChanged(
- if (aAttribute == nsHTMLAtoms::text && aNameSpaceID == kNameSpaceID_XBL) {
+ if (aAttribute == nsGkAtoms::text && aNameSpaceID == kNameSpaceID_XBL) {
@@ -505,2 +502,2 @@ nsXBLPrototypeBinding::AttributeChanged(
- if ((dstAttr == nsHTMLAtoms::text && dstNs == kNameSpaceID_XBL) ||
- realElement->NodeInfo()->Equals(nsHTMLAtoms::html,
+ if ((dstAttr == nsGkAtoms::text && dstNs == kNameSpaceID_XBL) ||
+ realElement->NodeInfo()->Equals(nsGkAtoms::html,
@@ -508 +505 @@ nsXBLPrototypeBinding::AttributeChanged(
- dstAttr == nsHTMLAtoms::value) {
+ dstAttr == nsGkAtoms::value) {
@@ -560 +557 @@ PRBool PR_CALLBACK InstantiateInsertionP
- nsIContent *templRoot = proto->GetImmediateChild(nsXBLAtoms::content);
+ nsIContent *templRoot = proto->GetImmediateChild(nsGkAtoms::content);
@@ -619 +616 @@ nsXBLPrototypeBinding::GetInsertionPoint
- nsISupportsKey key2(nsXBLAtoms::children);
+ nsISupportsKey key2(nsGkAtoms::children);
@@ -627 +624 @@ nsXBLPrototypeBinding::GetInsertionPoint
- nsIContent* templContent = GetImmediateChild(nsXBLAtoms::content);
+ nsIContent* templContent = GetImmediateChild(nsGkAtoms::content);
@@ -655 +652 @@ nsXBLPrototypeBinding::GetSingleInsertio
- nsISupportsKey key(nsXBLAtoms::children);
+ nsISupportsKey key(nsGkAtoms::children);
@@ -674 +671 @@ nsXBLPrototypeBinding::GetSingleInsertio
- nsIContent* templContent = GetImmediateChild(nsXBLAtoms::content);
+ nsIContent* templContent = GetImmediateChild(nsGkAtoms::content);
@@ -760 +757 @@ nsXBLPrototypeBinding::LocateInstance(ns
- if (templParent->NodeInfo()->Equals(nsXBLAtoms::children,
+ if (templParent->NodeInfo()->Equals(nsGkAtoms::children,
@@ -853 +850 @@ PRBool PR_CALLBACK SetAttrs(nsHashKey* a
- if (src == nsHTMLAtoms::text && srcNs == kNameSpaceID_XBL) {
+ if (src == nsGkAtoms::text && srcNs == kNameSpaceID_XBL) {
@@ -870 +867 @@ PRBool PR_CALLBACK SetAttrs(nsHashKey* a
- changeData->mProto->GetImmediateChild(nsXBLAtoms::content);
+ changeData->mProto->GetImmediateChild(nsGkAtoms::content);
@@ -885,2 +882,2 @@ PRBool PR_CALLBACK SetAttrs(nsHashKey* a
- if ((dst == nsHTMLAtoms::text && dstNs == kNameSpaceID_XBL) ||
- (realElement->NodeInfo()->Equals(nsHTMLAtoms::html,
+ if ((dst == nsGkAtoms::text && dstNs == kNameSpaceID_XBL) ||
+ (realElement->NodeInfo()->Equals(nsGkAtoms::html,
@@ -888 +885 @@ PRBool PR_CALLBACK SetAttrs(nsHashKey* a
- dst == nsHTMLAtoms::value && !value.IsEmpty())) {
+ dst == nsGkAtoms::value && !value.IsEmpty())) {
@@ -961 +958 @@ nsXBLPrototypeBinding::ShouldBuildChildF
- nsISupportsKey key(nsHTMLAtoms::text);
+ nsISupportsKey key(nsGkAtoms::text);
@@ -988 +985 @@ nsXBLPrototypeBinding::ConstructAttribut
- if (!aElement->NodeInfo()->Equals(nsXBLAtoms::children, kNameSpaceID_XBL)) {
+ if (!aElement->NodeInfo()->Equals(nsGkAtoms::children, kNameSpaceID_XBL)) {
@@ -990 +987 @@ nsXBLPrototypeBinding::ConstructAttribut
- aElement->GetAttr(kNameSpaceID_XBL, nsXBLAtoms::inherits, inherits);
+ aElement->GetAttr(kNameSpaceID_XBL, nsGkAtoms::inherits, inherits);
@@ -1084 +1081 @@ nsXBLPrototypeBinding::ConstructAttribut
- // aElement->UnsetAttr(kNameSpaceID_XBL, nsXBLAtoms::inherits, PR_FALSE);
+ // aElement->UnsetAttr(kNameSpaceID_XBL, nsGkAtoms::inherits, PR_FALSE);
@@ -1111 +1108 @@ nsXBLPrototypeBinding::ConstructInsertio
- GetNestedChildren(nsXBLAtoms::children, kNameSpaceID_XBL, aContent,
+ GetNestedChildren(nsGkAtoms::children, kNameSpaceID_XBL, aContent,
@@ -1133 +1130 @@ nsXBLPrototypeBinding::ConstructInsertio
- child->GetAttr(kNameSpaceID_None, nsXBLAtoms::includes, includes);
+ child->GetAttr(kNameSpaceID_None, nsGkAtoms::includes, includes);
@@ -1135 +1132 @@ nsXBLPrototypeBinding::ConstructInsertio
- nsISupportsKey key(nsXBLAtoms::children);
+ nsISupportsKey key(nsGkAtoms::children);
@@ -1312,3 +1309,3 @@ nsXBLPrototypeBinding::CreateKeyHandlers
- if (eventAtom == nsXBLAtoms::keyup ||
- eventAtom == nsXBLAtoms::keydown ||
- eventAtom == nsXBLAtoms::keypress) {
+ if (eventAtom == nsGkAtoms::keyup ||
+ eventAtom == nsGkAtoms::keydown ||
+ eventAtom == nsGkAtoms::keypress) {
Index: mozilla/content/xbl/src/nsXBLPrototypeHandler.cpp
===================================================================
RCS file: /cvsroot/mozilla/content/xbl/src/nsXBLPrototypeHandler.cpp,v
retrieving revision 1.113
diff -u -p -0 -r1.113 nsXBLPrototypeHandler.cpp
--- mozilla/content/xbl/src/nsXBLPrototypeHandler.cpp 24 Jun 2006 22:49:09 -0000 1.113
+++ mozilla/content/xbl/src/nsXBLPrototypeHandler.cpp 3 Oct 2006 22:56:47 -0000
@@ -75,3 +74,0 @@
-#include "nsXULAtoms.h"
-#include "nsXBLAtoms.h"
-#include "nsLayoutAtoms.h"
@@ -86 +82,0 @@
-#include "nsHTMLAtoms.h"
@@ -331 +327 @@ nsXBLPrototypeHandler::ExecuteHandler(ns
- if (content->Tag() == nsHTMLAtoms::a &&
+ if (content->Tag() == nsGkAtoms::a &&
@@ -337,3 +333,3 @@ nsXBLPrototypeHandler::ExecuteHandler(ns
- if (content->HasAttr(kNameSpaceID_XLink, nsHTMLAtoms::type)) {
- isLink = content->AttrValueIs(kNameSpaceID_XLink, nsHTMLAtoms::type,
- nsHTMLAtoms::simple, eCaseMatters);
+ if (content->HasAttr(kNameSpaceID_XLink, nsGkAtoms::type)) {
+ isLink = content->AttrValueIs(kNameSpaceID_XLink, nsGkAtoms::type,
+ nsGkAtoms::simple, eCaseMatters);
@@ -369,2 +365,2 @@ nsXBLPrototypeHandler::ExecuteHandler(ns
- nsXULAtoms::disabled,
- nsXULAtoms::_true,
+ nsGkAtoms::disabled,
+ nsGkAtoms::_true,
@@ -776 +772 @@ nsXBLPrototypeHandler::GetEventType(nsAS
- mHandlerElement->GetAttr(kNameSpaceID_None, nsXBLAtoms::event, aEvent);
+ mHandlerElement->GetAttr(kNameSpaceID_None, nsGkAtoms::event, aEvent);
@@ -852 +848 @@ nsXBLPrototypeHandler::ConstructPrototyp
- mHandlerElement->GetAttr(kNameSpaceID_None, nsXBLAtoms::modifiers, modifiers);
+ mHandlerElement->GetAttr(kNameSpaceID_None, nsGkAtoms::modifiers, modifiers);
@@ -884 +880 @@ nsXBLPrototypeHandler::ConstructPrototyp
- mHandlerElement->GetAttr(kNameSpaceID_None, nsXBLAtoms::key, key);
+ mHandlerElement->GetAttr(kNameSpaceID_None, nsGkAtoms::key, key);
@@ -886 +882 @@ nsXBLPrototypeHandler::ConstructPrototyp
- mHandlerElement->GetAttr(kNameSpaceID_None, nsXBLAtoms::charcode, key);
+ mHandlerElement->GetAttr(kNameSpaceID_None, nsGkAtoms::charcode, key);
@@ -913 +909 @@ nsXBLPrototypeHandler::ConstructPrototyp
- mHandlerElement->GetAttr(kNameSpaceID_None, nsXBLAtoms::keycode, key);
+ mHandlerElement->GetAttr(kNameSpaceID_None, nsGkAtoms::keycode, key);
Index: mozilla/content/xbl/src/nsXBLResourceLoader.cpp
===================================================================
RCS file: /cvsroot/mozilla/content/xbl/src/nsXBLResourceLoader.cpp,v
retrieving revision 1.36
diff -u -p -0 -r1.36 nsXBLResourceLoader.cpp
--- mozilla/content/xbl/src/nsXBLResourceLoader.cpp 12 Sep 2005 18:41:13 -0000 1.36
+++ mozilla/content/xbl/src/nsXBLResourceLoader.cpp 3 Oct 2006 22:56:47 -0000
@@ -55 +54,0 @@
-#include "nsXBLAtoms.h"
@@ -112 +111 @@ nsXBLResourceLoader::LoadResources(PRBoo
- if (curr->mType == nsXBLAtoms::image) {
+ if (curr->mType == nsGkAtoms::image) {
@@ -126 +125 @@ nsXBLResourceLoader::LoadResources(PRBoo
- else if (curr->mType == nsXBLAtoms::stylesheet) {
+ else if (curr->mType == nsGkAtoms::stylesheet) {
Index: mozilla/content/xbl/src/nsXBLService.cpp
===================================================================
RCS file: /cvsroot/mozilla/content/xbl/src/nsXBLService.cpp,v
retrieving revision 1.220
diff -u -p -0 -r1.220 nsXBLService.cpp
--- mozilla/content/xbl/src/nsXBLService.cpp 19 Jul 2006 04:28:34 -0000 1.220
+++ mozilla/content/xbl/src/nsXBLService.cpp 3 Oct 2006 22:56:47 -0000
@@ -64 +63,0 @@
-#include "nsHTMLAtoms.h"
@@ -72,2 +70,0 @@
-#include "nsXBLAtoms.h"
-#include "nsXULAtoms.h"
@@ -908,2 +905,2 @@ nsXBLService::GetBinding(nsIContent* aBo
- child->GetAttr(kNameSpaceID_None, nsXBLAtoms::display, display);
- child->GetAttr(kNameSpaceID_None, nsXBLAtoms::extends, extends);
+ child->GetAttr(kNameSpaceID_None, nsGkAtoms::display, display);
+ child->GetAttr(kNameSpaceID_None, nsGkAtoms::extends, extends);
@@ -952 +949 @@ nsXBLService::GetBinding(nsIContent* aBo
- //child->UnsetAttr(kNameSpaceID_None, nsXBLAtoms::extends, PR_FALSE);
+ //child->UnsetAttr(kNameSpaceID_None, nsGkAtoms::extends, PR_FALSE);
@@ -981,2 +978,2 @@ nsXBLService::GetBinding(nsIContent* aBo
- child->UnsetAttr(kNameSpaceID_None, nsXBLAtoms::extends, PR_FALSE);
- child->UnsetAttr(kNameSpaceID_None, nsXBLAtoms::display, PR_FALSE);
+ child->UnsetAttr(kNameSpaceID_None, nsGkAtoms::extends, PR_FALSE);
+ child->UnsetAttr(kNameSpaceID_None, nsGkAtoms::display, PR_FALSE);
@@ -1056,4 +1053,4 @@ nsXBLService::LoadBindingDocumentInfo(ns
- (!ni || !(ni->Equals(nsXULAtoms::scrollbar, kNameSpaceID_XUL) ||
- ni->Equals(nsXULAtoms::thumb, kNameSpaceID_XUL) ||
- ((ni->Equals(nsHTMLAtoms::input) ||
- ni->Equals(nsHTMLAtoms::select)) &&
+ (!ni || !(ni->Equals(nsGkAtoms::scrollbar, kNameSpaceID_XUL) ||
+ ni->Equals(nsGkAtoms::thumb, kNameSpaceID_XUL) ||
+ ((ni->Equals(nsGkAtoms::input) ||
+ ni->Equals(nsGkAtoms::select)) &&
Index: mozilla/content/xbl/src/nsXBLWindowDragHandler.cpp
===================================================================
RCS file: /cvsroot/mozilla/content/xbl/src/nsXBLWindowDragHandler.cpp,v
retrieving revision 1.9
diff -u -p -0 -r1.9 nsXBLWindowDragHandler.cpp
--- mozilla/content/xbl/src/nsXBLWindowDragHandler.cpp 10 Sep 2004 07:17:30 -0000 1.9
+++ mozilla/content/xbl/src/nsXBLWindowDragHandler.cpp 3 Oct 2006 22:56:47 -0000
@@ -42 +41,0 @@
-#include "nsXBLAtoms.h"
@@ -50 +48,0 @@
-#include "nsHTMLAtoms.h"
@@ -102 +100 @@ nsXBLWindowDragHandler::DragGesture(nsID
- return WalkHandlers(aDragEvent, nsXBLAtoms::draggesture);
+ return WalkHandlers(aDragEvent, nsGkAtoms::draggesture);
@@ -108 +106 @@ nsXBLWindowDragHandler::DragEnter(nsIDOM
- return WalkHandlers(aDragEvent, nsXBLAtoms::dragenter);
+ return WalkHandlers(aDragEvent, nsGkAtoms::dragenter);
@@ -114 +112 @@ nsXBLWindowDragHandler::DragExit(nsIDOME
- return WalkHandlers(aDragEvent, nsXBLAtoms::dragexit);
+ return WalkHandlers(aDragEvent, nsGkAtoms::dragexit);
@@ -120 +118 @@ nsXBLWindowDragHandler::DragOver(nsIDOME
- return WalkHandlers(aDragEvent, nsXBLAtoms::dragevent);
+ return WalkHandlers(aDragEvent, nsGkAtoms::dragevent);
@@ -126 +124 @@ nsXBLWindowDragHandler::DragDrop(nsIDOME
- return WalkHandlers(aDragEvent, nsXBLAtoms::dragdrop);
+ return WalkHandlers(aDragEvent, nsGkAtoms::dragdrop);
Index: mozilla/content/xbl/src/nsXBLWindowHandler.cpp
===================================================================
RCS file: /cvsroot/mozilla/content/xbl/src/nsXBLWindowHandler.cpp,v
retrieving revision 1.37
diff -u -p -0 -r1.37 nsXBLWindowHandler.cpp
--- mozilla/content/xbl/src/nsXBLWindowHandler.cpp 7 May 2006 03:07:02 -0000 1.37
+++ mozilla/content/xbl/src/nsXBLWindowHandler.cpp 3 Oct 2006 22:56:47 -0000
@@ -57,2 +56,0 @@
-#include "nsHTMLAtoms.h"
-#include "nsXULAtoms.h"
@@ -66 +63,0 @@
-#include "nsXULAtoms.h"
@@ -280 +277 @@ nsXBLWindowHandler::WalkHandlersInternal
- elt->GetAttr(kNameSpaceID_None, nsXULAtoms::command, command);
+ elt->GetAttr(kNameSpaceID_None, nsGkAtoms::command, command);
Index: mozilla/content/xbl/src/nsXBLWindowKeyHandler.cpp
===================================================================
RCS file: /cvsroot/mozilla/content/xbl/src/nsXBLWindowKeyHandler.cpp,v
retrieving revision 1.32
diff -u -p -0 -r1.32 nsXBLWindowKeyHandler.cpp
--- mozilla/content/xbl/src/nsXBLWindowKeyHandler.cpp 12 May 2006 22:58:10 -0000 1.32
+++ mozilla/content/xbl/src/nsXBLWindowKeyHandler.cpp 3 Oct 2006 22:56:47 -0000
@@ -43 +42,0 @@
-#include "nsXBLAtoms.h"
@@ -52 +50,0 @@
-#include "nsHTMLAtoms.h"
@@ -55 +52,0 @@
-#include "nsXBLAtoms.h"
@@ -92 +89 @@ BuildHandlerChain(nsIContent* aContent,
- if (key->NodeInfo()->Equals(nsXBLAtoms::key, kNameSpaceID_XUL)) {
+ if (key->NodeInfo()->Equals(nsGkAtoms::key, kNameSpaceID_XUL)) {
@@ -221 +218 @@ nsXBLWindowKeyHandler::WalkHandlers(nsID
- if (aEventType == nsXBLAtoms::keypress) {
+ if (aEventType == nsGkAtoms::keypress) {
@@ -225 +222 @@ nsXBLWindowKeyHandler::WalkHandlers(nsID
- } else if (aEventType == nsXBLAtoms::keyup) {
+ } else if (aEventType == nsGkAtoms::keyup) {
@@ -243 +240 @@ nsresult nsXBLWindowKeyHandler::KeyUp(ns
- return WalkHandlers(aKeyEvent, nsXBLAtoms::keyup);
+ return WalkHandlers(aKeyEvent, nsGkAtoms::keyup);
@@ -248 +245 @@ nsresult nsXBLWindowKeyHandler::KeyDown(
- return WalkHandlers(aKeyEvent, nsXBLAtoms::keydown);
+ return WalkHandlers(aKeyEvent, nsGkAtoms::keydown);
@@ -253 +250 @@ nsresult nsXBLWindowKeyHandler::KeyPress
- return WalkHandlers(aKeyEvent, nsXBLAtoms::keypress);
+ return WalkHandlers(aKeyEvent, nsGkAtoms::keypress);
Index: mozilla/content/xml/content/src/nsXMLCDATASection.cpp
===================================================================
RCS file: /cvsroot/mozilla/content/xml/content/src/nsXMLCDATASection.cpp,v
retrieving revision 1.49
diff -u -p -0 -r1.49 nsXMLCDATASection.cpp
--- mozilla/content/xml/content/src/nsXMLCDATASection.cpp 5 Sep 2006 10:22:53 -0000 1.49
+++ mozilla/content/xml/content/src/nsXMLCDATASection.cpp 3 Oct 2006 22:56:47 -0000
@@ -40 +39,0 @@
-#include "nsLayoutAtoms.h"
@@ -84 +83 @@ NS_NewXMLCDATASection(nsIContent** aInst
- nsresult rv = aNodeInfoManager->GetNodeInfo(nsLayoutAtoms::cdataTagName,
+ nsresult rv = aNodeInfoManager->GetNodeInfo(nsGkAtoms::cdataTagName,
Index: mozilla/content/xml/content/src/nsXMLElement.cpp
===================================================================
RCS file: /cvsroot/mozilla/content/xml/content/src/nsXMLElement.cpp,v
retrieving revision 1.140
diff -u -p -0 -r1.140 nsXMLElement.cpp
--- mozilla/content/xml/content/src/nsXMLElement.cpp 5 Sep 2006 10:22:53 -0000 1.140
+++ mozilla/content/xml/content/src/nsXMLElement.cpp 3 Oct 2006 22:56:48 -0000
@@ -40,3 +39,0 @@
-#include "nsGkAtoms.h"
-#include "nsHTMLAtoms.h"
-#include "nsLayoutAtoms.h"
@@ -69 +65,0 @@
-#include "nsLayoutAtoms.h"
@@ -74 +70 @@ static nsIContent::AttrValuesArray strin
- {&nsLayoutAtoms::_new, &nsLayoutAtoms::replace, &nsLayoutAtoms::embed, nsnull};
+ {&nsGkAtoms::_new, &nsGkAtoms::replace, &nsGkAtoms::embed, nsnull};
@@ -142 +138 @@ nsXMLElement::SetAttr(PRInt32 aNameSpace
- if (aNameSpaceID == kNameSpaceID_XLink && aName == nsHTMLAtoms::type) {
+ if (aNameSpaceID == kNameSpaceID_XLink && aName == nsGkAtoms::type) {
@@ -202,2 +198,2 @@ nsXMLElement::MaybeTriggerAutoLink(nsIDo
- if (AttrValueIs(kNameSpaceID_XLink, nsLayoutAtoms::actuate,
- nsLayoutAtoms::onLoad, eCaseMatters)) {
+ if (AttrValueIs(kNameSpaceID_XLink, nsGkAtoms::actuate,
+ nsGkAtoms::onLoad, eCaseMatters)) {
@@ -226 +222 @@ nsXMLElement::MaybeTriggerAutoLink(nsIDo
- switch (FindAttrValueIn(kNameSpaceID_XLink, nsLayoutAtoms::show,
+ switch (FindAttrValueIn(kNameSpaceID_XLink, nsGkAtoms::show,
@@ -299 +295 @@ nsXMLElement::PostHandleEvent(nsEventCha
- switch (FindAttrValueIn(kNameSpaceID_XLink, nsLayoutAtoms::show,
+ switch (FindAttrValueIn(kNameSpaceID_XLink, nsGkAtoms::show,
@@ -307 +303 @@ nsXMLElement::PostHandleEvent(nsEventCha
- GetAttr(kNameSpaceID_XLink, nsLayoutAtoms::_moz_target, target);
+ GetAttr(kNameSpaceID_XLink, nsGkAtoms::_moz_target, target);
Index: mozilla/content/xml/content/src/nsXMLProcessingInstruction.cpp
===================================================================
RCS file: /cvsroot/mozilla/content/xml/content/src/nsXMLProcessingInstruction.cpp,v
retrieving revision 1.73
diff -u -p -0 -r1.73 nsXMLProcessingInstruction.cpp
--- mozilla/content/xml/content/src/nsXMLProcessingInstruction.cpp 5 Sep 2006 10:22:53 -0000 1.73
+++ mozilla/content/xml/content/src/nsXMLProcessingInstruction.cpp 3 Oct 2006 22:56:48 -0000
@@ -39 +38,0 @@
-#include "nsLayoutAtoms.h"
@@ -62 +61 @@ NS_NewXMLProcessingInstruction(nsIConten
- aNodeInfoManager->GetNodeInfo(nsLayoutAtoms::processingInstructionTagName,
+ aNodeInfoManager->GetNodeInfo(nsGkAtoms::processingInstructionTagName,
Index: mozilla/content/xml/content/src/nsXMLStylesheetPI.cpp
===================================================================
RCS file: /cvsroot/mozilla/content/xml/content/src/nsXMLStylesheetPI.cpp,v
retrieving revision 1.22
diff -u -p -0 -r1.22 nsXMLStylesheetPI.cpp
--- mozilla/content/xml/content/src/nsXMLStylesheetPI.cpp 5 Sep 2006 10:22:53 -0000 1.22
+++ mozilla/content/xml/content/src/nsXMLStylesheetPI.cpp 3 Oct 2006 22:56:48 -0000
@@ -49 +48,0 @@
-#include "nsLayoutAtoms.h"
@@ -252 +251 @@ NS_NewXMLStylesheetProcessingInstruction
- aNodeInfoManager->GetNodeInfo(nsLayoutAtoms::processingInstructionTagName,
+ aNodeInfoManager->GetNodeInfo(nsGkAtoms::processingInstructionTagName,
Index: mozilla/content/xml/document/src/nsXMLContentSink.cpp
===================================================================
RCS file: /cvsroot/mozilla/content/xml/document/src/nsXMLContentSink.cpp,v
retrieving revision 1.395
diff -u -p -0 -r1.395 nsXMLContentSink.cpp
--- mozilla/content/xml/document/src/nsXMLContentSink.cpp 3 Oct 2006 02:22:22 -0000 1.395
+++ mozilla/content/xml/document/src/nsXMLContentSink.cpp 3 Oct 2006 22:56:48 -0000
@@ -65 +64,0 @@
-#include "nsHTMLAtoms.h"
@@ -67 +65,0 @@
-#include "nsLayoutAtoms.h"
@@ -91 +88,0 @@
-#include "nsXBLAtoms.h"
@@ -102 +98,0 @@
-#include "nsSVGAtoms.h"
@@ -467 +463 @@ nsXMLContentSink::CreateElement(const PR
- if (aNodeInfo->Equals(nsHTMLAtoms::script, kNameSpaceID_XHTML)
+ if (aNodeInfo->Equals(nsGkAtoms::script, kNameSpaceID_XHTML)
@@ -469 +465 @@ nsXMLContentSink::CreateElement(const PR
- || aNodeInfo->Equals(nsSVGAtoms::script, kNameSpaceID_SVG)
+ || aNodeInfo->Equals(nsGkAtoms::script, kNameSpaceID_SVG)
@@ -499 +495 @@ nsXMLContentSink::CreateElement(const PR
- if (aNodeInfo->Equals(nsHTMLAtoms::title, kNameSpaceID_XHTML)) {
+ if (aNodeInfo->Equals(nsGkAtoms::title, kNameSpaceID_XHTML)) {
@@ -505 +501 @@ nsXMLContentSink::CreateElement(const PR
- else if (aNodeInfo->Equals(nsSVGAtoms::title, kNameSpaceID_SVG)) {
+ else if (aNodeInfo->Equals(nsGkAtoms::title, kNameSpaceID_SVG)) {
@@ -509 +505 @@ nsXMLContentSink::CreateElement(const PR
- parent->NodeInfo()->Equals(nsSVGAtoms::svg, kNameSpaceID_SVG)) {
+ parent->NodeInfo()->Equals(nsGkAtoms::svg, kNameSpaceID_SVG)) {
@@ -514,3 +510,3 @@ nsXMLContentSink::CreateElement(const PR
- else if (aNodeInfo->Equals(nsHTMLAtoms::link, kNameSpaceID_XHTML) ||
- aNodeInfo->Equals(nsHTMLAtoms::style, kNameSpaceID_XHTML) ||
- aNodeInfo->Equals(nsHTMLAtoms::style, kNameSpaceID_SVG)) {
+ else if (aNodeInfo->Equals(nsGkAtoms::link, kNameSpaceID_XHTML) ||
+ aNodeInfo->Equals(nsGkAtoms::style, kNameSpaceID_XHTML) ||
+ aNodeInfo->Equals(nsGkAtoms::style, kNameSpaceID_SVG)) {
@@ -521 +517 @@ nsXMLContentSink::CreateElement(const PR
- if (!aNodeInfo->Equals(nsHTMLAtoms::link, kNameSpaceID_XHTML)) {
+ if (!aNodeInfo->Equals(nsGkAtoms::link, kNameSpaceID_XHTML)) {
@@ -546,4 +542,4 @@ nsXMLContentSink::CloseElement(nsIConten
- (nodeInfo->NameAtom() == nsHTMLAtoms::select ||
- nodeInfo->NameAtom() == nsHTMLAtoms::textarea ||
- nodeInfo->NameAtom() == nsHTMLAtoms::object ||
- nodeInfo->NameAtom() == nsHTMLAtoms::applet))
+ (nodeInfo->NameAtom() == nsGkAtoms::select ||
+ nodeInfo->NameAtom() == nsGkAtoms::textarea ||
+ nodeInfo->NameAtom() == nsGkAtoms::object ||
+ nodeInfo->NameAtom() == nsGkAtoms::applet))
@@ -564 +560 @@ nsXMLContentSink::CloseElement(nsIConten
- if (nodeInfo->Equals(nsHTMLAtoms::script, kNameSpaceID_XHTML)
+ if (nodeInfo->Equals(nsGkAtoms::script, kNameSpaceID_XHTML)
@@ -566 +562 @@ nsXMLContentSink::CloseElement(nsIConten
- || nodeInfo->Equals(nsSVGAtoms::script, kNameSpaceID_SVG)
+ || nodeInfo->Equals(nsGkAtoms::script, kNameSpaceID_SVG)
@@ -574 +570 @@ nsXMLContentSink::CloseElement(nsIConten
- if ((nodeInfo->Equals(nsHTMLAtoms::title, kNameSpaceID_XHTML)
+ if ((nodeInfo->Equals(nsGkAtoms::title, kNameSpaceID_XHTML)
@@ -576 +572 @@ nsXMLContentSink::CloseElement(nsIConten
- || nodeInfo->Equals(nsSVGAtoms::title, kNameSpaceID_SVG)
+ || nodeInfo->Equals(nsGkAtoms::title, kNameSpaceID_SVG)
@@ -586 +582 @@ nsXMLContentSink::CloseElement(nsIConten
- else if (nodeInfo->Equals(nsHTMLAtoms::base, kNameSpaceID_XHTML) &&
+ else if (nodeInfo->Equals(nsGkAtoms::base, kNameSpaceID_XHTML) &&
@@ -592 +588 @@ nsXMLContentSink::CloseElement(nsIConten
- else if (nodeInfo->Equals(nsHTMLAtoms::meta, kNameSpaceID_XHTML) &&
+ else if (nodeInfo->Equals(nsGkAtoms::meta, kNameSpaceID_XHTML) &&
@@ -598,3 +594,3 @@ nsXMLContentSink::CloseElement(nsIConten
- else if (nodeInfo->Equals(nsHTMLAtoms::link, kNameSpaceID_XHTML) ||
- nodeInfo->Equals(nsHTMLAtoms::style, kNameSpaceID_XHTML) ||
- nodeInfo->Equals(nsHTMLAtoms::style, kNameSpaceID_SVG)) {
+ else if (nodeInfo->Equals(nsGkAtoms::link, kNameSpaceID_XHTML) ||
+ nodeInfo->Equals(nsGkAtoms::style, kNameSpaceID_XHTML) ||
+ nodeInfo->Equals(nsGkAtoms::style, kNameSpaceID_SVG)) {
@@ -746 +742 @@ nsXMLContentSink::ProcessBASETag(nsICont
- if (aContent->GetAttr(kNameSpaceID_None, nsHTMLAtoms::target, value)) {
+ if (aContent->GetAttr(kNameSpaceID_None, nsGkAtoms::target, value)) {
@@ -750 +746 @@ nsXMLContentSink::ProcessBASETag(nsICont
- if (aContent->GetAttr(kNameSpaceID_None, nsHTMLAtoms::href, value)) {
+ if (aContent->GetAttr(kNameSpaceID_None, nsGkAtoms::href, value)) {
@@ -877 +873 @@ NS_NewMathMLElement(nsIContent** aResult
- aNodeInfo->SetIDAttributeAtom(nsHTMLAtoms::id);
+ aNodeInfo->SetIDAttributeAtom(nsGkAtoms::id);
@@ -902 +898 @@ nsXMLContentSink::SetDocElement(PRInt32
- aTagName == nsXBLAtoms::bindings) ||
+ aTagName == nsGkAtoms::bindings) ||
@@ -904,2 +900,2 @@ nsXMLContentSink::SetDocElement(PRInt32
- (aTagName == nsLayoutAtoms::stylesheet ||
- aTagName == nsLayoutAtoms::transform))) {
+ (aTagName == nsGkAtoms::stylesheet ||
+ aTagName == nsGkAtoms::transform))) {
@@ -1010,2 +1006,2 @@ nsXMLContentSink::HandleStartElement(con
- (nodeInfo->NameAtom() == nsHTMLAtoms::input ||
- nodeInfo->NameAtom() == nsHTMLAtoms::button)) {
+ (nodeInfo->NameAtom() == nsGkAtoms::input ||
+ nodeInfo->NameAtom() == nsGkAtoms::button)) {
@@ -1067 +1063 @@ nsXMLContentSink::HandleEndElement(const
- content->HasAttr(kNameSpaceID_None, nsSVGAtoms::onload)) {
+ content->HasAttr(kNameSpaceID_None, nsGkAtoms::onload)) {
Index: mozilla/content/xtf/src/nsXTFElementWrapper.cpp
===================================================================
RCS file: /cvsroot/mozilla/content/xtf/src/nsXTFElementWrapper.cpp,v
retrieving revision 1.35
diff -u -p -0 -r1.35 nsXTFElementWrapper.cpp
--- mozilla/content/xtf/src/nsXTFElementWrapper.cpp 5 Sep 2006 10:22:54 -0000 1.35
+++ mozilla/content/xtf/src/nsXTFElementWrapper.cpp 3 Oct 2006 22:56:48 -0000
@@ -48 +47,0 @@
-#include "nsHTMLAtoms.h" // XXX only needed for nsHTMLAtoms::id
@@ -56 +54,0 @@
-#include "nsLayoutAtoms.h"
@@ -65 +63 @@ nsXTFElementWrapper::nsXTFElementWrapper
- mTmpAttrName(nsLayoutAtoms::_asterix) // XXX this is a hack, but names
+ mTmpAttrName(nsGkAtoms::_asterix) // XXX this is a hack, but names
@@ -244 +242 @@ nsXTFElementWrapper::GetIDAttributeName(
- return nsHTMLAtoms::id;
+ return nsGkAtoms::id;
Index: mozilla/content/xul/content/src/nsXULAtoms.h
===================================================================
RCS file: /cvsroot/mozilla/content/xul/content/src/nsXULAtoms.h,v
retrieving revision 1.6
diff -u -p -0 -r1.6 nsXULAtoms.h
--- mozilla/content/xul/content/src/nsXULAtoms.h 19 Jan 2006 00:57:50 -0000 1.6
+++ mozilla/content/xul/content/src/nsXULAtoms.h 3 Oct 2006 22:56:48 -0000
@@ -38,2 +38,2 @@
-#ifndef nsXULAtoms_h___
-#define nsXULAtoms_h___
+#ifndef nsGkAtoms_h___
+#define nsGkAtoms_h___
@@ -41,2 +41 @@
-#include "nsGkAtoms.h"
-typedef class nsGkAtoms nsXULAtoms;
+typedef class nsGkAtoms nsGkAtoms;
@@ -44 +43 @@ typedef class nsGkAtoms nsXULAtoms;
-#endif /* nsXULAtoms_h___ */
+#endif /* nsGkAtoms_h___ */
Index: mozilla/content/xul/content/src/nsXULElement.cpp
===================================================================
RCS file: /cvsroot/mozilla/content/xul/content/src/nsXULElement.cpp,v
retrieving revision 1.656
diff -u -p -0 -r1.656 nsXULElement.cpp
--- mozilla/content/xul/content/src/nsXULElement.cpp 3 Oct 2006 17:52:22 -0000 1.656
+++ mozilla/content/xul/content/src/nsXULElement.cpp 3 Oct 2006 22:56:50 -0000
@@ -138,2 +137,0 @@
-#include "nsHTMLAtoms.h"
-#include "nsLayoutAtoms.h"
@@ -200,49 +198,49 @@ IsEventHandler(nsIAtom* aName)
- return aName == nsLayoutAtoms::onclick ||
- aName == nsLayoutAtoms::ondblclick ||
- aName == nsLayoutAtoms::onmousedown ||
- aName == nsLayoutAtoms::onmouseup ||
- aName == nsLayoutAtoms::onmouseover ||
- aName == nsLayoutAtoms::onmouseout ||
- aName == nsLayoutAtoms::onmousemove ||
-
- aName == nsLayoutAtoms::onkeydown ||
- aName == nsLayoutAtoms::onkeyup ||
- aName == nsLayoutAtoms::onkeypress ||
-
- aName == nsLayoutAtoms::oncompositionstart ||
- aName == nsLayoutAtoms::oncompositionend ||
-
- aName == nsLayoutAtoms::onload ||
- aName == nsLayoutAtoms::onunload ||
- aName == nsLayoutAtoms::onabort ||
- aName == nsLayoutAtoms::onerror ||
-
- aName == nsLayoutAtoms::onpopupshowing ||
- aName == nsLayoutAtoms::onpopupshown ||
- aName == nsLayoutAtoms::onpopuphiding ||
- aName == nsLayoutAtoms::onpopuphidden ||
- aName == nsLayoutAtoms::onclose ||
- aName == nsLayoutAtoms::oncommand ||
- aName == nsLayoutAtoms::onbroadcast ||
- aName == nsLayoutAtoms::oncommandupdate ||
-
- aName == nsLayoutAtoms::onoverflow ||
- aName == nsLayoutAtoms::onunderflow ||
- aName == nsLayoutAtoms::onoverflowchanged ||
-
- aName == nsLayoutAtoms::onfocus ||
- aName == nsLayoutAtoms::onblur ||
-
- aName == nsLayoutAtoms::onsubmit ||
- aName == nsLayoutAtoms::onreset ||
- aName == nsLayoutAtoms::onchange ||
- aName == nsLayoutAtoms::onselect ||
- aName == nsLayoutAtoms::oninput ||
-
- aName == nsLayoutAtoms::onpaint ||
-
- aName == nsLayoutAtoms::ondragenter ||
- aName == nsLayoutAtoms::ondragover ||
- aName == nsLayoutAtoms::ondragexit ||
- aName == nsLayoutAtoms::ondragdrop ||
- aName == nsLayoutAtoms::ondraggesture ||
+ return aName == nsGkAtoms::onclick ||
+ aName == nsGkAtoms::ondblclick ||
+ aName == nsGkAtoms::onmousedown ||
+ aName == nsGkAtoms::onmouseup ||
+ aName == nsGkAtoms::onmouseover ||
+ aName == nsGkAtoms::onmouseout ||
+ aName == nsGkAtoms::onmousemove ||
+
+ aName == nsGkAtoms::onkeydown ||
+ aName == nsGkAtoms::onkeyup ||
+ aName == nsGkAtoms::onkeypress ||
+
+ aName == nsGkAtoms::oncompositionstart ||
+ aName == nsGkAtoms::oncompositionend ||
+
+ aName == nsGkAtoms::onload ||
+ aName == nsGkAtoms::onunload ||
+ aName == nsGkAtoms::onabort ||
+ aName == nsGkAtoms::onerror ||
+
+ aName == nsGkAtoms::onpopupshowing ||
+ aName == nsGkAtoms::onpopupshown ||
+ aName == nsGkAtoms::onpopuphiding ||
+ aName == nsGkAtoms::onpopuphidden ||
+ aName == nsGkAtoms::onclose ||
+ aName == nsGkAtoms::oncommand ||
+ aName == nsGkAtoms::onbroadcast ||
+ aName == nsGkAtoms::oncommandupdate ||
+
+ aName == nsGkAtoms::onoverflow ||
+ aName == nsGkAtoms::onunderflow ||
+ aName == nsGkAtoms::onoverflowchanged ||
+
+ aName == nsGkAtoms::onfocus ||
+ aName == nsGkAtoms::onblur ||
+
+ aName == nsGkAtoms::onsubmit ||
+ aName == nsGkAtoms::onreset ||
+ aName == nsGkAtoms::onchange ||
+ aName == nsGkAtoms::onselect ||
+ aName == nsGkAtoms::oninput ||
+
+ aName == nsGkAtoms::onpaint ||
+
+ aName == nsGkAtoms::ondragenter ||
+ aName == nsGkAtoms::ondragover ||
+ aName == nsGkAtoms::ondragexit ||
+ aName == nsGkAtoms::ondragdrop ||
+ aName == nsGkAtoms::ondraggesture ||
@@ -250 +248 @@ IsEventHandler(nsIAtom* aName)
- aName == nsLayoutAtoms::oncontextmenu;
+ aName == nsGkAtoms::oncontextmenu;
@@ -600 +598 @@ nsXULElement::GetEventListenerManagerFor
- if ((!root || root == this) && !mNodeInfo->Equals(nsXULAtoms::overlay)) {
+ if ((!root || root == this) && !mNodeInfo->Equals(nsGkAtoms::overlay)) {
@@ -633 +631 @@ nsXULElement::IsFocusable(PRInt32 *aTabI
- else if (HasAttr(kNameSpaceID_None, nsHTMLAtoms::tabindex)) {
+ else if (HasAttr(kNameSpaceID_None, nsGkAtoms::tabindex)) {
@@ -644 +642 @@ nsXULElement::IsFocusable(PRInt32 *aTabI
- if (!mNodeInfo->Equals(nsXULAtoms::tree) && !mNodeInfo->Equals(nsXULAtoms::listbox))
+ if (!mNodeInfo->Equals(nsGkAtoms::tree) && !mNodeInfo->Equals(nsGkAtoms::listbox))
@@ -653 +651 @@ nsXULElement::IsFocusable(PRInt32 *aTabI
- return tabIndex >= 0 || (!disabled && HasAttr(kNameSpaceID_None, nsHTMLAtoms::tabindex));
+ return tabIndex >= 0 || (!disabled && HasAttr(kNameSpaceID_None, nsGkAtoms::tabindex));
@@ -784,2 +782,2 @@ nsXULElement::MaybeAddPopupListener(nsIA
- if (aLocalName == nsXULAtoms::menu ||
- aLocalName == nsXULAtoms::contextmenu ||
+ if (aLocalName == nsGkAtoms::menu ||
+ aLocalName == nsGkAtoms::contextmenu ||
@@ -787,2 +785,2 @@ nsXULElement::MaybeAddPopupListener(nsIA
- aLocalName == nsXULAtoms::popup ||
- aLocalName == nsXULAtoms::context) {
+ aLocalName == nsGkAtoms::popup ||
+ aLocalName == nsGkAtoms::context) {
@@ -1030 +1028 @@ nsXULElement::SetNativeAnonymous(PRBool
- if (NodeInfo()->Equals(nsXULAtoms::popupgroup)) {
+ if (NodeInfo()->Equals(nsGkAtoms::popupgroup)) {
@@ -1094 +1092 @@ nsXULElement::RemoveChildAt(PRUint32 aIn
- if (oldKid->NodeInfo()->Equals(nsXULAtoms::listitem, kNameSpaceID_XUL)) {
+ if (oldKid->NodeInfo()->Equals(nsGkAtoms::listitem, kNameSpaceID_XUL)) {
@@ -1188 +1186 @@ nsXULElement::UnregisterAccessKey(const
- if (mNodeInfo->Equals(nsXULAtoms::label)) {
+ if (mNodeInfo->Equals(nsGkAtoms::label)) {
@@ -1206 +1204 @@ nsXULElement::BeforeSetAttr(PRInt32 aNam
- if (aNamespaceID == kNameSpaceID_None && aName == nsXULAtoms::accesskey &&
+ if (aNamespaceID == kNameSpaceID_None && aName == nsGkAtoms::accesskey &&
@@ -1242,2 +1240,2 @@ nsXULElement::AfterSetAttr(PRInt32 aName
- if (aName == nsXULAtoms::hidechrome &&
- mNodeInfo->Equals(nsXULAtoms::window)) {
+ if (aName == nsGkAtoms::hidechrome &&
+ mNodeInfo->Equals(nsGkAtoms::window)) {
@@ -1267 +1265 @@ nsXULElement::ParseAttribute(PRInt32 aNa
- if (aAttribute == nsXULAtoms::style) {
+ if (aAttribute == nsGkAtoms::style) {
@@ -1273 +1271 @@ nsXULElement::ParseAttribute(PRInt32 aNa
- if (aAttribute == nsXULAtoms::_class) {
+ if (aAttribute == nsGkAtoms::_class) {
@@ -1464,2 +1462,2 @@ nsXULElement::UnsetAttr(PRInt32 aNameSpa
- if (aName == nsXULAtoms::hidechrome &&
- mNodeInfo->Equals(nsXULAtoms::window)) {
+ if (aName == nsGkAtoms::hidechrome &&
+ mNodeInfo->Equals(nsGkAtoms::window)) {
@@ -1471 +1469 @@ nsXULElement::UnsetAttr(PRInt32 aNameSpa
- if (aName == nsXULAtoms::accesskey || aName == nsXULAtoms::control) {
+ if (aName == nsGkAtoms::accesskey || aName == nsGkAtoms::control) {
@@ -1477,2 +1475,2 @@ nsXULElement::UnsetAttr(PRInt32 aNameSpa
- if (doc && (aName == nsXULAtoms::observes ||
- aName == nsXULAtoms::command)) {
+ if (doc && (aName == nsGkAtoms::observes ||
+ aName == nsGkAtoms::command)) {
@@ -1739 +1737 @@ nsXULElement::PreHandleEvent(nsEventChai
- tag != nsXULAtoms::command) {
+ tag != nsGkAtoms::command) {
@@ -1743 +1741 @@ nsXULElement::PreHandleEvent(nsEventChai
- GetAttr(kNameSpaceID_None, nsXULAtoms::command, command);
+ GetAttr(kNameSpaceID_None, nsGkAtoms::command, command);
@@ -1824 +1822 @@ nsXULElement::GetResource(nsIRDFResource
- GetAttr(kNameSpaceID_None, nsXULAtoms::ref, id);
+ GetAttr(kNameSpaceID_None, nsGkAtoms::ref, id);
@@ -1826 +1824 @@ nsXULElement::GetResource(nsIRDFResource
- GetAttr(kNameSpaceID_None, nsXULAtoms::id, id);
+ GetAttr(kNameSpaceID_None, nsGkAtoms::id, id);
@@ -1899 +1897 @@ nsXULElement::EnsureContentsGenerated(vo
- if (HasAttr(kNameSpaceID_None, nsXULAtoms::xulcontentsgenerated)) {
+ if (HasAttr(kNameSpaceID_None, nsGkAtoms::xulcontentsgenerated)) {
@@ -1934 +1932 @@ nsXULElement::GetID() const
- const nsAttrValue* attrVal = FindLocalOrProtoAttr(kNameSpaceID_None, nsXULAtoms::id);
+ const nsAttrValue* attrVal = FindLocalOrProtoAttr(kNameSpaceID_None, nsGkAtoms::id);
@@ -1951 +1949 @@ nsXULElement::GetClasses() const
- return FindLocalOrProtoAttr(kNameSpaceID_None, nsXULAtoms::_class);
+ return FindLocalOrProtoAttr(kNameSpaceID_None, nsGkAtoms::_class);
@@ -1964 +1962 @@ nsXULElement::GetInlineStyleRule()
- const nsAttrValue* attrVal = FindLocalOrProtoAttr(kNameSpaceID_None, nsXULAtoms::style);
+ const nsAttrValue* attrVal = FindLocalOrProtoAttr(kNameSpaceID_None, nsGkAtoms::style);
@@ -1991 +1989 @@ nsXULElement::SetInlineStyleRule(nsICSSS
- modification = GetAttr(kNameSpaceID_None, nsHTMLAtoms::style,
+ modification = GetAttr(kNameSpaceID_None, nsGkAtoms::style,
@@ -1995 +1993 @@ nsXULElement::SetInlineStyleRule(nsICSSS
- modification = !!mAttrsAndChildren.GetAttr(nsHTMLAtoms::style);
+ modification = !!mAttrsAndChildren.GetAttr(nsGkAtoms::style);
@@ -2000 +1998 @@ nsXULElement::SetInlineStyleRule(nsICSSS
- return SetAttrAndNotify(kNameSpaceID_None, nsHTMLAtoms::style, nsnull, oldValueStr,
+ return SetAttrAndNotify(kNameSpaceID_None, nsGkAtoms::style, nsnull, oldValueStr,
@@ -2010 +2008 @@ nsXULElement::GetAttributeChangeHint(con
- if (aAttribute == nsXULAtoms::value &&
+ if (aAttribute == nsGkAtoms::value &&
@@ -2014 +2012 @@ nsXULElement::GetAttributeChangeHint(con
- if (tag == nsXULAtoms::label || tag == nsXULAtoms::description)
+ if (tag == nsGkAtoms::label || tag == nsGkAtoms::description)
@@ -2025 +2023 @@ nsXULElement::GetAttributeChangeHint(con
- if (nsXULAtoms::left == aAttribute || nsXULAtoms::top == aAttribute)
+ if (nsGkAtoms::left == aAttribute || nsGkAtoms::top == aAttribute)
@@ -2041 +2039 @@ nsXULElement::GetIDAttributeName() const
- return nsXULAtoms::id;
+ return nsGkAtoms::id;
@@ -2047 +2045 @@ nsXULElement::GetClassAttributeName() co
- return nsXULAtoms::_class;
+ return nsGkAtoms::_class;
@@ -2088 +2086 @@ nsXULElement::GetBoxObject(nsIBoxObject*
- GetAttr(kNameSpaceID_None, nsXULAtoms::_atom, aReturn); \
+ GetAttr(kNameSpaceID_None, nsGkAtoms::_atom, aReturn); \
@@ -2094 +2092 @@ nsXULElement::GetBoxObject(nsIBoxObject*
- return SetAttr(kNameSpaceID_None, nsXULAtoms::_atom, aValue, \
+ return SetAttr(kNameSpaceID_None, nsGkAtoms::_atom, aValue, \
@@ -2102 +2100 @@ nsXULElement::GetBoxObject(nsIBoxObject*
- *aResult = BoolAttrIsTrue(nsXULAtoms::_atom); \
+ *aResult = BoolAttrIsTrue(nsGkAtoms::_atom); \
@@ -2110 +2108 @@ nsXULElement::GetBoxObject(nsIBoxObject*
- SetAttr(kNameSpaceID_None, nsXULAtoms::_atom, \
+ SetAttr(kNameSpaceID_None, nsGkAtoms::_atom, \
@@ -2113 +2111 @@ nsXULElement::GetBoxObject(nsIBoxObject*
- UnsetAttr(kNameSpaceID_None, nsXULAtoms::_atom, PR_TRUE); \
+ UnsetAttr(kNameSpaceID_None, nsGkAtoms::_atom, PR_TRUE); \
@@ -2177 +2175 @@ nsXULElement::GetParentTree(nsIDOMXULMul
- if (current->NodeInfo()->Equals(nsXULAtoms::listbox,
+ if (current->NodeInfo()->Equals(nsGkAtoms::listbox,
@@ -2239 +2237 @@ nsXULElement::Click()
- if (BoolAttrIsTrue(nsXULAtoms::disabled))
+ if (BoolAttrIsTrue(nsGkAtoms::disabled))
@@ -2309 +2307 @@ nsXULElement::SetFocus(nsPresContext* aP
- if (BoolAttrIsTrue(nsXULAtoms::disabled))
+ if (BoolAttrIsTrue(nsGkAtoms::disabled))
@@ -2359 +2357 @@ nsXULElement::AddPopupListener(nsIAtom*
- if (aName == nsXULAtoms::context || aName == nsXULAtoms::contextmenu) {
+ if (aName == nsGkAtoms::context || aName == nsGkAtoms::contextmenu) {
@@ -2361 +2359 @@ nsXULElement::AddPopupListener(nsIAtom*
- listenerAtom = nsXULAtoms::contextmenulistener;
+ listenerAtom = nsGkAtoms::contextmenulistener;
@@ -2364 +2362 @@ nsXULElement::AddPopupListener(nsIAtom*
- listenerAtom = nsXULAtoms::popuplistener;
+ listenerAtom = nsGkAtoms::popuplistener;
@@ -2534 +2532 @@ nsXULElement::BoolAttrIsTrue(nsIAtom* aN
- attr->GetAtomValue() == nsXULAtoms::_true;
+ attr->GetAtomValue() == nsGkAtoms::_true;
@@ -2782 +2780 @@ nsXULPrototypeElement::SetAttrAt(PRUint3
- if (mAttributes[aPos].mName.Equals(nsXULAtoms::id) &&
+ if (mAttributes[aPos].mName.Equals(nsGkAtoms::id) &&
@@ -2791 +2789 @@ nsXULPrototypeElement::SetAttrAt(PRUint3
- else if (mAttributes[aPos].mName.Equals(nsXULAtoms::_class)) {
+ else if (mAttributes[aPos].mName.Equals(nsGkAtoms::_class)) {
@@ -2797 +2795 @@ nsXULPrototypeElement::SetAttrAt(PRUint3
- else if (mAttributes[aPos].mName.Equals(nsXULAtoms::style)) {
+ else if (mAttributes[aPos].mName.Equals(nsGkAtoms::style)) {
Index: mozilla/content/xul/content/src/nsXULElement.h
===================================================================
RCS file: /cvsroot/mozilla/content/xul/content/src/nsXULElement.h,v
retrieving revision 1.219
diff -u -p -0 -r1.219 nsXULElement.h
--- mozilla/content/xul/content/src/nsXULElement.h 22 Sep 2006 06:19:14 -0000 1.219
+++ mozilla/content/xul/content/src/nsXULElement.h 3 Oct 2006 22:56:50 -0000
@@ -79 +78,0 @@
-#include "nsXULAtoms.h"
@@ -119 +118 @@ public:
- : mName(nsXULAtoms::id), // XXX this is a hack, but names have to have a value
+ : mName(nsGkAtoms::id), // XXX this is a hack, but names have to have a value
Index: mozilla/content/xul/content/src/nsXULPopupListener.cpp
===================================================================
RCS file: /cvsroot/mozilla/content/xul/content/src/nsXULPopupListener.cpp,v
retrieving revision 1.139
diff -u -p -0 -r1.139 nsXULPopupListener.cpp
--- mozilla/content/xul/content/src/nsXULPopupListener.cpp 21 Aug 2006 06:53:40 -0000 1.139
+++ mozilla/content/xul/content/src/nsXULPopupListener.cpp 3 Oct 2006 22:56:50 -0000
@@ -48 +47,0 @@
-#include "nsXULAtoms.h"
@@ -270 +269 @@ XULPopupListenerImpl::PreLaunchPopup(nsI
- if (tag == nsXULAtoms::menu || tag == nsXULAtoms::menuitem)
+ if (tag == nsGkAtoms::menu || tag == nsGkAtoms::menuitem)
@@ -533 +532 @@ XULPopupListenerImpl::LaunchPopup(PRInt3
- GetImmediateChild(content, nsXULAtoms::menupopup, getter_AddRefs(popup));
+ GetImmediateChild(content, nsGkAtoms::menupopup, getter_AddRefs(popup));
@@ -548 +547 @@ XULPopupListenerImpl::LaunchPopup(PRInt3
- if (childContent->NodeInfo()->Equals(nsXULAtoms::menupopup,
+ if (childContent->NodeInfo()->Equals(nsGkAtoms::menupopup,
Index: mozilla/content/xul/document/src/nsXULContentSink.cpp
===================================================================
RCS file: /cvsroot/mozilla/content/xul/document/src/nsXULContentSink.cpp,v
retrieving revision 1.169
diff -u -p -0 -r1.169 nsXULContentSink.cpp
--- mozilla/content/xul/document/src/nsXULContentSink.cpp 25 Aug 2006 16:34:57 -0000 1.169
+++ mozilla/content/xul/document/src/nsXULContentSink.cpp 3 Oct 2006 22:56:51 -0000
@@ -103,2 +102,0 @@
-#include "nsXULAtoms.h"
-#include "nsHTMLAtoms.h"
@@ -109 +106,0 @@
-#include "nsLayoutAtoms.h"
@@ -567 +564 @@ XULContentSinkImpl::Init(nsIDocument* aD
- rv = mPrototype->GetHeaderData(nsHTMLAtoms::headerDefaultStyle,
+ rv = mPrototype->GetHeaderData(nsGkAtoms::headerDefaultStyle,
@@ -572 +569 @@ XULContentSinkImpl::Init(nsIDocument* aD
- aDocument->SetHeaderData(nsHTMLAtoms::headerDefaultStyle,
+ aDocument->SetHeaderData(nsGkAtoms::headerDefaultStyle,
@@ -635,2 +632,2 @@ XULContentSinkImpl::FlushText(PRBool aCr
- stripWhitespace = !nodeInfo->Equals(nsXULAtoms::label) &&
- !nodeInfo->Equals(nsXULAtoms::description);
+ stripWhitespace = !nodeInfo->Equals(nsGkAtoms::label) &&
+ !nodeInfo->Equals(nsGkAtoms::description);
@@ -1135,2 +1132,2 @@ XULContentSinkImpl::OpenRoot(const PRUni
- if (aNodeInfo->Equals(nsHTMLAtoms::script, kNameSpaceID_XHTML) ||
- aNodeInfo->Equals(nsHTMLAtoms::script, kNameSpaceID_XUL)) {
+ if (aNodeInfo->Equals(nsGkAtoms::script, kNameSpaceID_XHTML) ||
+ aNodeInfo->Equals(nsGkAtoms::script, kNameSpaceID_XUL)) {
@@ -1223,2 +1220,2 @@ XULContentSinkImpl::OpenTag(const PRUnic
- if (aNodeInfo->Equals(nsHTMLAtoms::script, kNameSpaceID_XHTML) ||
- aNodeInfo->Equals(nsHTMLAtoms::script, kNameSpaceID_XUL)) {
+ if (aNodeInfo->Equals(nsGkAtoms::script, kNameSpaceID_XHTML) ||
+ aNodeInfo->Equals(nsGkAtoms::script, kNameSpaceID_XUL)) {
Index: mozilla/content/xul/document/src/nsXULDocument.cpp
===================================================================
RCS file: /cvsroot/mozilla/content/xul/document/src/nsXULDocument.cpp,v
retrieving revision 1.734
diff -u -p -0 -r1.734 nsXULDocument.cpp
--- mozilla/content/xul/document/src/nsXULDocument.cpp 14 Sep 2006 04:29:01 -0000 1.734
+++ mozilla/content/xul/document/src/nsXULDocument.cpp 3 Oct 2006 22:56:52 -0000
@@ -83,2 +82,0 @@
-#include "nsXULAtoms.h"
-#include "nsHTMLAtoms.h"
@@ -627,3 +625,3 @@ CanBroadcast(PRInt32 aNameSpaceID, nsIAt
- if ((aAttribute == nsXULAtoms::id) ||
- (aAttribute == nsXULAtoms::ref) ||
- (aAttribute == nsXULAtoms::persist)) {
+ if ((aAttribute == nsGkAtoms::id) ||
+ (aAttribute == nsGkAtoms::ref) ||
+ (aAttribute == nsGkAtoms::persist)) {
@@ -841 +839 @@ nsXULDocument::ExecuteOnBroadcastHandler
- if (!child->NodeInfo()->Equals(nsXULAtoms::observes, kNameSpaceID_XUL))
+ if (!child->NodeInfo()->Equals(nsGkAtoms::observes, kNameSpaceID_XUL))
@@ -846 +844 @@ nsXULDocument::ExecuteOnBroadcastHandler
- child->GetAttr(kNameSpaceID_None, nsXULAtoms::element, listeningToID);
+ child->GetAttr(kNameSpaceID_None, nsGkAtoms::element, listeningToID);
@@ -849 +847 @@ nsXULDocument::ExecuteOnBroadcastHandler
- aBroadcaster->GetAttr(kNameSpaceID_None, nsXULAtoms::id, broadcasterID);
+ aBroadcaster->GetAttr(kNameSpaceID_None, nsGkAtoms::id, broadcasterID);
@@ -857 +855 @@ nsXULDocument::ExecuteOnBroadcastHandler
- child->GetAttr(kNameSpaceID_None, nsXULAtoms::attribute,
+ child->GetAttr(kNameSpaceID_None, nsGkAtoms::attribute,
@@ -896 +894 @@ nsXULDocument::AttributeChanged(nsIDocum
- if ((aAttribute == nsXULAtoms::id) || (aAttribute == nsXULAtoms::ref)) {
+ if ((aAttribute == nsGkAtoms::id) || (aAttribute == nsGkAtoms::ref)) {
@@ -925 +923 @@ nsXULDocument::AttributeChanged(nsIDocum
- (bl->mAttribute == nsXULAtoms::_asterix)) {
+ (bl->mAttribute == nsGkAtoms::_asterix)) {
@@ -949 +947 @@ nsXULDocument::AttributeChanged(nsIDocum
- aElement->GetAttr(kNameSpaceID_None, nsXULAtoms::persist, persist);
+ aElement->GetAttr(kNameSpaceID_None, nsGkAtoms::persist, persist);
@@ -1650,2 +1648,2 @@ nsXULDocument::AddElementToDocumentPre(n
- if (aElement->AttrValueIs(kNameSpaceID_None, nsXULAtoms::commandupdater,
- nsXULAtoms::_true, eCaseMatters)) {
+ if (aElement->AttrValueIs(kNameSpaceID_None, nsGkAtoms::commandupdater,
+ nsGkAtoms::_true, eCaseMatters)) {
@@ -1680 +1678 @@ nsXULDocument::AddElementToDocumentPost(
- if (aElement->NodeInfo()->Equals(nsXULAtoms::keyset, kNameSpaceID_XUL)) {
+ if (aElement->NodeInfo()->Equals(nsGkAtoms::keyset, kNameSpaceID_XUL)) {
@@ -1770,2 +1768,2 @@ nsXULDocument::RemoveSubtreeFromDocument
- if (aElement->AttrValueIs(kNameSpaceID_None, nsXULAtoms::commandupdater,
- nsXULAtoms::_true, eCaseMatters)) {
+ if (aElement->AttrValueIs(kNameSpaceID_None, nsGkAtoms::commandupdater,
+ nsGkAtoms::_true, eCaseMatters)) {
@@ -1835,2 +1833,2 @@ nsIAtom** nsXULDocument::kIdentityAttrs[
- &nsXULAtoms::id,
- &nsXULAtoms::ref,
+ &nsGkAtoms::id,
+ &nsGkAtoms::ref,
@@ -2380 +2378 @@ nsXULDocument::ContextStack::IsInsideXUL
- if (element->NodeInfo()->Equals(nsXULAtoms::_template,
+ if (element->NodeInfo()->Equals(nsGkAtoms::_template,
@@ -2965 +2963 @@ nsXULDocument::ResumeWalk()
- mRootContent->GetAttr(kNameSpaceID_None, nsHTMLAtoms::title,
+ mRootContent->GetAttr(kNameSpaceID_None, nsGkAtoms::title,
@@ -3500 +3498 @@ nsXULDocument::CheckTemplateBuilderHooku
- nsXULAtoms::datasources);
+ nsGkAtoms::datasources);
@@ -3523 +3521 @@ nsXULDocument::CreateTemplateBuilder(nsI
- if ((nameSpaceID == kNameSpaceID_XUL) && (baseTag == nsXULAtoms::tree)) {
+ if ((nameSpaceID == kNameSpaceID_XUL) && (baseTag == nsGkAtoms::tree)) {
@@ -3530 +3528 @@ nsXULDocument::CreateTemplateBuilder(nsI
- aElement->GetAttr(kNameSpaceID_None, nsXULAtoms::flags, flags);
+ aElement->GetAttr(kNameSpaceID_None, nsGkAtoms::flags, flags);
@@ -3550 +3548 @@ nsXULDocument::CreateTemplateBuilder(nsI
- nsXULAtoms::treechildren,
+ nsGkAtoms::treechildren,
@@ -3560 +3558 @@ nsXULDocument::CreateTemplateBuilder(nsI
- nsresult rv = document->CreateElem(nsXULAtoms::treechildren,
+ nsresult rv = document->CreateElem(nsGkAtoms::treechildren,
@@ -3668 +3666 @@ nsXULDocument::OverlayForwardReference::
- mOverlay->GetAttr(kNameSpaceID_None, nsXULAtoms::id, id);
+ mOverlay->GetAttr(kNameSpaceID_None, nsGkAtoms::id, id);
@@ -3765 +3763 @@ nsXULDocument::OverlayForwardReference::
- if (name->Equals(nsXULAtoms::id))
+ if (name->Equals(nsGkAtoms::id))
@@ -3777 +3775 @@ nsXULDocument::OverlayForwardReference::
- if (attr == nsXULAtoms::removeelement &&
+ if (attr == nsGkAtoms::removeelement &&
@@ -3808 +3806 @@ nsXULDocument::OverlayForwardReference::
- currContent->GetAttr(kNameSpaceID_None, nsXULAtoms::id, id);
+ currContent->GetAttr(kNameSpaceID_None, nsGkAtoms::id, id);
@@ -3838 +3836 @@ nsXULDocument::OverlayForwardReference::
- if (aTargetNode->AttrValueIs(kNameSpaceID_None, nsXULAtoms::id,
+ if (aTargetNode->AttrValueIs(kNameSpaceID_None, nsGkAtoms::id,
@@ -3868 +3866 @@ nsXULDocument::OverlayForwardReference::
- mOverlay->GetAttr(kNameSpaceID_None, nsXULAtoms::id, id);
+ mOverlay->GetAttr(kNameSpaceID_None, nsGkAtoms::id, id);
@@ -3910,3 +3908,3 @@ nsXULDocument::BroadcasterHookup::~Broad
- if (tag == nsXULAtoms::observes) {
- mObservesElement->GetAttr(kNameSpaceID_None, nsXULAtoms::element, broadcasterID);
- mObservesElement->GetAttr(kNameSpaceID_None, nsXULAtoms::attribute, attribute);
+ if (tag == nsGkAtoms::observes) {
+ mObservesElement->GetAttr(kNameSpaceID_None, nsGkAtoms::element, broadcasterID);
+ mObservesElement->GetAttr(kNameSpaceID_None, nsGkAtoms::attribute, attribute);
@@ -3915 +3913 @@ nsXULDocument::BroadcasterHookup::~Broad
- mObservesElement->GetAttr(kNameSpaceID_None, nsXULAtoms::observes, broadcasterID);
+ mObservesElement->GetAttr(kNameSpaceID_None, nsGkAtoms::observes, broadcasterID);
@@ -3977 +3975 @@ nsXULDocument::FindBroadcaster(nsIConten
- if (ni->Equals(nsXULAtoms::observes, kNameSpaceID_XUL)) {
+ if (ni->Equals(nsGkAtoms::observes, kNameSpaceID_XUL)) {
@@ -3987 +3985 @@ nsXULDocument::FindBroadcaster(nsIConten
- if (parent->NodeInfo()->Equals(nsXULAtoms::overlay,
+ if (parent->NodeInfo()->Equals(nsGkAtoms::overlay,
@@ -3995 +3993 @@ nsXULDocument::FindBroadcaster(nsIConten
- aElement->GetAttr(kNameSpaceID_None, nsXULAtoms::element, aBroadcasterID);
+ aElement->GetAttr(kNameSpaceID_None, nsGkAtoms::element, aBroadcasterID);
@@ -3999 +3997 @@ nsXULDocument::FindBroadcaster(nsIConten
- aElement->GetAttr(kNameSpaceID_None, nsXULAtoms::attribute, aAttribute);
+ aElement->GetAttr(kNameSpaceID_None, nsGkAtoms::attribute, aAttribute);
@@ -4006 +4004 @@ nsXULDocument::FindBroadcaster(nsIConten
- aElement->GetAttr(kNameSpaceID_None, nsXULAtoms::observes, aBroadcasterID);
+ aElement->GetAttr(kNameSpaceID_None, nsGkAtoms::observes, aBroadcasterID);
@@ -4011 +4009 @@ nsXULDocument::FindBroadcaster(nsIConten
- aElement->GetAttr(kNameSpaceID_None, nsXULAtoms::command, aBroadcasterID);
+ aElement->GetAttr(kNameSpaceID_None, nsGkAtoms::command, aBroadcasterID);
@@ -4017,2 +4015,2 @@ nsXULDocument::FindBroadcaster(nsIConten
- if (ni->Equals(nsXULAtoms::menuitem, kNameSpaceID_XUL) ||
- ni->Equals(nsXULAtoms::key, kNameSpaceID_XUL)) {
+ if (ni->Equals(nsGkAtoms::menuitem, kNameSpaceID_XUL) ||
+ ni->Equals(nsGkAtoms::key, kNameSpaceID_XUL)) {
@@ -4127 +4125 @@ nsXULDocument::InsertElement(nsIContent*
- aChild->GetAttr(kNameSpaceID_None, nsXULAtoms::insertafter, posStr);
+ aChild->GetAttr(kNameSpaceID_None, nsGkAtoms::insertafter, posStr);
@@ -4131 +4129 @@ nsXULDocument::InsertElement(nsIContent*
- aChild->GetAttr(kNameSpaceID_None, nsXULAtoms::insertbefore, posStr);
+ aChild->GetAttr(kNameSpaceID_None, nsGkAtoms::insertbefore, posStr);
@@ -4177 +4175 @@ nsXULDocument::InsertElement(nsIContent*
- aChild->GetAttr(kNameSpaceID_None, nsXULAtoms::position, posStr);
+ aChild->GetAttr(kNameSpaceID_None, nsGkAtoms::position, posStr);
Index: mozilla/content/xul/templates/src/nsXULContentBuilder.cpp
===================================================================
RCS file: /cvsroot/mozilla/content/xul/templates/src/nsXULContentBuilder.cpp,v
retrieving revision 1.91
diff -u -p -0 -r1.91 nsXULContentBuilder.cpp
--- mozilla/content/xul/templates/src/nsXULContentBuilder.cpp 19 Jul 2006 04:30:35 -0000 1.91
+++ mozilla/content/xul/templates/src/nsXULContentBuilder.cpp 3 Oct 2006 22:56:53 -0000
@@ -59,2 +58,0 @@
-#include "nsXULAtoms.h"
-#include "nsLayoutAtoms.h"
@@ -624 +622 @@ nsXULContentBuilder::BuildContentFromTem
- if (tmplKid->HasAttr(kNameSpaceID_None, nsXULAtoms::uri) && aMatch->IsActive()) {
+ if (tmplKid->HasAttr(kNameSpaceID_None, nsGkAtoms::uri) && aMatch->IsActive()) {
@@ -715 +713 @@ nsXULContentBuilder::BuildContentFromTem
- rv = realKid->SetAttr(kNameSpaceID_None, nsXULAtoms::id, id, PR_FALSE);
+ rv = realKid->SetAttr(kNameSpaceID_None, nsGkAtoms::id, id, PR_FALSE);
@@ -733 +731 @@ nsXULContentBuilder::BuildContentFromTem
- else if (tag == nsXULAtoms::textnode &&
+ else if (tag == nsGkAtoms::textnode &&
@@ -742 +740 @@ nsXULContentBuilder::BuildContentFromTem
- tmplKid->GetAttr(kNameSpaceID_None, nsXULAtoms::value, attrValue);
+ tmplKid->GetAttr(kNameSpaceID_None, nsGkAtoms::value, attrValue);
@@ -894 +892 @@ nsXULContentBuilder::CopyAttributesToEle
- if (attribName != nsXULAtoms::id && attribName != nsXULAtoms::uri) {
+ if (attribName != nsGkAtoms::id && attribName != nsGkAtoms::uri) {
@@ -941 +939 @@ nsXULContentBuilder::AddPersistentAttrib
- aTemplateNode->GetAttr(kNameSpaceID_None, nsXULAtoms::persist, persist);
+ aTemplateNode->GetAttr(kNameSpaceID_None, nsGkAtoms::persist, persist);
@@ -1044 +1042 @@ nsXULContentBuilder::SynchronizeUsingTem
- if (tmplKid->NodeInfo()->Equals(nsXULAtoms::textnode,
+ if (tmplKid->NodeInfo()->Equals(nsGkAtoms::textnode,
@@ -1048 +1046 @@ nsXULContentBuilder::SynchronizeUsingTem
- tmplKid->GetAttr(kNameSpaceID_None, nsXULAtoms::value, attrValue);
+ tmplKid->GetAttr(kNameSpaceID_None, nsGkAtoms::value, attrValue);
@@ -1126 +1124 @@ nsXULContentBuilder::CreateTemplateAndCo
- mRoot->GetAttr(kNameSpaceID_None, nsXULAtoms::ref, ref);
+ mRoot->GetAttr(kNameSpaceID_None, nsGkAtoms::ref, ref);
@@ -1486,4 +1484,4 @@ nsXULContentBuilder::IsOpen(nsIContent*
- (tag != nsXULAtoms::menu) &&
- (tag != nsXULAtoms::menubutton) &&
- (tag != nsXULAtoms::toolbarbutton) &&
- (tag != nsXULAtoms::button))
+ (tag != nsGkAtoms::menu) &&
+ (tag != nsGkAtoms::menubutton) &&
+ (tag != nsGkAtoms::toolbarbutton) &&
+ (tag != nsGkAtoms::button))
@@ -1492,2 +1490,2 @@ nsXULContentBuilder::IsOpen(nsIContent*
- return aElement->AttrValueIs(kNameSpaceID_None, nsXULAtoms::open,
- nsXULAtoms::_true, eCaseMatters);
+ return aElement->AttrValueIs(kNameSpaceID_None, nsGkAtoms::open,
+ nsGkAtoms::_true, eCaseMatters);
@@ -1522 +1520 @@ nsXULContentBuilder::RemoveGeneratedCont
- if (element->NodeInfo()->Equals(nsXULAtoms::_template,
+ if (element->NodeInfo()->Equals(nsGkAtoms::_template,
@@ -1567,6 +1565,6 @@ nsXULContentBuilder::IsLazyWidgetItem(ns
- return (tag == nsXULAtoms::menu ||
- tag == nsXULAtoms::menulist ||
- tag == nsXULAtoms::menubutton ||
- tag == nsXULAtoms::toolbarbutton ||
- tag == nsXULAtoms::button ||
- tag == nsXULAtoms::treeitem);
+ return (tag == nsGkAtoms::menu ||
+ tag == nsGkAtoms::menulist ||
+ tag == nsGkAtoms::menubutton ||
+ tag == nsGkAtoms::toolbarbutton ||
+ tag == nsGkAtoms::button ||
+ tag == nsGkAtoms::treeitem);
@@ -1639 +1637 @@ nsXULContentBuilder::SetContainerAttrs(n
- aElement->SetAttr(kNameSpaceID_None, nsXULAtoms::container,
+ aElement->SetAttr(kNameSpaceID_None, nsGkAtoms::container,
@@ -1649 +1647 @@ nsXULContentBuilder::SetContainerAttrs(n
- aElement->SetAttr(kNameSpaceID_None, nsXULAtoms::empty,
+ aElement->SetAttr(kNameSpaceID_None, nsGkAtoms::empty,
@@ -1772 +1770 @@ nsXULContentBuilder::AttributeChanged(ns
- (aAttribute == nsXULAtoms::open)) {
+ (aAttribute == nsGkAtoms::open)) {
@@ -1774,2 +1772,2 @@ nsXULContentBuilder::AttributeChanged(ns
- if (aContent->AttrValueIs(kNameSpaceID_None, nsXULAtoms::open,
- nsXULAtoms::_true, eCaseMatters))
+ if (aContent->AttrValueIs(kNameSpaceID_None, nsGkAtoms::open,
+ nsGkAtoms::_true, eCaseMatters))
@@ -1782,4 +1780,4 @@ nsXULContentBuilder::AttributeChanged(ns
- ((aAttribute == nsXULAtoms::sort) ||
- (aAttribute == nsXULAtoms::sortDirection) ||
- (aAttribute == nsXULAtoms::sortResource) ||
- (aAttribute == nsXULAtoms::sortResource2)))
+ ((aAttribute == nsGkAtoms::sort) ||
+ (aAttribute == nsGkAtoms::sortDirection) ||
+ (aAttribute == nsGkAtoms::sortResource) ||
+ (aAttribute == nsGkAtoms::sortResource2)))
@@ -2196 +2194 @@ nsXULContentBuilder::InsertSortedNode(ns
- aContainer->GetAttr(kNameSpaceID_None, nsXULAtoms::staticHint, staticValue);
+ aContainer->GetAttr(kNameSpaceID_None, nsGkAtoms::staticHint, staticValue);
@@ -2209 +2207 @@ nsXULContentBuilder::InsertSortedNode(ns
- nsXULAtoms::_template))
+ nsGkAtoms::_template))
@@ -2224 +2222 @@ nsXULContentBuilder::InsertSortedNode(ns
- aContainer->SetAttr(kNameSpaceID_None, nsXULAtoms::staticHint, valueStr, PR_FALSE);
+ aContainer->SetAttr(kNameSpaceID_None, nsGkAtoms::staticHint, valueStr, PR_FALSE);
Index: mozilla/content/xul/templates/src/nsXULContentUtils.cpp
===================================================================
RCS file: /cvsroot/mozilla/content/xul/templates/src/nsXULContentUtils.cpp,v
retrieving revision 1.78
diff -u -p -0 -r1.78 nsXULContentUtils.cpp
--- mozilla/content/xul/templates/src/nsXULContentUtils.cpp 19 Jul 2006 04:30:35 -0000 1.78
+++ mozilla/content/xul/templates/src/nsXULContentUtils.cpp 3 Oct 2006 22:56:53 -0000
@@ -80 +79,0 @@
-#include "nsXULAtoms.h"
@@ -234 +233 @@ nsXULContentUtils::GetElementResource(ns
- aElement->GetAttr(kNameSpaceID_None, nsXULAtoms::id, id);
+ aElement->GetAttr(kNameSpaceID_None, nsGkAtoms::id, id);
@@ -473 +472 @@ nsXULContentUtils::SetCommandUpdater(nsI
- aElement->GetAttr(kNameSpaceID_None, nsXULAtoms::events, events);
+ aElement->GetAttr(kNameSpaceID_None, nsGkAtoms::events, events);
@@ -478 +477 @@ nsXULContentUtils::SetCommandUpdater(nsI
- aElement->GetAttr(kNameSpaceID_None, nsXULAtoms::targets, targets);
+ aElement->GetAttr(kNameSpaceID_None, nsGkAtoms::targets, targets);
Index: mozilla/content/xul/templates/src/nsXULTemplateBuilder.cpp
===================================================================
RCS file: /cvsroot/mozilla/content/xul/templates/src/nsXULTemplateBuilder.cpp,v
retrieving revision 1.333
diff -u -p -0 -r1.333 nsXULTemplateBuilder.cpp
--- mozilla/content/xul/templates/src/nsXULTemplateBuilder.cpp 11 Sep 2006 13:30:31 -0000 1.333
+++ mozilla/content/xul/templates/src/nsXULTemplateBuilder.cpp 3 Oct 2006 22:56:54 -0000
@@ -90 +89,0 @@
-#include "nsXULAtoms.h"
@@ -368 +367 @@ nsXULTemplateBuilder::Init(nsIContent* a
- mRoot->GetAttr(kNameSpaceID_None, nsXULAtoms::querytype, type);
+ mRoot->GetAttr(kNameSpaceID_None, nsGkAtoms::querytype, type);
@@ -889 +888 @@ nsXULTemplateBuilder::AttributeChanged(n
- if (aAttribute == nsXULAtoms::ref)
+ if (aAttribute == nsGkAtoms::ref)
@@ -894 +893 @@ nsXULTemplateBuilder::AttributeChanged(n
- else if (aAttribute == nsXULAtoms::datasources) {
+ else if (aAttribute == nsGkAtoms::datasources) {
@@ -983,2 +982,2 @@ nsXULTemplateBuilder::LoadDataSources(ns
- if (mRoot->AttrValueIs(kNameSpaceID_None, nsXULAtoms::coalesceduplicatearcs,
- nsXULAtoms::_false, eCaseMatters))
+ if (mRoot->AttrValueIs(kNameSpaceID_None, nsGkAtoms::coalesceduplicatearcs,
+ nsGkAtoms::_false, eCaseMatters))
@@ -987,2 +986,2 @@ nsXULTemplateBuilder::LoadDataSources(ns
- if (mRoot->AttrValueIs(kNameSpaceID_None, nsXULAtoms::allownegativeassertions,
- nsXULAtoms::_false, eCaseMatters))
+ if (mRoot->AttrValueIs(kNameSpaceID_None, nsGkAtoms::allownegativeassertions,
+ nsGkAtoms::_false, eCaseMatters))
@@ -1025 +1024 @@ nsXULTemplateBuilder::LoadDataSources(ns
- mRoot->GetAttr(kNameSpaceID_None, nsXULAtoms::datasources, datasources);
+ mRoot->GetAttr(kNameSpaceID_None, nsGkAtoms::datasources, datasources);
@@ -1105 +1104 @@ nsXULTemplateBuilder::LoadDataSources(ns
- mRoot->GetAttr(kNameSpaceID_None, nsXULAtoms::infer, infer);
+ mRoot->GetAttr(kNameSpaceID_None, nsGkAtoms::infer, infer);
@@ -1407 +1406 @@ nsXULTemplateBuilder::IsTemplateElement(
- return aContent->NodeInfo()->Equals(nsXULAtoms::_template,
+ return aContent->NodeInfo()->Equals(nsGkAtoms::_template,
@@ -1427 +1426 @@ nsXULTemplateBuilder::GetTemplateRoot(ns
- mRoot->GetAttr(kNameSpaceID_None, nsXULAtoms::_template, templateID);
+ mRoot->GetAttr(kNameSpaceID_None, nsGkAtoms::_template, templateID);
@@ -1505 +1504 @@ nsXULTemplateBuilder::CompileQueries()
- mRoot->GetAttr(kNameSpaceID_None, nsXULAtoms::flags, flags);
+ mRoot->GetAttr(kNameSpaceID_None, nsGkAtoms::flags, flags);
@@ -1532 +1531 @@ nsXULTemplateBuilder::CompileQueries()
- tmpl->GetAttr(kNameSpaceID_None, nsXULAtoms::container, containervar);
+ tmpl->GetAttr(kNameSpaceID_None, nsGkAtoms::container, containervar);
@@ -1540 +1539 @@ nsXULTemplateBuilder::CompileQueries()
- tmpl->GetAttr(kNameSpaceID_None, nsXULAtoms::member, membervar);
+ tmpl->GetAttr(kNameSpaceID_None, nsGkAtoms::member, membervar);
@@ -1601 +1600 @@ nsXULTemplateBuilder::CompileTemplate(ns
- if (!aIsQuerySet && ni->Equals(nsXULAtoms::queryset, kNameSpaceID_XUL)) {
+ if (!aIsQuerySet && ni->Equals(nsGkAtoms::queryset, kNameSpaceID_XUL)) {
@@ -1633 +1632 @@ nsXULTemplateBuilder::CompileTemplate(ns
- if (ni->Equals(nsXULAtoms::rule, kNameSpaceID_XUL)) {
+ if (ni->Equals(nsGkAtoms::rule, kNameSpaceID_XUL)) {
@@ -1637 +1636 @@ nsXULTemplateBuilder::CompileTemplate(ns
- nsXULAtoms::action,
+ nsGkAtoms::action,
@@ -1673 +1672 @@ nsXULTemplateBuilder::CompileTemplate(ns
- nsXULAtoms::conditions,
+ nsGkAtoms::conditions,
@@ -1742 +1741 @@ nsXULTemplateBuilder::CompileTemplate(ns
- else if (ni->Equals(nsXULAtoms::query, kNameSpaceID_XUL)) {
+ else if (ni->Equals(nsGkAtoms::query, kNameSpaceID_XUL)) {
@@ -1749 +1748 @@ nsXULTemplateBuilder::CompileTemplate(ns
- else if (ni->Equals(nsXULAtoms::action, kNameSpaceID_XUL)) {
+ else if (ni->Equals(nsGkAtoms::action, kNameSpaceID_XUL)) {
@@ -1815 +1814 @@ nsXULTemplateBuilder::CompileExtendedQue
- nsXULAtoms::conditions,
+ nsGkAtoms::conditions,
@@ -1840 +1839 @@ nsXULTemplateBuilder::CompileExtendedQue
- nsXULAtoms::bindings,
+ nsGkAtoms::bindings,
@@ -1877 +1876 @@ nsXULTemplateBuilder::DetermineMemberVar
- next->GetAttr(kNameSpaceID_None, nsXULAtoms::uri, uri);
+ next->GetAttr(kNameSpaceID_None, nsGkAtoms::uri, uri);
@@ -1908 +1907 @@ nsXULTemplateBuilder::DetermineRDFQueryR
- nsXULAtoms::content,
+ nsGkAtoms::content,
@@ -1915 +1914 @@ nsXULTemplateBuilder::DetermineRDFQueryR
- nsXULAtoms::treeitem,
+ nsGkAtoms::treeitem,
@@ -1921 +1920 @@ nsXULTemplateBuilder::DetermineRDFQueryR
- content->GetAttr(kNameSpaceID_None, nsXULAtoms::uri, uri);
+ content->GetAttr(kNameSpaceID_None, nsGkAtoms::uri, uri);
@@ -1927 +1926 @@ nsXULTemplateBuilder::DetermineRDFQueryR
- content->GetAttr(kNameSpaceID_None, nsXULAtoms::tag, tag);
+ content->GetAttr(kNameSpaceID_None, nsGkAtoms::tag, tag);
@@ -1976 +1975 @@ nsXULTemplateBuilder::CompileSimpleQuery
- aRuleElement->GetAttr(kNameSpaceID_None, nsXULAtoms::parent, tag);
+ aRuleElement->GetAttr(kNameSpaceID_None, nsGkAtoms::parent, tag);
@@ -1993 +1992 @@ nsXULTemplateBuilder::CompileConditions(
- aCondition->GetAttr(kNameSpaceID_None, nsXULAtoms::parent, tag);
+ aCondition->GetAttr(kNameSpaceID_None, nsGkAtoms::parent, tag);
@@ -2007 +2006 @@ nsXULTemplateBuilder::CompileConditions(
- if (node->NodeInfo()->Equals(nsXULAtoms::where, kNameSpaceID_XUL)) {
+ if (node->NodeInfo()->Equals(nsGkAtoms::where, kNameSpaceID_XUL)) {
@@ -2038 +2037 @@ nsXULTemplateBuilder::CompileWhereCondit
- aCondition->GetAttr(kNameSpaceID_None, nsXULAtoms::subject, subject);
+ aCondition->GetAttr(kNameSpaceID_None, nsGkAtoms::subject, subject);
@@ -2047 +2046 @@ nsXULTemplateBuilder::CompileWhereCondit
- aCondition->GetAttr(kNameSpaceID_None, nsXULAtoms::rel, relstring);
+ aCondition->GetAttr(kNameSpaceID_None, nsGkAtoms::rel, relstring);
@@ -2053 +2052 @@ nsXULTemplateBuilder::CompileWhereCondit
- aCondition->GetAttr(kNameSpaceID_None, nsXULAtoms::value, value);
+ aCondition->GetAttr(kNameSpaceID_None, nsGkAtoms::value, value);
@@ -2059,2 +2058,2 @@ nsXULTemplateBuilder::CompileWhereCondit
- aCondition->AttrValueIs(kNameSpaceID_None, nsXULAtoms::multiple,
- nsXULAtoms::_true, eCaseMatters);
+ aCondition->AttrValueIs(kNameSpaceID_None, nsGkAtoms::multiple,
+ nsGkAtoms::_true, eCaseMatters);
@@ -2069,2 +2068,2 @@ nsXULTemplateBuilder::CompileWhereCondit
- aCondition->AttrValueIs(kNameSpaceID_None, nsXULAtoms::ignorecase,
- nsXULAtoms::_true, eCaseMatters);
+ aCondition->AttrValueIs(kNameSpaceID_None, nsGkAtoms::ignorecase,
+ nsGkAtoms::_true, eCaseMatters);
@@ -2074,2 +2073,2 @@ nsXULTemplateBuilder::CompileWhereCondit
- aCondition->AttrValueIs(kNameSpaceID_None, nsXULAtoms::negate,
- nsXULAtoms::_true, eCaseMatters);
+ aCondition->AttrValueIs(kNameSpaceID_None, nsGkAtoms::negate,
+ nsGkAtoms::_true, eCaseMatters);
@@ -2123 +2122 @@ nsXULTemplateBuilder::CompileBindings(ns
- if (binding->NodeInfo()->Equals(nsXULAtoms::binding,
+ if (binding->NodeInfo()->Equals(nsGkAtoms::binding,
@@ -2167 +2166 @@ nsXULTemplateBuilder::CompileBinding(nsT
- aBinding->GetAttr(kNameSpaceID_None, nsXULAtoms::subject, subject);
+ aBinding->GetAttr(kNameSpaceID_None, nsGkAtoms::subject, subject);
@@ -2189 +2188 @@ nsXULTemplateBuilder::CompileBinding(nsT
- aBinding->GetAttr(kNameSpaceID_None, nsXULAtoms::predicate, predicate);
+ aBinding->GetAttr(kNameSpaceID_None, nsGkAtoms::predicate, predicate);
@@ -2199 +2198 @@ nsXULTemplateBuilder::CompileBinding(nsT
- aBinding->GetAttr(kNameSpaceID_None, nsXULAtoms::object, object);
+ aBinding->GetAttr(kNameSpaceID_None, nsGkAtoms::object, object);
@@ -2247,2 +2246,2 @@ nsXULTemplateBuilder::AddSimpleRuleBindi
- if (!name->Equals(nsXULAtoms::id, kNameSpaceID_None) &&
- !name->Equals(nsXULAtoms::uri, kNameSpaceID_None)) {
+ if (!name->Equals(nsGkAtoms::id, kNameSpaceID_None) &&
+ !name->Equals(nsGkAtoms::uri, kNameSpaceID_None)) {
Index: mozilla/content/xul/templates/src/nsXULTemplateQueryProcessorRDF.cpp
===================================================================
RCS file: /cvsroot/mozilla/content/xul/templates/src/nsXULTemplateQueryProcessorRDF.cpp,v
retrieving revision 1.5
diff -u -p -0 -r1.5 nsXULTemplateQueryProcessorRDF.cpp
--- mozilla/content/xul/templates/src/nsXULTemplateQueryProcessorRDF.cpp 21 Sep 2006 14:05:22 -0000 1.5
+++ mozilla/content/xul/templates/src/nsXULTemplateQueryProcessorRDF.cpp 3 Oct 2006 22:56:55 -0000
@@ -53 +52,0 @@
-#include "nsXULAtoms.h"
@@ -261 +260 @@ nsXULTemplateQueryProcessorRDF::CompileQ
- if (content->NodeInfo()->Equals(nsXULAtoms::_template, kNameSpaceID_XUL)) {
+ if (content->NodeInfo()->Equals(nsGkAtoms::_template, kNameSpaceID_XUL)) {
@@ -272 +271 @@ nsXULTemplateQueryProcessorRDF::CompileQ
- else if (content->NodeInfo()->Equals(nsXULAtoms::rule, kNameSpaceID_XUL)) {
+ else if (content->NodeInfo()->Equals(nsGkAtoms::rule, kNameSpaceID_XUL)) {
@@ -1036 +1035 @@ nsXULTemplateQueryProcessorRDF::ComputeC
- content->GetAttr(kNameSpaceID_None, nsXULAtoms::containment, containment);
+ content->GetAttr(kNameSpaceID_None, nsGkAtoms::containment, containment);
@@ -1105 +1104 @@ nsXULTemplateQueryProcessorRDF::CompileE
- if (condition->Tag() == nsXULAtoms::content && !i) {
+ if (condition->Tag() == nsGkAtoms::content && !i) {
@@ -1109 +1108 @@ nsXULTemplateQueryProcessorRDF::CompileE
- condition->GetAttr(kNameSpaceID_None, nsXULAtoms::tag, tagstr);
+ condition->GetAttr(kNameSpaceID_None, nsGkAtoms::tag, tagstr);
@@ -1153 +1152 @@ nsXULTemplateQueryProcessorRDF::CompileQ
- if (aTag == nsXULAtoms::triple) {
+ if (aTag == nsGkAtoms::triple) {
@@ -1156 +1155 @@ nsXULTemplateQueryProcessorRDF::CompileQ
- else if (aTag == nsXULAtoms::member) {
+ else if (aTag == nsGkAtoms::member) {
@@ -1223 +1222 @@ nsXULTemplateQueryProcessorRDF::CompileT
- aCondition->GetAttr(kNameSpaceID_None, nsXULAtoms::subject, subject);
+ aCondition->GetAttr(kNameSpaceID_None, nsGkAtoms::subject, subject);
@@ -1234 +1233 @@ nsXULTemplateQueryProcessorRDF::CompileT
- aCondition->GetAttr(kNameSpaceID_None, nsXULAtoms::predicate, predicate);
+ aCondition->GetAttr(kNameSpaceID_None, nsGkAtoms::predicate, predicate);
@@ -1249 +1248 @@ nsXULTemplateQueryProcessorRDF::CompileT
- aCondition->GetAttr(kNameSpaceID_None, nsXULAtoms::object, object);
+ aCondition->GetAttr(kNameSpaceID_None, nsGkAtoms::object, object);
@@ -1264 +1263 @@ nsXULTemplateQueryProcessorRDF::CompileT
- aCondition->GetAttr(kNameSpaceID_None, nsXULAtoms::parsetype, parseType);
+ aCondition->GetAttr(kNameSpaceID_None, nsGkAtoms::parsetype, parseType);
@@ -1320 +1319 @@ nsXULTemplateQueryProcessorRDF::CompileM
- aCondition->GetAttr(kNameSpaceID_None, nsXULAtoms::container, container);
+ aCondition->GetAttr(kNameSpaceID_None, nsGkAtoms::container, container);
@@ -1333 +1332 @@ nsXULTemplateQueryProcessorRDF::CompileM
- aCondition->GetAttr(kNameSpaceID_None, nsXULAtoms::child, child);
+ aCondition->GetAttr(kNameSpaceID_None, nsGkAtoms::child, child);
@@ -1447,4 +1446,4 @@ nsXULTemplateQueryProcessorRDF::CompileS
- if (name->Equals(nsXULAtoms::property, kNameSpaceID_RDF) ||
- name->Equals(nsXULAtoms::instanceOf, kNameSpaceID_RDF) ||
- name->Equals(nsXULAtoms::id, kNameSpaceID_None) ||
- name->Equals(nsXULAtoms::parsetype, kNameSpaceID_None)) {
+ if (name->Equals(nsGkAtoms::property, kNameSpaceID_RDF) ||
+ name->Equals(nsGkAtoms::instanceOf, kNameSpaceID_RDF) ||
+ name->Equals(nsGkAtoms::id, kNameSpaceID_None) ||
+ name->Equals(nsGkAtoms::parsetype, kNameSpaceID_None)) {
@@ -1462,2 +1461,2 @@ nsXULTemplateQueryProcessorRDF::CompileS
- if (name->Equals(nsXULAtoms::iscontainer, kNameSpaceID_None) ||
- name->Equals(nsXULAtoms::isempty, kNameSpaceID_None)) {
+ if (name->Equals(nsGkAtoms::iscontainer, kNameSpaceID_None) ||
+ name->Equals(nsGkAtoms::isempty, kNameSpaceID_None)) {
@@ -1474 +1473 @@ nsXULTemplateQueryProcessorRDF::CompileS
- {&nsXULAtoms::_true, &nsXULAtoms::_false, nsnull};
+ {&nsGkAtoms::_true, &nsGkAtoms::_false, nsnull};
@@ -1476 +1475 @@ nsXULTemplateQueryProcessorRDF::CompileS
- nsXULAtoms::iscontainer,
+ nsGkAtoms::iscontainer,
@@ -1486 +1485 @@ nsXULTemplateQueryProcessorRDF::CompileS
- nsXULAtoms::isempty,
+ nsGkAtoms::isempty,
@@ -1511 +1510 @@ nsXULTemplateQueryProcessorRDF::CompileS
- else if (attrNameSpaceID != kNameSpaceID_None || attr != nsXULAtoms::parent) {
+ else if (attrNameSpaceID != kNameSpaceID_None || attr != nsGkAtoms::parent) {
@@ -1530 +1529 @@ nsXULTemplateQueryProcessorRDF::CompileS
- aQueryElement->GetAttr(kNameSpaceID_None, nsXULAtoms::parsetype, parseType);
+ aQueryElement->GetAttr(kNameSpaceID_None, nsGkAtoms::parsetype, parseType);
Index: mozilla/content/xul/templates/src/nsXULTreeBuilder.cpp
===================================================================
RCS file: /cvsroot/mozilla/content/xul/templates/src/nsXULTreeBuilder.cpp,v
retrieving revision 1.100
diff -u -p -0 -r1.100 nsXULTreeBuilder.cpp
--- mozilla/content/xul/templates/src/nsXULTreeBuilder.cpp 8 Sep 2006 14:03:45 -0000 1.100
+++ mozilla/content/xul/templates/src/nsXULTreeBuilder.cpp 3 Oct 2006 22:56:55 -0000
@@ -59,2 +58,0 @@
-#include "nsXULAtoms.h"
-#include "nsHTMLAtoms.h"
@@ -382,2 +380,2 @@ nsXULTreeBuilder::Sort(nsIDOMElement* aE
- if (header->AttrValueIs(kNameSpaceID_None, nsXULAtoms::sortLocked,
- nsXULAtoms::_true, eCaseMatters))
+ if (header->AttrValueIs(kNameSpaceID_None, nsGkAtoms::sortLocked,
+ nsGkAtoms::_true, eCaseMatters))
@@ -387 +385 @@ nsXULTreeBuilder::Sort(nsIDOMElement* aE
- header->GetAttr(kNameSpaceID_None, nsXULAtoms::sort, sort);
+ header->GetAttr(kNameSpaceID_None, nsGkAtoms::sort, sort);
@@ -397 +395 @@ nsXULTreeBuilder::Sort(nsIDOMElement* aE
- header->GetAttr(kNameSpaceID_None, nsXULAtoms::sortDirection, dir);
+ header->GetAttr(kNameSpaceID_None, nsGkAtoms::sortDirection, dir);
@@ -461 +459 @@ nsXULTreeBuilder::GetRowProperties(PRInt
- row->GetAttr(kNameSpaceID_None, nsXULAtoms::properties, raw);
+ row->GetAttr(kNameSpaceID_None, nsGkAtoms::properties, raw);
@@ -487 +485 @@ nsXULTreeBuilder::GetCellProperties(PRIn
- cell->GetAttr(kNameSpaceID_None, nsXULAtoms::properties, raw);
+ cell->GetAttr(kNameSpaceID_None, nsGkAtoms::properties, raw);
@@ -672 +670 @@ nsXULTreeBuilder::GetImageSrc(PRInt32 aR
- cell->GetAttr(kNameSpaceID_None, nsHTMLAtoms::src, raw);
+ cell->GetAttr(kNameSpaceID_None, nsGkAtoms::src, raw);
@@ -698 +696 @@ nsXULTreeBuilder::GetProgressMode(PRInt3
- cell->GetAttr(kNameSpaceID_None, nsXULAtoms::mode, raw);
+ cell->GetAttr(kNameSpaceID_None, nsGkAtoms::mode, raw);
@@ -725 +723 @@ nsXULTreeBuilder::GetCellValue(PRInt32 a
- cell->GetAttr(kNameSpaceID_None, nsXULAtoms::value, raw);
+ cell->GetAttr(kNameSpaceID_None, nsGkAtoms::value, raw);
@@ -748 +746 @@ nsXULTreeBuilder::GetCellText(PRInt32 aR
- cell->GetAttr(kNameSpaceID_None, nsXULAtoms::label, raw);
+ cell->GetAttr(kNameSpaceID_None, nsGkAtoms::label, raw);
@@ -776 +774 @@ nsXULTreeBuilder::SetTree(nsITreeBoxObje
- mRoot->GetAttr(kNameSpaceID_None, nsXULAtoms::statedatasource, datasourceStr);
+ mRoot->GetAttr(kNameSpaceID_None, nsGkAtoms::statedatasource, datasourceStr);
@@ -955 +953 @@ nsXULTreeBuilder::IsEditable(PRInt32 aRo
- cell->GetAttr(kNameSpaceID_None, nsXULAtoms::editable, raw);
+ cell->GetAttr(kNameSpaceID_None, nsGkAtoms::editable, raw);
@@ -981 +979 @@ nsXULTreeBuilder::IsSelectable(PRInt32 a
- cell->GetAttr(kNameSpaceID_None, nsXULAtoms::selectable, raw);
+ cell->GetAttr(kNameSpaceID_None, nsGkAtoms::selectable, raw);
@@ -1302 +1300 @@ nsXULTreeBuilder::EnsureSortVariables()
- nsXULAtoms::treecols,
+ nsGkAtoms::treecols,
@@ -1312 +1310 @@ nsXULTreeBuilder::EnsureSortVariables()
- if (child->NodeInfo()->Equals(nsXULAtoms::treecol,
+ if (child->NodeInfo()->Equals(nsGkAtoms::treecol,
@@ -1314,2 +1312,2 @@ nsXULTreeBuilder::EnsureSortVariables()
- if (child->AttrValueIs(kNameSpaceID_None, nsXULAtoms::sortActive,
- nsXULAtoms::_true, eCaseMatters)) {
+ if (child->AttrValueIs(kNameSpaceID_None, nsGkAtoms::sortActive,
+ nsGkAtoms::_true, eCaseMatters)) {
@@ -1317 +1315 @@ nsXULTreeBuilder::EnsureSortVariables()
- child->GetAttr(kNameSpaceID_None, nsXULAtoms::sort, sort);
+ child->GetAttr(kNameSpaceID_None, nsGkAtoms::sort, sort);
@@ -1322 +1320 @@ nsXULTreeBuilder::EnsureSortVariables()
- {&nsXULAtoms::ascending, &nsXULAtoms::descending, nsnull};
+ {&nsGkAtoms::ascending, &nsGkAtoms::descending, nsnull};
@@ -1324 +1322 @@ nsXULTreeBuilder::EnsureSortVariables()
- nsXULAtoms::sortDirection,
+ nsGkAtoms::sortDirection,
@@ -1374 +1372 @@ nsXULTreeBuilder::RebuildAll()
- mRoot->GetAttr(kNameSpaceID_None, nsXULAtoms::ref, ref);
+ mRoot->GetAttr(kNameSpaceID_None, nsGkAtoms::ref, ref);
@@ -1419 +1417 @@ nsXULTreeBuilder::GetTemplateActionRowFo
- nsXULAtoms::treechildren,
+ nsGkAtoms::treechildren,
@@ -1424 +1422 @@ nsXULTreeBuilder::GetTemplateActionRowFo
- nsXULAtoms::treeitem,
+ nsGkAtoms::treeitem,
@@ -1429 +1427 @@ nsXULTreeBuilder::GetTemplateActionRowFo
- nsXULAtoms::treerow,
+ nsGkAtoms::treerow,
@@ -1461 +1459 @@ nsXULTreeBuilder::GetTemplateActionCellF
- if (child->NodeInfo()->Equals(nsXULAtoms::treecell,
+ if (child->NodeInfo()->Equals(nsGkAtoms::treecell,
@@ -1464 +1462 @@ nsXULTreeBuilder::GetTemplateActionCellF
- child->AttrValueIs(kNameSpaceID_None, nsXULAtoms::ref,
+ child->AttrValueIs(kNameSpaceID_None, nsGkAtoms::ref,
Index: mozilla/layout/base/nsCSSFrameConstructor.cpp
===================================================================
RCS file: /cvsroot/mozilla/layout/base/nsCSSFrameConstructor.cpp,v
retrieving revision 1.1273
diff -u -p -0 -r1.1273 nsCSSFrameConstructor.cpp
--- mozilla/layout/base/nsCSSFrameConstructor.cpp 29 Sep 2006 17:40:21 -0000 1.1273
+++ mozilla/layout/base/nsCSSFrameConstructor.cpp 3 Oct 2006 22:57:01 -0000
@@ -55 +54,0 @@
-#include "nsHTMLAtoms.h"
@@ -76 +74,0 @@
-#include "nsLayoutAtoms.h"
@@ -116 +113,0 @@
-#include "nsXULAtoms.h"
@@ -150 +146,0 @@
-#include "nsMathMLAtoms.h"
@@ -172 +167,0 @@ NS_NewHTMLCanvasFrame (nsIPresShell* aPr
-#include "nsSVGAtoms.h"
@@ -470 +465 @@ GetSpecialSibling(nsFrameManager* aFrame
- void* value = aFrame->GetProperty(nsLayoutAtoms::IBSplitSpecialSibling);
+ void* value = aFrame->GetProperty(nsGkAtoms::IBSplitSpecialSibling);
@@ -518 +513 @@ SetFrameIsSpecial(nsIFrame* aFrame, nsIF
- aFrame->SetProperty(nsLayoutAtoms::IBSplitSpecialSibling, aSpecialSibling);
+ aFrame->SetProperty(nsGkAtoms::IBSplitSpecialSibling, aSpecialSibling);
@@ -653 +648 @@ MarkIBSpecialPrevSibling(nsPresContext*
- nsLayoutAtoms::IBSplitSpecialPrevSibling,
+ nsGkAtoms::IBSplitSpecialPrevSibling,
@@ -670 +665 @@ DoCleanupFrameReferences(nsFrameManager*
- if (aFrameIn->GetType() == nsLayoutAtoms::placeholderFrame) {
+ if (aFrameIn->GetType() == nsGkAtoms::placeholderFrame) {
@@ -994 +989 @@ nsPseudoFrames::Dump()
- if (nsLayoutAtoms::tableOuterFrame == mLowestType) {
+ if (nsGkAtoms::tableOuterFrame == mLowestType) {
@@ -1003 +998 @@ nsPseudoFrames::Dump()
- if (nsLayoutAtoms::tableFrame == mLowestType) {
+ if (nsGkAtoms::tableFrame == mLowestType) {
@@ -1012 +1007 @@ nsPseudoFrames::Dump()
- if (nsLayoutAtoms::tableColGroupFrame == mLowestType) {
+ if (nsGkAtoms::tableColGroupFrame == mLowestType) {
@@ -1021 +1016 @@ nsPseudoFrames::Dump()
- if (nsLayoutAtoms::tableRowGroupFrame == mLowestType) {
+ if (nsGkAtoms::tableRowGroupFrame == mLowestType) {
@@ -1030 +1025 @@ nsPseudoFrames::Dump()
- if (nsLayoutAtoms::tableRowFrame == mLowestType) {
+ if (nsGkAtoms::tableRowFrame == mLowestType) {
@@ -1269,3 +1264,3 @@ nsFrameConstructorState::~nsFrameConstru
- ProcessFrameInsertions(mAbsoluteItems, nsLayoutAtoms::absoluteList);
- ProcessFrameInsertions(mFixedItems, nsLayoutAtoms::fixedList);
- ProcessFrameInsertions(mFloatedItems, nsLayoutAtoms::floatList);
+ ProcessFrameInsertions(mAbsoluteItems, nsGkAtoms::absoluteList);
+ ProcessFrameInsertions(mFixedItems, nsGkAtoms::fixedList);
+ ProcessFrameInsertions(mFloatedItems, nsGkAtoms::floatList);
@@ -1288 +1283 @@ nsFrameConstructorState::PushAbsoluteCon
- aSaveState.mChildListName = nsLayoutAtoms::absoluteList;
+ aSaveState.mChildListName = nsGkAtoms::absoluteList;
@@ -1314 +1309 @@ nsFrameConstructorState::PushFloatContai
- aSaveState.mChildListName = nsLayoutAtoms::floatList;
+ aSaveState.mChildListName = nsGkAtoms::floatList;
@@ -1482 +1477 @@ nsFrameConstructorState::ProcessFrameIns
- aChildListName == nsLayoutAtoms::floatList) ||
+ aChildListName == nsGkAtoms::floatList) ||
@@ -1484 +1479 @@ nsFrameConstructorState::ProcessFrameIns
- aChildListName == nsLayoutAtoms::absoluteList) ||
+ aChildListName == nsGkAtoms::absoluteList) ||
@@ -1486 +1481 @@ nsFrameConstructorState::ProcessFrameIns
- aChildListName == nsLayoutAtoms::fixedList),
+ aChildListName == nsGkAtoms::fixedList),
@@ -1618 +1613 @@ PRBool IsBorderCollapse(nsIFrame* aFrame
- if (nsLayoutAtoms::tableFrame == frame->GetType()) {
+ if (nsGkAtoms::tableFrame == frame->GetType()) {
@@ -1905 +1900 @@ GetChildListNameFor(nsIFrame* aChi
- listName = nsLayoutAtoms::absoluteList;
+ listName = nsGkAtoms::absoluteList;
@@ -1907 +1902 @@ GetChildListNameFor(nsIFrame* aChi
- listName = nsLayoutAtoms::fixedList;
+ listName = nsGkAtoms::fixedList;
@@ -1929 +1924 @@ GetChildListNameFor(nsIFrame* aChi
- listName = nsLayoutAtoms::floatList;
+ listName = nsGkAtoms::floatList;
@@ -2121 +2116 @@ nsCSSFrameConstructor::CreateGeneratedFr
- mDocument->NodeInfoManager()->GetNodeInfo(nsHTMLAtoms::img, nsnull,
+ mDocument->NodeInfoManager()->GetNodeInfo(nsGkAtoms::img, nsnull,
@@ -2260 +2255 @@ nsCSSFrameConstructor::CreateGeneratedFr
- if (aContent->HasAttr(kNameSpaceID_None, nsHTMLAtoms::alt)) {
+ if (aContent->HasAttr(kNameSpaceID_None, nsGkAtoms::alt)) {
@@ -2262 +2257 @@ nsCSSFrameConstructor::CreateGeneratedFr
- kNameSpaceID_None, nsHTMLAtoms::alt,
+ kNameSpaceID_None, nsGkAtoms::alt,
@@ -2266,2 +2261,2 @@ nsCSSFrameConstructor::CreateGeneratedFr
- aContent->NodeInfo()->Equals(nsHTMLAtoms::input)) {
- if (aContent->HasAttr(kNameSpaceID_None, nsHTMLAtoms::value)) {
+ aContent->NodeInfo()->Equals(nsGkAtoms::input)) {
+ if (aContent->HasAttr(kNameSpaceID_None, nsGkAtoms::value)) {
@@ -2269 +2264 @@ nsCSSFrameConstructor::CreateGeneratedFr
- kNameSpaceID_None, nsHTMLAtoms::value,
+ kNameSpaceID_None, nsGkAtoms::value,
@@ -2577,3 +2572,3 @@ IsTableRelated(nsIAtom* aParentType,
- if ((nsLayoutAtoms::tableFrame == aParentType) ||
- (nsLayoutAtoms::tableRowGroupFrame == aParentType) ||
- (nsLayoutAtoms::tableRowFrame == aParentType)) {
+ if ((nsGkAtoms::tableFrame == aParentType) ||
+ (nsGkAtoms::tableRowGroupFrame == aParentType) ||
+ (nsGkAtoms::tableRowFrame == aParentType)) {
@@ -2583,3 +2578,3 @@ IsTableRelated(nsIAtom* aParentType,
- ((nsLayoutAtoms::tableCaptionFrame == aParentType) ||
- (nsLayoutAtoms::tableColGroupFrame == aParentType) ||
- (nsLayoutAtoms::tableColFrame == aParentType) ||
+ ((nsGkAtoms::tableCaptionFrame == aParentType) ||
+ (nsGkAtoms::tableColGroupFrame == aParentType) ||
+ (nsGkAtoms::tableColFrame == aParentType) ||
@@ -2595 +2590 @@ AdjustCaptionParentFrame(nsIFrame* aPare
- if (nsLayoutAtoms::tableFrame == aParentFrame->GetType()) {
+ if (nsGkAtoms::tableFrame == aParentFrame->GetType()) {
@@ -2615 +2610 @@ GetCaptionAdjustedParent(nsIFrame*
- if (nsLayoutAtoms::tableCaptionFrame == aChildFrame->GetType()) {
+ if (nsGkAtoms::tableCaptionFrame == aChildFrame->GetType()) {
@@ -2678 +2673 @@ ProcessPseudoTableFrame(nsPseudoFrames&
- rv = aParent->SetInitialChildList(nsLayoutAtoms::captionList, captions->childList);
+ rv = aParent->SetInitialChildList(nsGkAtoms::captionList, captions->childList);
@@ -2716 +2711 @@ ProcessPseudoFrames(nsFrameConstructorSt
- if (nsLayoutAtoms::tableFrame == pseudoFrames.mLowestType) {
+ if (nsGkAtoms::tableFrame == pseudoFrames.mLowestType) {
@@ -2719 +2714 @@ ProcessPseudoFrames(nsFrameConstructorSt
- if (nsLayoutAtoms::tableColGroupFrame == aHighestType) return rv;
+ if (nsGkAtoms::tableColGroupFrame == aHighestType) return rv;
@@ -2722 +2717 @@ ProcessPseudoFrames(nsFrameConstructorSt
- if (nsLayoutAtoms::tableOuterFrame == aHighestType) return rv;
+ if (nsGkAtoms::tableOuterFrame == aHighestType) return rv;
@@ -2730 +2725 @@ ProcessPseudoFrames(nsFrameConstructorSt
- if (nsLayoutAtoms::tableRowFrame == aHighestType) return rv;
+ if (nsGkAtoms::tableRowFrame == aHighestType) return rv;
@@ -2734 +2729 @@ ProcessPseudoFrames(nsFrameConstructorSt
- if (nsLayoutAtoms::tableRowGroupFrame == aHighestType) return rv;
+ if (nsGkAtoms::tableRowGroupFrame == aHighestType) return rv;
@@ -2737 +2732 @@ ProcessPseudoFrames(nsFrameConstructorSt
- else if (nsLayoutAtoms::tableRowGroupFrame == pseudoFrames.mLowestType) {
+ else if (nsGkAtoms::tableRowGroupFrame == pseudoFrames.mLowestType) {
@@ -2739 +2734 @@ ProcessPseudoFrames(nsFrameConstructorSt
- if (nsLayoutAtoms::tableRowGroupFrame == aHighestType) return rv;
+ if (nsGkAtoms::tableRowGroupFrame == aHighestType) return rv;
@@ -2744 +2739 @@ ProcessPseudoFrames(nsFrameConstructorSt
- nsLayoutAtoms::tableRowGroupFrame == aHighestFrame->GetType() &&
+ nsGkAtoms::tableRowGroupFrame == aHighestFrame->GetType() &&
@@ -2753 +2748 @@ ProcessPseudoFrames(nsFrameConstructorSt
- if (nsLayoutAtoms::tableColGroupFrame == aHighestType) return rv;
+ if (nsGkAtoms::tableColGroupFrame == aHighestType) return rv;
@@ -2757 +2752 @@ ProcessPseudoFrames(nsFrameConstructorSt
- if (nsLayoutAtoms::tableOuterFrame == aHighestType) return rv;
+ if (nsGkAtoms::tableOuterFrame == aHighestType) return rv;
@@ -2765 +2760 @@ ProcessPseudoFrames(nsFrameConstructorSt
- if (nsLayoutAtoms::tableRowFrame == aHighestType) return rv;
+ if (nsGkAtoms::tableRowFrame == aHighestType) return rv;
@@ -2768 +2763 @@ ProcessPseudoFrames(nsFrameConstructorSt
- else if (nsLayoutAtoms::tableRowFrame == pseudoFrames.mLowestType) {
+ else if (nsGkAtoms::tableRowFrame == pseudoFrames.mLowestType) {
@@ -2770 +2765 @@ ProcessPseudoFrames(nsFrameConstructorSt
- if (nsLayoutAtoms::tableRowFrame == aHighestType) return rv;
+ if (nsGkAtoms::tableRowFrame == aHighestType) return rv;
@@ -2774 +2769 @@ ProcessPseudoFrames(nsFrameConstructorSt
- if (nsLayoutAtoms::tableRowGroupFrame == aHighestType) return rv;
+ if (nsGkAtoms::tableRowGroupFrame == aHighestType) return rv;
@@ -2780 +2775 @@ ProcessPseudoFrames(nsFrameConstructorSt
- nsLayoutAtoms::tableRowGroupFrame == aHighestFrame->GetType() &&
+ nsGkAtoms::tableRowGroupFrame == aHighestFrame->GetType() &&
@@ -2789 +2784 @@ ProcessPseudoFrames(nsFrameConstructorSt
- if (nsLayoutAtoms::tableColGroupFrame == aHighestType) return rv;
+ if (nsGkAtoms::tableColGroupFrame == aHighestType) return rv;
@@ -2793 +2788 @@ ProcessPseudoFrames(nsFrameConstructorSt
- if (nsLayoutAtoms::tableOuterFrame == aHighestType) return rv;
+ if (nsGkAtoms::tableOuterFrame == aHighestType) return rv;
@@ -2806 +2801 @@ ProcessPseudoFrames(nsFrameConstructorSt
- if (nsLayoutAtoms::tableRowFrame == aHighestType) return rv;
+ if (nsGkAtoms::tableRowFrame == aHighestType) return rv;
@@ -2810 +2805 @@ ProcessPseudoFrames(nsFrameConstructorSt
- if (nsLayoutAtoms::tableRowGroupFrame == aHighestType) return rv;
+ if (nsGkAtoms::tableRowGroupFrame == aHighestType) return rv;
@@ -2816 +2811 @@ ProcessPseudoFrames(nsFrameConstructorSt
- nsLayoutAtoms::tableRowGroupFrame == aHighestFrame->GetType() &&
+ nsGkAtoms::tableRowGroupFrame == aHighestFrame->GetType() &&
@@ -2825 +2820 @@ ProcessPseudoFrames(nsFrameConstructorSt
- if (nsLayoutAtoms::tableColGroupFrame == aHighestType) return rv;
+ if (nsGkAtoms::tableColGroupFrame == aHighestType) return rv;
@@ -2875 +2870 @@ ProcessPseudoFrames(nsFrameConstructorSt
- if (nsLayoutAtoms::tableOuterFrame == aHighestType)
+ if (nsGkAtoms::tableOuterFrame == aHighestType)
@@ -2877 +2872 @@ ProcessPseudoFrames(nsFrameConstructorSt
- else if (nsLayoutAtoms::tableFrame == aHighestType)
+ else if (nsGkAtoms::tableFrame == aHighestType)
@@ -2879 +2874 @@ ProcessPseudoFrames(nsFrameConstructorSt
- else if (nsLayoutAtoms::tableColGroupFrame == aHighestType)
+ else if (nsGkAtoms::tableColGroupFrame == aHighestType)
@@ -2881 +2876 @@ ProcessPseudoFrames(nsFrameConstructorSt
- else if (nsLayoutAtoms::tableRowGroupFrame == aHighestType)
+ else if (nsGkAtoms::tableRowGroupFrame == aHighestType)
@@ -2883 +2878 @@ ProcessPseudoFrames(nsFrameConstructorSt
- else if (nsLayoutAtoms::tableRowFrame == aHighestType)
+ else if (nsGkAtoms::tableRowFrame == aHighestType)
@@ -2943 +2938 @@ nsCSSFrameConstructor::CreatePseudoTable
- aState.mPseudoFrames.mLowestType = nsLayoutAtoms::tableFrame;
+ aState.mPseudoFrames.mLowestType = nsGkAtoms::tableFrame;
@@ -2990 +2985 @@ nsCSSFrameConstructor::CreatePseudoRowGr
- aState.mPseudoFrames.mLowestType = nsLayoutAtoms::tableRowGroupFrame;
+ aState.mPseudoFrames.mLowestType = nsGkAtoms::tableRowGroupFrame;
@@ -3087 +3082 @@ nsCSSFrameConstructor::CreatePseudoRowFr
- aState.mPseudoFrames.mLowestType = nsLayoutAtoms::tableRowFrame;
+ aState.mPseudoFrames.mLowestType = nsGkAtoms::tableRowFrame;
@@ -3137,2 +3132,2 @@ nsCSSFrameConstructor::CreatePseudoCellF
- // give it nsLayoutAtoms::tableCellFrame, if it is really nsLayoutAtoms::bcTableCellFrame, it will match later
- aState.mPseudoFrames.mLowestType = nsLayoutAtoms::tableCellFrame;
+ // give it nsGkAtoms::tableCellFrame, if it is really nsGkAtoms::bcTableCellFrame, it will match later
+ aState.mPseudoFrames.mLowestType = nsGkAtoms::tableCellFrame;
@@ -3166 +3161 @@ nsCSSFrameConstructor::GetPseudoTableFra
- if (nsLayoutAtoms::tableRowGroupFrame == parentFrameType) { // row group parent
+ if (nsGkAtoms::tableRowGroupFrame == parentFrameType) { // row group parent
@@ -3171 +3166 @@ nsCSSFrameConstructor::GetPseudoTableFra
- if (created || (nsLayoutAtoms::tableRowFrame == parentFrameType)) { // row parent
+ if (created || (nsGkAtoms::tableRowFrame == parentFrameType)) { // row parent
@@ -3206 +3201 @@ nsCSSFrameConstructor::GetPseudoColGroup
- if (nsLayoutAtoms::tableRowGroupFrame == parentFrameType) { // row group parent
+ if (nsGkAtoms::tableRowGroupFrame == parentFrameType) { // row group parent
@@ -3210 +3205 @@ nsCSSFrameConstructor::GetPseudoColGroup
- if (created || (nsLayoutAtoms::tableRowFrame == parentFrameType)) { // row parent
+ if (created || (nsGkAtoms::tableRowFrame == parentFrameType)) { // row parent
@@ -3215 +3210 @@ nsCSSFrameConstructor::GetPseudoColGroup
- (nsLayoutAtoms::tableCaptionFrame == parentFrameType) || // caption parent
+ (nsGkAtoms::tableCaptionFrame == parentFrameType) || // caption parent
@@ -3253 +3248 @@ nsCSSFrameConstructor::GetPseudoRowGroup
- if (nsLayoutAtoms::tableRowFrame == parentFrameType) { // row parent
+ if (nsGkAtoms::tableRowFrame == parentFrameType) { // row parent
@@ -3258 +3253 @@ nsCSSFrameConstructor::GetPseudoRowGroup
- (nsLayoutAtoms::tableCaptionFrame == parentFrameType) || // caption parent
+ (nsGkAtoms::tableCaptionFrame == parentFrameType) || // caption parent
@@ -3292 +3287 @@ nsCSSFrameConstructor::GetPseudoRowFrame
- (nsLayoutAtoms::tableCaptionFrame == parentFrameType) || // caption parent
+ (nsGkAtoms::tableCaptionFrame == parentFrameType) || // caption parent
@@ -3297 +3292 @@ nsCSSFrameConstructor::GetPseudoRowFrame
- if (created || (nsLayoutAtoms::tableFrame == parentFrameType)) { // table parent
+ if (created || (nsGkAtoms::tableFrame == parentFrameType)) { // table parent
@@ -3329 +3324 @@ nsCSSFrameConstructor::GetPseudoCellFram
- if (nsLayoutAtoms::tableFrame == parentFrameType) { // table parent
+ if (nsGkAtoms::tableFrame == parentFrameType) { // table parent
@@ -3333 +3328 @@ nsCSSFrameConstructor::GetPseudoCellFram
- if (created || (nsLayoutAtoms::tableRowGroupFrame == parentFrameType)) { // row group parent
+ if (created || (nsGkAtoms::tableRowGroupFrame == parentFrameType)) { // row group parent
@@ -3367 +3362 @@ nsCSSFrameConstructor::GetParentFrame(ns
- if (nsLayoutAtoms::tableOuterFrame == aChildFrameType) { // table child
+ if (nsGkAtoms::tableOuterFrame == aChildFrameType) { // table child
@@ -3369 +3364 @@ nsCSSFrameConstructor::GetParentFrame(ns
- (nsLayoutAtoms::tableCaptionFrame != parentFrameType) ) { // need pseudo cell parent
+ (nsGkAtoms::tableCaptionFrame != parentFrameType) ) { // need pseudo cell parent
@@ -3375,2 +3370,2 @@ nsCSSFrameConstructor::GetParentFrame(ns
- else if (nsLayoutAtoms::tableCaptionFrame == aChildFrameType) { // caption child
- if (nsLayoutAtoms::tableOuterFrame != parentFrameType) { // need pseudo table parent
+ else if (nsGkAtoms::tableCaptionFrame == aChildFrameType) { // caption child
+ if (nsGkAtoms::tableOuterFrame != parentFrameType) { // need pseudo table parent
@@ -3382,2 +3377,2 @@ nsCSSFrameConstructor::GetParentFrame(ns
- else if (nsLayoutAtoms::tableColGroupFrame == aChildFrameType) { // col group child
- if (nsLayoutAtoms::tableFrame != parentFrameType) { // need pseudo table parent
+ else if (nsGkAtoms::tableColGroupFrame == aChildFrameType) { // col group child
+ if (nsGkAtoms::tableFrame != parentFrameType) { // need pseudo table parent
@@ -3389,2 +3384,2 @@ nsCSSFrameConstructor::GetParentFrame(ns
- else if (nsLayoutAtoms::tableColFrame == aChildFrameType) { // col child
- if (nsLayoutAtoms::tableColGroupFrame != parentFrameType) { // need pseudo col group parent
+ else if (nsGkAtoms::tableColFrame == aChildFrameType) { // col child
+ if (nsGkAtoms::tableColGroupFrame != parentFrameType) { // need pseudo col group parent
@@ -3396 +3391 @@ nsCSSFrameConstructor::GetParentFrame(ns
- else if (nsLayoutAtoms::tableRowGroupFrame == aChildFrameType) { // row group child
+ else if (nsGkAtoms::tableRowGroupFrame == aChildFrameType) { // row group child
@@ -3398 +3393 @@ nsCSSFrameConstructor::GetParentFrame(ns
- if (nsLayoutAtoms::tableFrame != parentFrameType) {
+ if (nsGkAtoms::tableFrame != parentFrameType) {
@@ -3405,2 +3400,2 @@ nsCSSFrameConstructor::GetParentFrame(ns
- else if (nsLayoutAtoms::tableRowFrame == aChildFrameType) { // row child
- if (nsLayoutAtoms::tableRowGroupFrame != parentFrameType) { // need pseudo row group parent
+ else if (nsGkAtoms::tableRowFrame == aChildFrameType) { // row child
+ if (nsGkAtoms::tableRowGroupFrame != parentFrameType) { // need pseudo row group parent
@@ -3413 +3408 @@ nsCSSFrameConstructor::GetParentFrame(ns
- if (nsLayoutAtoms::tableRowFrame != parentFrameType) { // need pseudo row parent
+ if (nsGkAtoms::tableRowFrame != parentFrameType) { // need pseudo row parent
@@ -3419,2 +3414,2 @@ nsCSSFrameConstructor::GetParentFrame(ns
- else if (nsLayoutAtoms::tableFrame == aChildFrameType) { // invalid
- NS_ASSERTION(PR_FALSE, "GetParentFrame called on nsLayoutAtoms::tableFrame child");
+ else if (nsGkAtoms::tableFrame == aChildFrameType) { // invalid
+ NS_ASSERTION(PR_FALSE, "GetParentFrame called on nsGkAtoms::tableFrame child");
@@ -3452 +3447 @@ IsSpecialContent(nsIContent* aConten
- if (aTag == nsHTMLAtoms::input) {
+ if (aTag == nsGkAtoms::input) {
@@ -3467 +3462 @@ IsSpecialContent(nsIContent* aConten
- if (aTag == nsHTMLAtoms::img) {
+ if (aTag == nsGkAtoms::img) {
@@ -3471,3 +3466,3 @@ IsSpecialContent(nsIContent* aConten
- if (aTag == nsHTMLAtoms::object ||
- aTag == nsHTMLAtoms::applet ||
- aTag == nsHTMLAtoms::embed) {
+ if (aTag == nsGkAtoms::object ||
+ aTag == nsGkAtoms::applet ||
+ aTag == nsGkAtoms::embed) {
@@ -3480,12 +3475,12 @@ IsSpecialContent(nsIContent* aConten
- aTag == nsHTMLAtoms::br ||
- aTag == nsHTMLAtoms::wbr ||
- aTag == nsHTMLAtoms::textarea ||
- aTag == nsHTMLAtoms::select ||
- aTag == nsHTMLAtoms::fieldset ||
- aTag == nsHTMLAtoms::legend ||
- aTag == nsHTMLAtoms::frameset ||
- aTag == nsHTMLAtoms::iframe ||
- aTag == nsHTMLAtoms::spacer ||
- aTag == nsHTMLAtoms::button ||
- aTag == nsHTMLAtoms::isindex ||
- aTag == nsHTMLAtoms::canvas;
+ aTag == nsGkAtoms::br ||
+ aTag == nsGkAtoms::wbr ||
+ aTag == nsGkAtoms::textarea ||
+ aTag == nsGkAtoms::select ||
+ aTag == nsGkAtoms::fieldset ||
+ aTag == nsGkAtoms::legend ||
+ aTag == nsGkAtoms::frameset ||
+ aTag == nsGkAtoms::iframe ||
+ aTag == nsGkAtoms::spacer ||
+ aTag == nsGkAtoms::button ||
+ aTag == nsGkAtoms::isindex ||
+ aTag == nsGkAtoms::canvas;
@@ -3498,17 +3493,17 @@ IsSpecialContent(nsIContent* aConten
- aTag == nsXULAtoms::button ||
- aTag == nsXULAtoms::checkbox ||
- aTag == nsXULAtoms::radio ||
- aTag == nsXULAtoms::autorepeatbutton ||
- aTag == nsXULAtoms::titlebar ||
- aTag == nsXULAtoms::resizer ||
- aTag == nsXULAtoms::image ||
- aTag == nsXULAtoms::spring ||
- aTag == nsHTMLAtoms::spacer ||
- aTag == nsXULAtoms::treechildren ||
- aTag == nsXULAtoms::treecol ||
- aTag == nsXULAtoms::text ||
- aTag == nsXULAtoms::description ||
- aTag == nsHTMLAtoms::label ||
- aTag == nsXULAtoms::menu ||
- aTag == nsXULAtoms::menuitem ||
- aTag == nsXULAtoms::menubutton ||
+ aTag == nsGkAtoms::button ||
+ aTag == nsGkAtoms::checkbox ||
+ aTag == nsGkAtoms::radio ||
+ aTag == nsGkAtoms::autorepeatbutton ||
+ aTag == nsGkAtoms::titlebar ||
+ aTag == nsGkAtoms::resizer ||
+ aTag == nsGkAtoms::image ||
+ aTag == nsGkAtoms::spring ||
+ aTag == nsGkAtoms::spacer ||
+ aTag == nsGkAtoms::treechildren ||
+ aTag == nsGkAtoms::treecol ||
+ aTag == nsGkAtoms::text ||
+ aTag == nsGkAtoms::description ||
+ aTag == nsGkAtoms::label ||
+ aTag == nsGkAtoms::menu ||
+ aTag == nsGkAtoms::menuitem ||
+ aTag == nsGkAtoms::menubutton ||
@@ -3517 +3512 @@ IsSpecialContent(nsIContent* aConten
- aTag == nsXULAtoms::menubar ||
+ aTag == nsGkAtoms::menubar ||
@@ -3519,10 +3514,10 @@ IsSpecialContent(nsIContent* aConten
- aTag == nsXULAtoms::popupgroup ||
- aTag == nsXULAtoms::iframe ||
- aTag == nsXULAtoms::editor ||
- aTag == nsXULAtoms::browser ||
- aTag == nsXULAtoms::progressmeter ||
-#endif
- aTag == nsXULAtoms::slider ||
- aTag == nsXULAtoms::scrollbar ||
- aTag == nsXULAtoms::nativescrollbar ||
- aTag == nsXULAtoms::scrollbarbutton ||
+ aTag == nsGkAtoms::popupgroup ||
+ aTag == nsGkAtoms::iframe ||
+ aTag == nsGkAtoms::editor ||
+ aTag == nsGkAtoms::browser ||
+ aTag == nsGkAtoms::progressmeter ||
+#endif
+ aTag == nsGkAtoms::slider ||
+ aTag == nsGkAtoms::scrollbar ||
+ aTag == nsGkAtoms::nativescrollbar ||
+ aTag == nsGkAtoms::scrollbarbutton ||
@@ -3530 +3525 @@ IsSpecialContent(nsIContent* aConten
- aTag == nsXULAtoms::splitter ||
+ aTag == nsGkAtoms::splitter ||
@@ -3544,25 +3539,25 @@ IsSpecialContent(nsIContent* aConten
- aTag == nsMathMLAtoms::mi_ ||
- aTag == nsMathMLAtoms::mn_ ||
- aTag == nsMathMLAtoms::ms_ ||
- aTag == nsMathMLAtoms::mtext_ ||
- aTag == nsMathMLAtoms::mo_ ||
- aTag == nsMathMLAtoms::mfrac_ ||
- aTag == nsMathMLAtoms::msup_ ||
- aTag == nsMathMLAtoms::msub_ ||
- aTag == nsMathMLAtoms::msubsup_ ||
- aTag == nsMathMLAtoms::munder_ ||
- aTag == nsMathMLAtoms::mover_ ||
- aTag == nsMathMLAtoms::munderover_ ||
- aTag == nsMathMLAtoms::mphantom_ ||
- aTag == nsMathMLAtoms::mpadded_ ||
- aTag == nsMathMLAtoms::mspace_ ||
- aTag == nsMathMLAtoms::mfenced_ ||
- aTag == nsMathMLAtoms::mmultiscripts_ ||
- aTag == nsMathMLAtoms::mstyle_ ||
- aTag == nsMathMLAtoms::msqrt_ ||
- aTag == nsMathMLAtoms::mroot_ ||
- aTag == nsMathMLAtoms::maction_ ||
- aTag == nsMathMLAtoms::mrow_ ||
- aTag == nsMathMLAtoms::merror_ ||
- aTag == nsMathMLAtoms::none ||
- aTag == nsMathMLAtoms::mprescripts_;
+ aTag == nsGkAtoms::mi_ ||
+ aTag == nsGkAtoms::mn_ ||
+ aTag == nsGkAtoms::ms_ ||
+ aTag == nsGkAtoms::mtext_ ||
+ aTag == nsGkAtoms::mo_ ||
+ aTag == nsGkAtoms::mfrac_ ||
+ aTag == nsGkAtoms::msup_ ||
+ aTag == nsGkAtoms::msub_ ||
+ aTag == nsGkAtoms::msubsup_ ||
+ aTag == nsGkAtoms::munder_ ||
+ aTag == nsGkAtoms::mover_ ||
+ aTag == nsGkAtoms::munderover_ ||
+ aTag == nsGkAtoms::mphantom_ ||
+ aTag == nsGkAtoms::mpadded_ ||
+ aTag == nsGkAtoms::mspace_ ||
+ aTag == nsGkAtoms::mfenced_ ||
+ aTag == nsGkAtoms::mmultiscripts_ ||
+ aTag == nsGkAtoms::mstyle_ ||
+ aTag == nsGkAtoms::msqrt_ ||
+ aTag == nsGkAtoms::mroot_ ||
+ aTag == nsGkAtoms::maction_ ||
+ aTag == nsGkAtoms::mrow_ ||
+ aTag == nsGkAtoms::merror_ ||
+ aTag == nsGkAtoms::none ||
+ aTag == nsGkAtoms::mprescripts_;
@@ -3660 +3655 @@ nsCSSFrameConstructor::ConstructTableFra
- GetParentFrame(aTableCreator, *parentFrame, nsLayoutAtoms::tableOuterFrame,
+ GetParentFrame(aTableCreator, *parentFrame, nsGkAtoms::tableOuterFrame,
@@ -3670 +3665 @@ nsCSSFrameConstructor::ConstructTableFra
- ProcessPseudoFrames(aState, nsLayoutAtoms::tableOuterFrame);
+ ProcessPseudoFrames(aState, nsGkAtoms::tableOuterFrame);
@@ -3715 +3710 @@ nsCSSFrameConstructor::ConstructTableFra
- aNewOuterFrame->SetInitialChildList(nsLayoutAtoms::captionList,
+ aNewOuterFrame->SetInitialChildList(nsGkAtoms::captionList,
@@ -3741 +3736 @@ nsCSSFrameConstructor::ConstructTableCap
- nsLayoutAtoms::tableCaptionFrame, aState, parentFrame,
+ nsGkAtoms::tableCaptionFrame, aState, parentFrame,
@@ -3796 +3791 @@ nsCSSFrameConstructor::ConstructTableRow
- nsLayoutAtoms::tableRowGroupFrame, aState, parentFrame,
+ nsGkAtoms::tableRowGroupFrame, aState, parentFrame,
@@ -3802 +3797 @@ nsCSSFrameConstructor::ConstructTableRow
- ProcessPseudoFrames(aState, nsLayoutAtoms::tableRowGroupFrame);
+ ProcessPseudoFrames(aState, nsGkAtoms::tableRowGroupFrame);
@@ -3872 +3867 @@ nsCSSFrameConstructor::ConstructTableCol
- nsLayoutAtoms::tableColGroupFrame, aState, parentFrame,
+ nsGkAtoms::tableColGroupFrame, aState, parentFrame,
@@ -3878 +3873 @@ nsCSSFrameConstructor::ConstructTableCol
- ProcessPseudoFrames(aState, nsLayoutAtoms::tableColGroupFrame);
+ ProcessPseudoFrames(aState, nsGkAtoms::tableColGroupFrame);
@@ -3922 +3917 @@ nsCSSFrameConstructor::ConstructTableRow
- nsLayoutAtoms::tableRowFrame, aState, parentFrame,
+ nsGkAtoms::tableRowFrame, aState, parentFrame,
@@ -3928 +3923 @@ nsCSSFrameConstructor::ConstructTableRow
- ProcessPseudoFrames(aState, nsLayoutAtoms::tableRowFrame);
+ ProcessPseudoFrames(aState, nsGkAtoms::tableRowFrame);
@@ -3977 +3972 @@ nsCSSFrameConstructor::ConstructTableCol
- nsLayoutAtoms::tableColFrame, aState, parentFrame,
+ nsGkAtoms::tableColFrame, aState, parentFrame,
@@ -4038 +4033 @@ nsCSSFrameConstructor::ConstructTableCel
- // use nsLayoutAtoms::tableCellFrame which will match if it is really nsLayoutAtoms::bcTableCellFrame
+ // use nsGkAtoms::tableCellFrame which will match if it is really nsGkAtoms::bcTableCellFrame
@@ -4040 +4035 @@ nsCSSFrameConstructor::ConstructTableCel
- nsLayoutAtoms::tableCellFrame, aState, parentFrame,
+ nsGkAtoms::tableCellFrame, aState, parentFrame,
@@ -4046 +4041 @@ nsCSSFrameConstructor::ConstructTableCel
- ProcessPseudoFrames(aState, nsLayoutAtoms::tableCellFrame);
+ ProcessPseudoFrames(aState, nsGkAtoms::tableCellFrame);
@@ -4148 +4143 @@ nsCSSFrameConstructor::ConstructTableFor
- *aParentFrameIn, nsLayoutAtoms::blockFrame,
+ *aParentFrameIn, nsGkAtoms::blockFrame,
@@ -4162 +4157 @@ nsCSSFrameConstructor::ConstructTableFor
- NS_ASSERTION(nsLayoutAtoms::tableCaptionFrame == parentFrame->GetType() ||
+ NS_ASSERTION(nsGkAtoms::tableCaptionFrame == parentFrame->GetType() ||
@@ -4275 +4270 @@ nsCSSFrameConstructor::TableProcessChild
- if (nsLayoutAtoms::tableColGroupFrame == aParentFrameType &&
+ if (nsGkAtoms::tableColGroupFrame == aParentFrameType &&
@@ -4481 +4476 @@ nsCSSFrameConstructor::PropagateScrollTo
- !bodyElement->NodeInfo()->Equals(nsHTMLAtoms::body)) {
+ !bodyElement->NodeInfo()->Equals(nsGkAtoms::body)) {
@@ -5085 +5080 @@ nsCSSFrameConstructor::ConstructButtonFr
- if (nsHTMLAtoms::button == aTag) {
+ if (nsGkAtoms::button == aTag) {
@@ -5282 +5277 @@ nsCSSFrameConstructor::ConstructSelectFr
- CreateAnonymousFrames(nsHTMLAtoms::combobox, aState, aContent,
+ CreateAnonymousFrames(nsGkAtoms::combobox, aState, aContent,
@@ -5291 +5286 @@ nsCSSFrameConstructor::ConstructSelectFr
- comboboxFrame->SetInitialChildList(nsLayoutAtoms::popupList,
+ comboboxFrame->SetInitialChildList(nsGkAtoms::popupList,
@@ -5621 +5616 @@ nsCSSFrameConstructor::ConstructHTMLFram
- if (nsHTMLAtoms::img == aTag) {
+ if (nsGkAtoms::img == aTag) {
@@ -5632 +5627 @@ nsCSSFrameConstructor::ConstructHTMLFram
- else if (nsHTMLAtoms::br == aTag) {
+ else if (nsGkAtoms::br == aTag) {
@@ -5645 +5640 @@ nsCSSFrameConstructor::ConstructHTMLFram
- else if (nsHTMLAtoms::wbr == aTag) {
+ else if (nsGkAtoms::wbr == aTag) {
@@ -5652 +5647 @@ nsCSSFrameConstructor::ConstructHTMLFram
- else if (nsHTMLAtoms::input == aTag) {
+ else if (nsGkAtoms::input == aTag) {
@@ -5663 +5658 @@ nsCSSFrameConstructor::ConstructHTMLFram
- else if (nsHTMLAtoms::textarea == aTag) {
+ else if (nsGkAtoms::textarea == aTag) {
@@ -5671 +5666 @@ nsCSSFrameConstructor::ConstructHTMLFram
- else if (nsHTMLAtoms::select == aTag) {
+ else if (nsGkAtoms::select == aTag) {
@@ -5687,3 +5682,3 @@ nsCSSFrameConstructor::ConstructHTMLFram
- else if (nsHTMLAtoms::object == aTag ||
- nsHTMLAtoms::applet == aTag ||
- nsHTMLAtoms::embed == aTag) {
+ else if (nsGkAtoms::object == aTag ||
+ nsGkAtoms::applet == aTag ||
+ nsGkAtoms::embed == aTag) {
@@ -5728 +5723 @@ nsCSSFrameConstructor::ConstructHTMLFram
- else if (nsHTMLAtoms::fieldset == aTag) {
+ else if (nsGkAtoms::fieldset == aTag) {
@@ -5740 +5735 @@ nsCSSFrameConstructor::ConstructHTMLFram
- else if (nsHTMLAtoms::legend == aTag) {
+ else if (nsGkAtoms::legend == aTag) {
@@ -5752 +5747 @@ nsCSSFrameConstructor::ConstructHTMLFram
- else if (nsHTMLAtoms::frameset == aTag) {
+ else if (nsGkAtoms::frameset == aTag) {
@@ -5763 +5758 @@ nsCSSFrameConstructor::ConstructHTMLFram
- else if (nsHTMLAtoms::iframe == aTag) {
+ else if (nsGkAtoms::iframe == aTag) {
@@ -5782 +5777 @@ nsCSSFrameConstructor::ConstructHTMLFram
- else if (nsHTMLAtoms::spacer == aTag) {
+ else if (nsGkAtoms::spacer == aTag) {
@@ -5791 +5786 @@ nsCSSFrameConstructor::ConstructHTMLFram
- else if (nsHTMLAtoms::button == aTag) {
+ else if (nsGkAtoms::button == aTag) {
@@ -5808 +5803 @@ nsCSSFrameConstructor::ConstructHTMLFram
- else if (nsHTMLAtoms::isindex == aTag) {
+ else if (nsGkAtoms::isindex == aTag) {
@@ -5816 +5811 @@ nsCSSFrameConstructor::ConstructHTMLFram
- else if (nsHTMLAtoms::canvas == aTag) {
+ else if (nsGkAtoms::canvas == aTag) {
@@ -5939,5 +5934,5 @@ nsCSSFrameConstructor::CreateAnonymousFr
- aTag != nsHTMLAtoms::input &&
- aTag != nsHTMLAtoms::textarea &&
- aTag != nsHTMLAtoms::combobox &&
- aTag != nsHTMLAtoms::isindex &&
- aTag != nsXULAtoms::scrollbar
+ aTag != nsGkAtoms::input &&
+ aTag != nsGkAtoms::textarea &&
+ aTag != nsGkAtoms::combobox &&
+ aTag != nsGkAtoms::isindex &&
+ aTag != nsGkAtoms::scrollbar
@@ -5945 +5940 @@ nsCSSFrameConstructor::CreateAnonymousFr
- && aTag != nsSVGAtoms::use
+ && aTag != nsGkAtoms::use
@@ -6037,2 +6032,2 @@ nsCSSFrameConstructor::CreateAnonymousFr
- (localName == nsXULAtoms::scrollbar ||
- localName == nsXULAtoms::scrollcorner)) {
+ (localName == nsGkAtoms::scrollbar ||
+ localName == nsGkAtoms::scrollcorner)) {
@@ -6054 +6049 @@ nsCSSFrameConstructor::CreateAnonymousFr
- aParent->NodeInfo()->Equals(nsSVGAtoms::use, kNameSpaceID_SVG))
+ aParent->NodeInfo()->Equals(nsGkAtoms::use, kNameSpaceID_SVG))
@@ -6170 +6165 @@ nsCSSFrameConstructor::ConstructXULFrame
- if (aTag == nsXULAtoms::button || aTag == nsXULAtoms::checkbox || aTag == nsXULAtoms::radio) {
+ if (aTag == nsGkAtoms::button || aTag == nsGkAtoms::checkbox || aTag == nsGkAtoms::radio) {
@@ -6178 +6173 @@ nsCSSFrameConstructor::ConstructXULFrame
- else if (aTag == nsXULAtoms::autorepeatbutton) {
+ else if (aTag == nsGkAtoms::autorepeatbutton) {
@@ -6187 +6182 @@ nsCSSFrameConstructor::ConstructXULFrame
- else if (aTag == nsXULAtoms::titlebar) {
+ else if (aTag == nsGkAtoms::titlebar) {
@@ -6196 +6191 @@ nsCSSFrameConstructor::ConstructXULFrame
- else if (aTag == nsXULAtoms::resizer) {
+ else if (aTag == nsGkAtoms::resizer) {
@@ -6204 +6199 @@ nsCSSFrameConstructor::ConstructXULFrame
- else if (aTag == nsXULAtoms::image) {
+ else if (aTag == nsGkAtoms::image) {
@@ -6208,2 +6203,2 @@ nsCSSFrameConstructor::ConstructXULFrame
- else if (aTag == nsXULAtoms::spring ||
- aTag == nsHTMLAtoms::spacer) {
+ else if (aTag == nsGkAtoms::spring ||
+ aTag == nsGkAtoms::spacer) {
@@ -6213 +6208 @@ nsCSSFrameConstructor::ConstructXULFrame
- else if (aTag == nsXULAtoms::treechildren) {
+ else if (aTag == nsGkAtoms::treechildren) {
@@ -6217 +6212 @@ nsCSSFrameConstructor::ConstructXULFrame
- else if (aTag == nsXULAtoms::treecol) {
+ else if (aTag == nsGkAtoms::treecol) {
@@ -6222,4 +6217,4 @@ nsCSSFrameConstructor::ConstructXULFrame
- else if (aTag == nsXULAtoms::text || aTag == nsHTMLAtoms::label ||
- aTag == nsXULAtoms::description) {
- if ((aTag == nsHTMLAtoms::label || aTag == nsXULAtoms::description) &&
- (! aContent->HasAttr(kNameSpaceID_None, nsHTMLAtoms::value))) {
+ else if (aTag == nsGkAtoms::text || aTag == nsGkAtoms::label ||
+ aTag == nsGkAtoms::description) {
+ if ((aTag == nsGkAtoms::label || aTag == nsGkAtoms::description) &&
+ (! aContent->HasAttr(kNameSpaceID_None, nsGkAtoms::value))) {
@@ -6237,3 +6232,3 @@ nsCSSFrameConstructor::ConstructXULFrame
- else if (aTag == nsXULAtoms::menu ||
- aTag == nsXULAtoms::menuitem ||
- aTag == nsXULAtoms::menubutton) {
+ else if (aTag == nsGkAtoms::menu ||
+ aTag == nsGkAtoms::menuitem ||
+ aTag == nsGkAtoms::menubutton) {
@@ -6245 +6240 @@ nsCSSFrameConstructor::ConstructXULFrame
- (aTag != nsXULAtoms::menuitem));
+ (aTag != nsGkAtoms::menuitem));
@@ -6247 +6242 @@ nsCSSFrameConstructor::ConstructXULFrame
- else if (aTag == nsXULAtoms::menubar) {
+ else if (aTag == nsGkAtoms::menubar) {
@@ -6275 +6270 @@ nsCSSFrameConstructor::ConstructXULFrame
- else if (aTag == nsXULAtoms::popupgroup) {
+ else if (aTag == nsGkAtoms::popupgroup) {
@@ -6280,2 +6275,2 @@ nsCSSFrameConstructor::ConstructXULFrame
- else if (aTag == nsXULAtoms::iframe || aTag == nsXULAtoms::editor ||
- aTag == nsXULAtoms::browser) {
+ else if (aTag == nsGkAtoms::iframe || aTag == nsGkAtoms::editor ||
+ aTag == nsGkAtoms::browser) {
@@ -6286 +6281 @@ nsCSSFrameConstructor::ConstructXULFrame
- else if (aTag == nsXULAtoms::progressmeter) {
+ else if (aTag == nsGkAtoms::progressmeter) {
@@ -6294 +6289 @@ nsCSSFrameConstructor::ConstructXULFrame
- if (aTag == nsXULAtoms::slider) {
+ if (aTag == nsGkAtoms::slider) {
@@ -6301 +6296 @@ nsCSSFrameConstructor::ConstructXULFrame
- else if (aTag == nsXULAtoms::scrollbar) {
+ else if (aTag == nsGkAtoms::scrollbar) {
@@ -6305 +6300 @@ nsCSSFrameConstructor::ConstructXULFrame
- else if (aTag == nsXULAtoms::nativescrollbar) {
+ else if (aTag == nsGkAtoms::nativescrollbar) {
@@ -6312 +6307 @@ nsCSSFrameConstructor::ConstructXULFrame
- else if (aTag == nsXULAtoms::scrollbarbutton) {
+ else if (aTag == nsGkAtoms::scrollbarbutton) {
@@ -6320 +6315 @@ nsCSSFrameConstructor::ConstructXULFrame
- else if (aTag == nsXULAtoms::splitter) {
+ else if (aTag == nsGkAtoms::splitter) {
@@ -6366 +6361 @@ nsCSSFrameConstructor::ConstructXULFrame
- if (aTag == nsXULAtoms::listboxbody) {
+ if (aTag == nsGkAtoms::listboxbody) {
@@ -6400 +6395 @@ nsCSSFrameConstructor::ConstructXULFrame
- if (aTag == nsXULAtoms::listitem)
+ if (aTag == nsGkAtoms::listitem)
@@ -6460,3 +6455,3 @@ nsCSSFrameConstructor::ConstructXULFrame
- if (aTag == nsXULAtoms::tooltip) {
- if (aContent->AttrValueIs(kNameSpaceID_None, nsXULAtoms::_default,
- nsXULAtoms::_true, eIgnoreCase)) {
+ if (aTag == nsGkAtoms::tooltip) {
+ if (aContent->AttrValueIs(kNameSpaceID_None, nsGkAtoms::_default,
+ nsGkAtoms::_true, eIgnoreCase)) {
@@ -6542,2 +6537,2 @@ nsCSSFrameConstructor::ConstructXULFrame
- if ((frameType == nsLayoutAtoms::blockFrame) ||
- (frameType == nsLayoutAtoms::areaFrame)) {
+ if ((frameType == nsGkAtoms::blockFrame) ||
+ (frameType == nsGkAtoms::areaFrame)) {
@@ -6589,3 +6584,3 @@ nsCSSFrameConstructor::ConstructXULFrame
- if (aTag == nsXULAtoms::treechildren || // trees always need titletips
- aContent->HasAttr(kNameSpaceID_None, nsXULAtoms::tooltiptext) ||
- aContent->HasAttr(kNameSpaceID_None, nsXULAtoms::tooltip))
+ if (aTag == nsGkAtoms::treechildren || // trees always need titletips
+ aContent->HasAttr(kNameSpaceID_None, nsGkAtoms::tooltiptext) ||
+ aContent->HasAttr(kNameSpaceID_None, nsGkAtoms::tooltip))
@@ -6640 +6635 @@ nsCSSFrameConstructor::BeginBuildingScro
- noScalingOfTwips = aParentFrame->GetType() == nsLayoutAtoms::viewportFrame;
+ noScalingOfTwips = aParentFrame->GetType() == nsGkAtoms::viewportFrame;
@@ -6798 +6793 @@ nsCSSFrameConstructor::ConstructFrameByD
- if (aContent->NodeInfo()->Equals(nsHTMLAtoms::body) &&
+ if (aContent->NodeInfo()->Equals(nsGkAtoms::body) &&
@@ -7004,2 +6999,2 @@ nsCSSFrameConstructor::ConstructFrameByD
- if ((nsLayoutAtoms::tableOuterFrame == outerFrame->GetType()) &&
- (nsLayoutAtoms::tableFrame == parentFrame->GetType())) {
+ if ((nsGkAtoms::tableOuterFrame == outerFrame->GetType()) &&
+ (nsGkAtoms::tableFrame == parentFrame->GetType())) {
@@ -7197 +7192 @@ nsCSSFrameConstructor::ConstructMathMLFr
- (aTag == nsMathMLAtoms::mtable_ &&
+ (aTag == nsGkAtoms::mtable_ &&
@@ -7205,4 +7200,4 @@ nsCSSFrameConstructor::ConstructMathMLFr
- if (aTag == nsMathMLAtoms::mi_ ||
- aTag == nsMathMLAtoms::mn_ ||
- aTag == nsMathMLAtoms::ms_ ||
- aTag == nsMathMLAtoms::mtext_)
+ if (aTag == nsGkAtoms::mi_ ||
+ aTag == nsGkAtoms::mn_ ||
+ aTag == nsGkAtoms::ms_ ||
+ aTag == nsGkAtoms::mtext_)
@@ -7210 +7205 @@ nsCSSFrameConstructor::ConstructMathMLFr
- else if (aTag == nsMathMLAtoms::mo_)
+ else if (aTag == nsGkAtoms::mo_)
@@ -7212 +7207 @@ nsCSSFrameConstructor::ConstructMathMLFr
- else if (aTag == nsMathMLAtoms::mfrac_)
+ else if (aTag == nsGkAtoms::mfrac_)
@@ -7214 +7209 @@ nsCSSFrameConstructor::ConstructMathMLFr
- else if (aTag == nsMathMLAtoms::msup_)
+ else if (aTag == nsGkAtoms::msup_)
@@ -7216 +7211 @@ nsCSSFrameConstructor::ConstructMathMLFr
- else if (aTag == nsMathMLAtoms::msub_)
+ else if (aTag == nsGkAtoms::msub_)
@@ -7218 +7213 @@ nsCSSFrameConstructor::ConstructMathMLFr
- else if (aTag == nsMathMLAtoms::msubsup_)
+ else if (aTag == nsGkAtoms::msubsup_)
@@ -7220 +7215 @@ nsCSSFrameConstructor::ConstructMathMLFr
- else if (aTag == nsMathMLAtoms::munder_)
+ else if (aTag == nsGkAtoms::munder_)
@@ -7222 +7217 @@ nsCSSFrameConstructor::ConstructMathMLFr
- else if (aTag == nsMathMLAtoms::mover_)
+ else if (aTag == nsGkAtoms::mover_)
@@ -7224 +7219 @@ nsCSSFrameConstructor::ConstructMathMLFr
- else if (aTag == nsMathMLAtoms::munderover_)
+ else if (aTag == nsGkAtoms::munderover_)
@@ -7226 +7221 @@ nsCSSFrameConstructor::ConstructMathMLFr
- else if (aTag == nsMathMLAtoms::mphantom_)
+ else if (aTag == nsGkAtoms::mphantom_)
@@ -7228 +7223 @@ nsCSSFrameConstructor::ConstructMathMLFr
- else if (aTag == nsMathMLAtoms::mpadded_)
+ else if (aTag == nsGkAtoms::mpadded_)
@@ -7230,3 +7225,3 @@ nsCSSFrameConstructor::ConstructMathMLFr
- else if (aTag == nsMathMLAtoms::mspace_ ||
- aTag == nsMathMLAtoms::none ||
- aTag == nsMathMLAtoms::mprescripts_)
+ else if (aTag == nsGkAtoms::mspace_ ||
+ aTag == nsGkAtoms::none ||
+ aTag == nsGkAtoms::mprescripts_)
@@ -7234 +7229 @@ nsCSSFrameConstructor::ConstructMathMLFr
- else if (aTag == nsMathMLAtoms::mfenced_)
+ else if (aTag == nsGkAtoms::mfenced_)
@@ -7236 +7231 @@ nsCSSFrameConstructor::ConstructMathMLFr
- else if (aTag == nsMathMLAtoms::mmultiscripts_)
+ else if (aTag == nsGkAtoms::mmultiscripts_)
@@ -7238 +7233 @@ nsCSSFrameConstructor::ConstructMathMLFr
- else if (aTag == nsMathMLAtoms::mstyle_)
+ else if (aTag == nsGkAtoms::mstyle_)
@@ -7240 +7235 @@ nsCSSFrameConstructor::ConstructMathMLFr
- else if (aTag == nsMathMLAtoms::msqrt_)
+ else if (aTag == nsGkAtoms::msqrt_)
@@ -7242 +7237 @@ nsCSSFrameConstructor::ConstructMathMLFr
- else if (aTag == nsMathMLAtoms::mroot_)
+ else if (aTag == nsGkAtoms::mroot_)
@@ -7244 +7239 @@ nsCSSFrameConstructor::ConstructMathMLFr
- else if (aTag == nsMathMLAtoms::maction_)
+ else if (aTag == nsGkAtoms::maction_)
@@ -7246,2 +7241,2 @@ nsCSSFrameConstructor::ConstructMathMLFr
- else if (aTag == nsMathMLAtoms::mrow_ ||
- aTag == nsMathMLAtoms::merror_)
+ else if (aTag == nsGkAtoms::mrow_ ||
+ aTag == nsGkAtoms::merror_)
@@ -7250 +7245 @@ nsCSSFrameConstructor::ConstructMathMLFr
- else if (aTag == nsMathMLAtoms::mtable_ &&
+ else if (aTag == nsGkAtoms::mtable_ &&
@@ -7317 +7312 @@ nsCSSFrameConstructor::ConstructMathMLFr
- else if (aTag == nsMathMLAtoms::math) {
+ else if (aTag == nsGkAtoms::math) {
@@ -7341 +7336 @@ nsCSSFrameConstructor::ConstructMathMLFr
- PRBool isMath = aTag == nsMathMLAtoms::math;
+ PRBool isMath = aTag == nsGkAtoms::math;
@@ -7528 +7523 @@ nsCSSFrameConstructor::TestSVGConditions
- nsSVGAtoms::requiredExtensions);
+ nsGkAtoms::requiredExtensions);
@@ -7532 +7527 @@ nsCSSFrameConstructor::TestSVGConditions
- if (aContent->GetAttr(kNameSpaceID_None, nsSVGAtoms::requiredFeatures, value)) {
+ if (aContent->GetAttr(kNameSpaceID_None, nsGkAtoms::requiredFeatures, value)) {
@@ -7544 +7539 @@ nsCSSFrameConstructor::TestSVGConditions
- if (aContent->GetAttr(kNameSpaceID_None, nsSVGAtoms::systemLanguage,
+ if (aContent->GetAttr(kNameSpaceID_None, nsGkAtoms::systemLanguage,
@@ -7682 +7677 @@ nsCSSFrameConstructor::ConstructSVGFrame
- && parentTag != nsSVGAtoms::foreignObject
+ && parentTag != nsGkAtoms::foreignObject
@@ -7687 +7682 @@ nsCSSFrameConstructor::ConstructSVGFrame
- if ((aTag != nsSVGAtoms::svg && !parentIsSVG) ||
+ if ((aTag != nsGkAtoms::svg && !parentIsSVG) ||
@@ -7706,2 +7701,2 @@ nsCSSFrameConstructor::ConstructSVGFrame
- if (((aContent->HasAttr(kNameSpaceID_None, nsSVGAtoms::requiredFeatures) ||
- aContent->HasAttr(kNameSpaceID_None, nsSVGAtoms::requiredExtensions)) &&
+ if (((aContent->HasAttr(kNameSpaceID_None, nsGkAtoms::requiredFeatures) ||
+ aContent->HasAttr(kNameSpaceID_None, nsGkAtoms::requiredExtensions)) &&
@@ -7709 +7704 @@ nsCSSFrameConstructor::ConstructSVGFrame
- (aContent->HasAttr(kNameSpaceID_None, nsSVGAtoms::systemLanguage) &&
+ (aContent->HasAttr(kNameSpaceID_None, nsGkAtoms::systemLanguage) &&
@@ -7731 +7726 @@ nsCSSFrameConstructor::ConstructSVGFrame
- if (aTag == nsSVGAtoms::svg) {
+ if (aTag == nsGkAtoms::svg) {
@@ -7747 +7742 @@ nsCSSFrameConstructor::ConstructSVGFrame
- else if (aTag == nsSVGAtoms::g) {
+ else if (aTag == nsGkAtoms::g) {
@@ -7750,7 +7745,7 @@ nsCSSFrameConstructor::ConstructSVGFrame
- else if (aTag == nsSVGAtoms::polygon ||
- aTag == nsSVGAtoms::polyline ||
- aTag == nsSVGAtoms::circle ||
- aTag == nsSVGAtoms::ellipse ||
- aTag == nsSVGAtoms::line ||
- aTag == nsSVGAtoms::rect ||
- aTag == nsSVGAtoms::path)
+ else if (aTag == nsGkAtoms::polygon ||
+ aTag == nsGkAtoms::polyline ||
+ aTag == nsGkAtoms::circle ||
+ aTag == nsGkAtoms::ellipse ||
+ aTag == nsGkAtoms::line ||
+ aTag == nsGkAtoms::rect ||
+ aTag == nsGkAtoms::path)
@@ -7758 +7753 @@ nsCSSFrameConstructor::ConstructSVGFrame
- else if (aTag == nsSVGAtoms::defs) {
+ else if (aTag == nsGkAtoms::defs) {
@@ -7762 +7757 @@ nsCSSFrameConstructor::ConstructSVGFrame
- else if (aTag == nsSVGAtoms::foreignObject) {
+ else if (aTag == nsGkAtoms::foreignObject) {
@@ -7766 +7761 @@ nsCSSFrameConstructor::ConstructSVGFrame
- else if (aTag == nsSVGAtoms::text) {
+ else if (aTag == nsGkAtoms::text) {
@@ -7769 +7764 @@ nsCSSFrameConstructor::ConstructSVGFrame
- else if (aTag == nsSVGAtoms::tspan) {
+ else if (aTag == nsGkAtoms::tspan) {
@@ -7776 +7771 @@ nsCSSFrameConstructor::ConstructSVGFrame
- else if (aTag == nsSVGAtoms::linearGradient) {
+ else if (aTag == nsGkAtoms::linearGradient) {
@@ -7779 +7774 @@ nsCSSFrameConstructor::ConstructSVGFrame
- else if (aTag == nsSVGAtoms::radialGradient) {
+ else if (aTag == nsGkAtoms::radialGradient) {
@@ -7782 +7777 @@ nsCSSFrameConstructor::ConstructSVGFrame
- else if (aTag == nsSVGAtoms::stop) {
+ else if (aTag == nsGkAtoms::stop) {
@@ -7785 +7780 @@ nsCSSFrameConstructor::ConstructSVGFrame
- else if (aTag == nsSVGAtoms::use) {
+ else if (aTag == nsGkAtoms::use) {
@@ -7788 +7783 @@ nsCSSFrameConstructor::ConstructSVGFrame
- else if (aTag == nsSVGAtoms::marker) {
+ else if (aTag == nsGkAtoms::marker) {
@@ -7791 +7786 @@ nsCSSFrameConstructor::ConstructSVGFrame
- else if (aTag == nsSVGAtoms::image) {
+ else if (aTag == nsGkAtoms::image) {
@@ -7794 +7789 @@ nsCSSFrameConstructor::ConstructSVGFrame
- else if (aTag == nsSVGAtoms::clipPath) {
+ else if (aTag == nsGkAtoms::clipPath) {
@@ -7797 +7792 @@ nsCSSFrameConstructor::ConstructSVGFrame
- else if (aTag == nsSVGAtoms::textPath) {
+ else if (aTag == nsGkAtoms::textPath) {
@@ -7799 +7794 @@ nsCSSFrameConstructor::ConstructSVGFrame
- aParentFrame->GetType() == nsLayoutAtoms::svgTextFrame) {
+ aParentFrame->GetType() == nsGkAtoms::svgTextFrame) {
@@ -7803 +7798 @@ nsCSSFrameConstructor::ConstructSVGFrame
- else if (aTag == nsSVGAtoms::filter) {
+ else if (aTag == nsGkAtoms::filter) {
@@ -7806 +7801 @@ nsCSSFrameConstructor::ConstructSVGFrame
- else if (aTag == nsSVGAtoms::pattern) {
+ else if (aTag == nsGkAtoms::pattern) {
@@ -7809 +7804 @@ nsCSSFrameConstructor::ConstructSVGFrame
- else if (aTag == nsSVGAtoms::mask) {
+ else if (aTag == nsGkAtoms::mask) {
@@ -7869 +7864 @@ nsCSSFrameConstructor::ConstructSVGFrame
- if (aTag == nsSVGAtoms::foreignObject) {
+ if (aTag == nsGkAtoms::foreignObject) {
@@ -7899 +7894 @@ nsCSSFrameConstructor::ConstructSVGFrame
- if (aTag == nsSVGAtoms::svgSwitch) {
+ if (aTag == nsGkAtoms::svgSwitch) {
@@ -8209 +8204 @@ IsRootBoxFrame(nsIFrame *aFrame)
- return (aFrame->GetType() == nsLayoutAtoms::rootFrame);
+ return (aFrame->GetType() == nsGkAtoms::rootFrame);
@@ -8325,3 +8320,3 @@ nsCSSFrameConstructor::GetAbsoluteContai
- if (nsLayoutAtoms::areaFrame == frameType ||
- nsLayoutAtoms::blockFrame == frameType ||
- nsLayoutAtoms::positionedInlineFrame == frameType) {
+ if (nsGkAtoms::areaFrame == frameType ||
+ nsGkAtoms::blockFrame == frameType ||
+ nsGkAtoms::positionedInlineFrame == frameType) {
@@ -8329 +8324 @@ nsCSSFrameConstructor::GetAbsoluteContai
- } else if (nsLayoutAtoms::fieldSetFrame == frameType) {
+ } else if (nsGkAtoms::fieldSetFrame == frameType) {
@@ -8626 +8621 @@ nsCSSFrameConstructor::IsValidSibling(ns
- else if (nsLayoutAtoms::fieldSetFrame == aParentFrame->GetType()) {
+ else if (nsGkAtoms::fieldSetFrame == aParentFrame->GetType()) {
@@ -8631,2 +8626,2 @@ nsCSSFrameConstructor::IsValidSibling(ns
- if ((legendContent && (nsLayoutAtoms::legendFrame != sibType)) ||
- (!legendContent && (nsLayoutAtoms::legendFrame == sibType)))
+ if ((legendContent && (nsGkAtoms::legendFrame != sibType)) ||
+ (!legendContent && (nsGkAtoms::legendFrame == sibType)))
@@ -8767,2 +8762,2 @@ ShouldIgnoreSelectChild(nsIContent* aCon
- if (containerTag == nsHTMLAtoms::optgroup ||
- containerTag == nsHTMLAtoms::select) {
+ if (containerTag == nsGkAtoms::optgroup ||
+ containerTag == nsGkAtoms::select) {
@@ -8771 +8766 @@ ShouldIgnoreSelectChild(nsIContent* aCon
- while (containerTag != nsHTMLAtoms::select) {
+ while (containerTag != nsGkAtoms::select) {
@@ -8782 +8777 @@ ShouldIgnoreSelectChild(nsIContent* aCon
- aContainer->GetAttr(kNameSpaceID_None, nsHTMLAtoms::size, selSize);
+ aContainer->GetAttr(kNameSpaceID_None, nsGkAtoms::size, selSize);
@@ -8804 +8799 @@ GetAdjustedParentFrame(nsIFrame* a
- if (nsLayoutAtoms::tableOuterFrame == aParentFrameType) {
+ if (nsGkAtoms::tableOuterFrame == aParentFrameType) {
@@ -8811 +8806 @@ GetAdjustedParentFrame(nsIFrame* a
- else if (nsLayoutAtoms::fieldSetFrame == aParentFrameType) {
+ else if (nsGkAtoms::fieldSetFrame == aParentFrameType) {
@@ -8848,3 +8843,3 @@ nsCSSFrameConstructor::ContentAppended(n
- if (tag == nsXULAtoms::treechildren ||
- tag == nsXULAtoms::treeitem ||
- tag == nsXULAtoms::treerow ||
+ if (tag == nsGkAtoms::treechildren ||
+ tag == nsGkAtoms::treeitem ||
+ tag == nsGkAtoms::treerow ||
@@ -8935 +8930 @@ nsCSSFrameConstructor::ContentAppended(n
- if (parentFrame->GetType() == nsLayoutAtoms::frameSetFrame) {
+ if (parentFrame->GetType() == nsGkAtoms::frameSetFrame) {
@@ -9057 +9052 @@ nsCSSFrameConstructor::ContentAppended(n
- if (nsLayoutAtoms::tableFrame == frameType) {
+ if (nsGkAtoms::tableFrame == frameType) {
@@ -9061 +9056 @@ nsCSSFrameConstructor::ContentAppended(n
- if (nsLayoutAtoms::tableCaptionFrame == tempItems.childList->GetType()) {
+ if (nsGkAtoms::tableCaptionFrame == tempItems.childList->GetType()) {
@@ -9070 +9065 @@ nsCSSFrameConstructor::ContentAppended(n
- else if (nsLayoutAtoms::tableColGroupFrame == frameType) {
+ else if (nsGkAtoms::tableColGroupFrame == frameType) {
@@ -9123 +9118 @@ nsCSSFrameConstructor::ContentAppended(n
- if (nsLayoutAtoms::tableFrame == frameType) {
+ if (nsGkAtoms::tableFrame == frameType) {
@@ -9128 +9123 @@ nsCSSFrameConstructor::ContentAppended(n
- nsLayoutAtoms::captionList,
+ nsGkAtoms::captionList,
@@ -9294,2 +9289,2 @@ PRBool NotifyListBoxBody(nsPresContext*
- aContainer->Tag() == nsXULAtoms::listbox &&
- aChild->Tag() == nsXULAtoms::listitem) {
+ aContainer->Tag() == nsGkAtoms::listbox &&
+ aChild->Tag() == nsGkAtoms::listitem) {
@@ -9326,3 +9321,3 @@ PRBool NotifyListBoxBody(nsPresContext*
- if (tag == nsXULAtoms::treechildren ||
- tag == nsXULAtoms::treeitem ||
- tag == nsXULAtoms::treerow ||
+ if (tag == nsGkAtoms::treechildren ||
+ tag == nsGkAtoms::treeitem ||
+ tag == nsGkAtoms::treerow ||
@@ -9499 +9494 @@ nsCSSFrameConstructor::ContentInserted(n
- if (parentFrame->GetType() == nsLayoutAtoms::frameSetFrame) {
+ if (parentFrame->GetType() == nsGkAtoms::frameSetFrame) {
@@ -9572 +9567 @@ nsCSSFrameConstructor::ContentInserted(n
- if (parentFrame->GetType() == nsLayoutAtoms::letterFrame) {
+ if (parentFrame->GetType() == nsGkAtoms::letterFrame) {
@@ -9632 +9627 @@ nsCSSFrameConstructor::ContentInserted(n
- if (nsLayoutAtoms::tableCaptionFrame == tempItems.childList->GetType()) {
+ if (nsGkAtoms::tableCaptionFrame == tempItems.childList->GetType()) {
@@ -9714 +9709 @@ nsCSSFrameConstructor::ContentInserted(n
- NS_ASSERTION(nsLayoutAtoms::tableOuterFrame == outerTableFrame->GetType(),
+ NS_ASSERTION(nsGkAtoms::tableOuterFrame == outerTableFrame->GetType(),
@@ -9719 +9714 @@ nsCSSFrameConstructor::ContentInserted(n
- nsLayoutAtoms::captionList,
+ nsGkAtoms::captionList,
@@ -9724 +9719 @@ nsCSSFrameConstructor::ContentInserted(n
- nsLayoutAtoms::captionList,
+ nsGkAtoms::captionList,
@@ -9813 +9808 @@ DoDeletingFrameSubtree(nsFrameManager* a
- if (NS_LIKELY(nsLayoutAtoms::placeholderFrame != childFrame->GetType())) {
+ if (NS_LIKELY(nsGkAtoms::placeholderFrame != childFrame->GetType())) {
@@ -9852,3 +9847,3 @@ DoDeletingFrameSubtree(nsFrameManager* a
- } while (childListName == nsLayoutAtoms::floatList ||
- childListName == nsLayoutAtoms::absoluteList ||
- childListName == nsLayoutAtoms::fixedList);
+ } while (childListName == nsGkAtoms::floatList ||
+ childListName == nsGkAtoms::absoluteList ||
+ childListName == nsGkAtoms::fixedList);
@@ -9986 +9981 @@ nsCSSFrameConstructor::ContentRemoved(ns
- if (parentFrame->GetType() == nsLayoutAtoms::frameSetFrame) {
+ if (parentFrame->GetType() == nsGkAtoms::frameSetFrame) {
@@ -10082 +10077 @@ nsCSSFrameConstructor::ContentRemoved(ns
- nsLayoutAtoms::captionList,
+ nsGkAtoms::captionList,
@@ -10165 +10160 @@ UpdateViewsForTree(nsIFrame* aFrame, nsI
- if (nsLayoutAtoms::placeholderFrame == child->GetType()) { // placeholder
+ if (nsGkAtoms::placeholderFrame == child->GetType()) { // placeholder
@@ -10291 +10286 @@ InvalidateCanvasIfNeeded(nsIFrame* aFram
- if (node->Tag() != nsHTMLAtoms::body ||
+ if (node->Tag() != nsGkAtoms::body ||
@@ -10311 +10306 @@ InvalidateCanvasIfNeeded(nsIFrame* aFram
- if (ancestor->GetType() == nsLayoutAtoms::canvasFrame) {
+ if (ancestor->GetType() == nsGkAtoms::canvasFrame) {
@@ -10481 +10476 @@ nsCSSFrameConstructor::ProcessRestyledFr
- nsLayoutAtoms::changeListProperty,
+ nsGkAtoms::changeListProperty,
@@ -10497 +10492 @@ nsCSSFrameConstructor::ProcessRestyledFr
- propTable->GetProperty(frame, nsLayoutAtoms::changeListProperty, &res);
+ propTable->GetProperty(frame, nsGkAtoms::changeListProperty, &res);
@@ -10540 +10535 @@ nsCSSFrameConstructor::ProcessRestyledFr
- nsLayoutAtoms::changeListProperty);
+ nsGkAtoms::changeListProperty);
@@ -10702,2 +10697,2 @@ nsCSSFrameConstructor::AttributeChanged(
- (tag == nsXULAtoms::listitem ||
- tag == nsXULAtoms::listcell))
+ (tag == nsGkAtoms::listitem ||
+ tag == nsGkAtoms::listcell))
@@ -10707,2 +10702,2 @@ nsCSSFrameConstructor::AttributeChanged(
- if (aAttribute == nsXULAtoms::tooltiptext ||
- aAttribute == nsXULAtoms::tooltip)
+ if (aAttribute == nsGkAtoms::tooltiptext ||
+ aAttribute == nsGkAtoms::tooltip)
@@ -10755 +10750 @@ nsCSSFrameConstructor::AttributeChanged(
- ((aAttribute == nsXULAtoms::menugenerated &&
+ ((aAttribute == nsGkAtoms::menugenerated &&
@@ -10757 +10752 @@ nsCSSFrameConstructor::AttributeChanged(
- aAttribute == nsXULAtoms::menuactive)) {
+ aAttribute == nsGkAtoms::menuactive)) {
@@ -10764,2 +10759,2 @@ nsCSSFrameConstructor::AttributeChanged(
- (tag == nsXULAtoms::menupopup || tag == nsXULAtoms::popup ||
- tag == nsXULAtoms::tooltip || tag == nsXULAtoms::menu)) {
+ (tag == nsGkAtoms::menupopup || tag == nsGkAtoms::popup ||
+ tag == nsGkAtoms::tooltip || tag == nsGkAtoms::menu)) {
@@ -10833,2 +10828,2 @@ void nsCSSFrameConstructor::GetAlternate
- if (!aContent->GetAttr(kNameSpaceID_None, nsHTMLAtoms::alt, aAltText) &&
- nsHTMLAtoms::input == aTag) {
+ if (!aContent->GetAttr(kNameSpaceID_None, nsGkAtoms::alt, aAltText) &&
+ nsGkAtoms::input == aTag) {
@@ -10837 +10832 @@ void nsCSSFrameConstructor::GetAlternate
- if (!aContent->GetAttr(kNameSpaceID_None, nsHTMLAtoms::value, aAltText)) {
+ if (!aContent->GetAttr(kNameSpaceID_None, nsGkAtoms::value, aAltText)) {
@@ -10990 +10985 @@ nsCSSFrameConstructor::CreateContinuingF
- if (nsLayoutAtoms::textFrame == frameType) {
+ if (nsGkAtoms::textFrame == frameType) {
@@ -10999 +10994 @@ nsCSSFrameConstructor::CreateContinuingF
- } else if (nsLayoutAtoms::inlineFrame == frameType) {
+ } else if (nsGkAtoms::inlineFrame == frameType) {
@@ -11008 +11003 @@ nsCSSFrameConstructor::CreateContinuingF
- } else if (nsLayoutAtoms::blockFrame == frameType) {
+ } else if (nsGkAtoms::blockFrame == frameType) {
@@ -11017 +11012 @@ nsCSSFrameConstructor::CreateContinuingF
- } else if (nsLayoutAtoms::areaFrame == frameType) {
+ } else if (nsGkAtoms::areaFrame == frameType) {
@@ -11026 +11021 @@ nsCSSFrameConstructor::CreateContinuingF
- } else if (nsLayoutAtoms::columnSetFrame == frameType) {
+ } else if (nsGkAtoms::columnSetFrame == frameType) {
@@ -11035 +11030 @@ nsCSSFrameConstructor::CreateContinuingF
- } else if (nsLayoutAtoms::positionedInlineFrame == frameType) {
+ } else if (nsGkAtoms::positionedInlineFrame == frameType) {
@@ -11044 +11039 @@ nsCSSFrameConstructor::CreateContinuingF
- } else if (nsLayoutAtoms::pageFrame == frameType) {
+ } else if (nsGkAtoms::pageFrame == frameType) {
@@ -11048 +11043 @@ nsCSSFrameConstructor::CreateContinuingF
- } else if (nsLayoutAtoms::tableOuterFrame == frameType) {
+ } else if (nsGkAtoms::tableOuterFrame == frameType) {
@@ -11052 +11047 @@ nsCSSFrameConstructor::CreateContinuingF
- } else if (nsLayoutAtoms::tableFrame == frameType) {
+ } else if (nsGkAtoms::tableFrame == frameType) {
@@ -11056 +11051 @@ nsCSSFrameConstructor::CreateContinuingF
- } else if (nsLayoutAtoms::tableRowGroupFrame == frameType) {
+ } else if (nsGkAtoms::tableRowGroupFrame == frameType) {
@@ -11065 +11060 @@ nsCSSFrameConstructor::CreateContinuingF
- } else if (nsLayoutAtoms::tableRowFrame == frameType) {
+ } else if (nsGkAtoms::tableRowFrame == frameType) {
@@ -11121 +11116 @@ nsCSSFrameConstructor::CreateContinuingF
- } else if (nsLayoutAtoms::lineFrame == frameType) {
+ } else if (nsGkAtoms::lineFrame == frameType) {
@@ -11130 +11125 @@ nsCSSFrameConstructor::CreateContinuingF
- } else if (nsLayoutAtoms::letterFrame == frameType) {
+ } else if (nsGkAtoms::letterFrame == frameType) {
@@ -11139 +11134 @@ nsCSSFrameConstructor::CreateContinuingF
- } else if (nsLayoutAtoms::imageFrame == frameType) {
+ } else if (nsGkAtoms::imageFrame == frameType) {
@@ -11145 +11140 @@ nsCSSFrameConstructor::CreateContinuingF
- } else if (nsLayoutAtoms::placeholderFrame == frameType) {
+ } else if (nsGkAtoms::placeholderFrame == frameType) {
@@ -11164 +11159 @@ nsCSSFrameConstructor::CreateContinuingF
- } else if (nsLayoutAtoms::fieldSetFrame == frameType) {
+ } else if (nsGkAtoms::fieldSetFrame == frameType) {
@@ -11218 +11213 @@ nsCSSFrameConstructor::CreateContinuingF
- if (aParentFrame->GetType() != nsLayoutAtoms::pageContentFrame) {
+ if (aParentFrame->GetType() != nsGkAtoms::pageContentFrame) {
@@ -11255 +11250 @@ nsCSSFrameConstructor::CreateContinuingF
- nsIFrame* firstFixed = prevPageContentFrame->GetFirstChild(nsLayoutAtoms::fixedList);
+ nsIFrame* firstFixed = prevPageContentFrame->GetFirstChild(nsGkAtoms::fixedList);
@@ -11601 +11596 @@ nsCSSFrameConstructor::GetInsertionPoint
- content->Tag() == nsHTMLAtoms::fieldset) {
+ content->Tag() == nsGkAtoms::fieldset) {
@@ -11990 +11985 @@ nsCSSFrameConstructor::AppendFirstLineFr
- if (lastBlockKid->GetType() != nsLayoutAtoms::lineFrame) {
+ if (lastBlockKid->GetType() != nsGkAtoms::lineFrame) {
@@ -12064 +12059 @@ nsCSSFrameConstructor::InsertFirstLineFr
- if (firstBlockKid->GetType() == nsLayoutAtoms::lineFrame) {
+ if (firstBlockKid->GetType() == nsGkAtoms::lineFrame) {
@@ -12464 +12459 @@ nsCSSFrameConstructor::WrapFramesInFirst
- if (nsLayoutAtoms::textFrame == frameType) {
+ if (nsGkAtoms::textFrame == frameType) {
@@ -12483,3 +12478,3 @@ nsCSSFrameConstructor::WrapFramesInFirst
- else if ((nsLayoutAtoms::inlineFrame == frameType) ||
- (nsLayoutAtoms::lineFrame == frameType) ||
- (nsLayoutAtoms::positionedInlineFrame == frameType)) {
+ else if ((nsGkAtoms::inlineFrame == frameType) ||
+ (nsGkAtoms::lineFrame == frameType) ||
+ (nsGkAtoms::positionedInlineFrame == frameType)) {
@@ -12521 +12516 @@ nsCSSFrameConstructor::RemoveFloatingFir
- nsIFrame* floatFrame = aBlockFrame->GetFirstChild(nsLayoutAtoms::floatList);
+ nsIFrame* floatFrame = aBlockFrame->GetFirstChild(nsGkAtoms::floatList);
@@ -12524 +12519 @@ nsCSSFrameConstructor::RemoveFloatingFir
- if (nsLayoutAtoms::letterFrame == floatFrame->GetType()) {
+ if (nsGkAtoms::letterFrame == floatFrame->GetType()) {
@@ -12614 +12609 @@ nsCSSFrameConstructor::RemoveFloatingFir
- aFrameManager->RemoveFrame(aBlockFrame, nsLayoutAtoms::floatList,
+ aFrameManager->RemoveFrame(aBlockFrame, nsGkAtoms::floatList,
@@ -12639 +12634 @@ nsCSSFrameConstructor::RemoveFirstLetter
- if (nsLayoutAtoms::letterFrame == frameType) {
+ if (nsGkAtoms::letterFrame == frameType) {
@@ -12673,3 +12668,3 @@ nsCSSFrameConstructor::RemoveFirstLetter
- else if ((nsLayoutAtoms::inlineFrame == frameType) ||
- (nsLayoutAtoms::lineFrame == frameType) ||
- (nsLayoutAtoms::positionedInlineFrame == frameType)) {
+ else if ((nsGkAtoms::inlineFrame == frameType) ||
+ (nsGkAtoms::lineFrame == frameType) ||
+ (nsGkAtoms::positionedInlineFrame == frameType)) {
@@ -13210,3 +13205,3 @@ nsCSSFrameConstructor::WipeContainingBlo
- if ((frameType != nsLayoutAtoms::inlineFrame &&
- frameType != nsLayoutAtoms::positionedInlineFrame &&
- frameType != nsLayoutAtoms::lineFrame) ||
+ if ((frameType != nsGkAtoms::inlineFrame &&
+ frameType != nsGkAtoms::positionedInlineFrame &&
+ frameType != nsGkAtoms::lineFrame) ||
@@ -13353 +13348 @@ nsresult nsCSSFrameConstructor::RemoveFi
- fixedChild = mFixedContainingBlock->GetFirstChild(nsLayoutAtoms::fixedList);
+ fixedChild = mFixedContainingBlock->GetFirstChild(nsGkAtoms::fixedList);
@@ -13361 +13356 @@ nsresult nsCSSFrameConstructor::RemoveFi
- nsLayoutAtoms::placeholderFrame,
+ nsGkAtoms::placeholderFrame,
@@ -13376 +13371 @@ nsresult nsCSSFrameConstructor::RemoveFi
- nsLayoutAtoms::fixedList,
+ nsGkAtoms::fixedList,
Index: mozilla/layout/base/nsCSSRendering.cpp
===================================================================
RCS file: /cvsroot/mozilla/layout/base/nsCSSRendering.cpp,v
retrieving revision 3.290
diff -u -p -0 -r3.290 nsCSSRendering.cpp
--- mozilla/layout/base/nsCSSRendering.cpp 19 Sep 2006 22:05:32 -0000 3.290
+++ mozilla/layout/base/nsCSSRendering.cpp 3 Oct 2006 22:57:03 -0000
@@ -55 +54,0 @@
-#include "nsLayoutAtoms.h"
@@ -60 +58,0 @@
-#include "nsHTMLAtoms.h"
@@ -1590,2 +1588,2 @@ PRBool GetBGColorForHTMLElement( nsPresC
- if (tag == nsHTMLAtoms::html ||
- tag == nsHTMLAtoms::body) {
+ if (tag == nsGkAtoms::html ||
+ tag == nsGkAtoms::body) {
@@ -2509 +2507 @@ GetRootScrollableFrame(nsPresContext* aP
- if (nsLayoutAtoms::viewportFrame == aRootFrame->GetType()) {
+ if (nsGkAtoms::viewportFrame == aRootFrame->GetType()) {
@@ -2513 +2511 @@ GetRootScrollableFrame(nsPresContext* aP
- if (nsLayoutAtoms::scrollFrame == childFrame->GetType()) {
+ if (nsGkAtoms::scrollFrame == childFrame->GetType()) {
@@ -2600,4 +2598,4 @@ IsCanvasFrame(nsIFrame *aFrame)
- if (frameType == nsLayoutAtoms::canvasFrame ||
- frameType == nsLayoutAtoms::rootFrame ||
- frameType == nsLayoutAtoms::pageFrame ||
- frameType == nsLayoutAtoms::pageContentFrame) {
+ if (frameType == nsGkAtoms::canvasFrame ||
+ frameType == nsGkAtoms::rootFrame ||
+ frameType == nsGkAtoms::pageFrame ||
+ frameType == nsGkAtoms::pageContentFrame) {
@@ -2605 +2603 @@ IsCanvasFrame(nsIFrame *aFrame)
- } else if (frameType == nsLayoutAtoms::viewportFrame) {
+ } else if (frameType == nsGkAtoms::viewportFrame) {
@@ -2626 +2624 @@ FindCanvasBackground(nsIFrame* aForFrame
- if (firstChild->GetType() == nsLayoutAtoms::pageContentFrame) {
+ if (firstChild->GetType() == nsGkAtoms::pageContentFrame) {
@@ -2709 +2707 @@ FindElementBackground(nsIFrame* aForFram
- if (content->Tag() != nsHTMLAtoms::body)
+ if (content->Tag() != nsGkAtoms::body)
@@ -2981,2 +2979,2 @@ nsCSSRendering::PaintBackgroundWithSC(ns
- if (frameType == nsLayoutAtoms::inlineFrame ||
- frameType == nsLayoutAtoms::positionedInlineFrame) {
+ if (frameType == nsGkAtoms::inlineFrame ||
+ frameType == nsGkAtoms::positionedInlineFrame) {
@@ -3129 +3127 @@ nsCSSRendering::PaintBackgroundWithSC(ns
- if (frameType == nsLayoutAtoms::canvasFrame) {
+ if (frameType == nsGkAtoms::canvasFrame) {
Index: mozilla/layout/base/nsFrameManager.cpp
===================================================================
RCS file: /cvsroot/mozilla/layout/base/nsFrameManager.cpp,v
retrieving revision 1.233
diff -u -p -0 -r1.233 nsFrameManager.cpp
--- mozilla/layout/base/nsFrameManager.cpp 12 May 2006 20:36:39 -0000 1.233
+++ mozilla/layout/base/nsFrameManager.cpp 3 Oct 2006 22:57:03 -0000
@@ -62 +61,0 @@
-#include "nsLayoutAtoms.h"
@@ -65 +63,0 @@
-#include "nsHTMLAtoms.h"
@@ -314 +312 @@ nsFrameManager::GetCanvasFrame()
- if (siblingFrame->GetType() == nsLayoutAtoms::canvasFrame) {
+ if (siblingFrame->GetType() == nsGkAtoms::canvasFrame) {
@@ -484 +482 @@ nsFrameManager::RegisterPlaceholderFrame
- NS_PRECONDITION(nsLayoutAtoms::placeholderFrame == aPlaceholderFrame->GetType(),
+ NS_PRECONDITION(nsGkAtoms::placeholderFrame == aPlaceholderFrame->GetType(),
@@ -510 +508 @@ nsFrameManager::UnregisterPlaceholderFra
- NS_PRECONDITION(nsLayoutAtoms::placeholderFrame == aPlaceholderFrame->GetType(),
+ NS_PRECONDITION(nsGkAtoms::placeholderFrame == aPlaceholderFrame->GetType(),
@@ -844 +842 @@ VerifyStyleTree(nsPresContext* aPresCont
- if (nsLayoutAtoms::placeholderFrame == child->GetType()) {
+ if (nsGkAtoms::placeholderFrame == child->GetType()) {
@@ -934 +932 @@ nsFrameManager::ReParentStyleContext(nsI
- if (nsLayoutAtoms::placeholderFrame == child->GetType()) {
+ if (nsGkAtoms::placeholderFrame == child->GetType()) {
@@ -1287 +1285 @@ nsFrameManager::ReResolveStyleContext(ns
- if (nsLayoutAtoms::placeholderFrame == child->GetType()) { // placeholder
+ if (nsGkAtoms::placeholderFrame == child->GetType()) { // placeholder
@@ -1387 +1385 @@ nsFrameManager::ComputeStyleChangeFor(ns
- propTable->GetProperty(frame2, nsLayoutAtoms::IBSplitSpecialSibling));
+ propTable->GetProperty(frame2, nsGkAtoms::IBSplitSpecialSibling));
@@ -1404 +1402 @@ nsFrameManager::HasAttributeDependentSty
- if (aAttribute == nsHTMLAtoms::style) {
+ if (aAttribute == nsGkAtoms::style) {
Index: mozilla/layout/base/nsLayoutAtoms.h
===================================================================
RCS file: /cvsroot/mozilla/layout/base/nsLayoutAtoms.h,v
retrieving revision 1.27
diff -u -p -0 -r1.27 nsLayoutAtoms.h
--- mozilla/layout/base/nsLayoutAtoms.h 30 Mar 2006 05:56:30 -0000 1.27
+++ mozilla/layout/base/nsLayoutAtoms.h 3 Oct 2006 22:57:03 -0000
@@ -40,2 +40,2 @@
-#ifndef nsLayoutAtoms_h___
-#define nsLayoutAtoms_h___
+#ifndef nsGkAtoms_h___
+#define nsGkAtoms_h___
@@ -43,2 +43 @@
-#include "nsGkAtoms.h"
-typedef class nsGkAtoms nsLayoutAtoms;
+typedef class nsGkAtoms nsGkAtoms;
@@ -47,2 +46,2 @@ static inline PRBool IS_TABLE_CELL(nsIAt
- return nsLayoutAtoms::tableCellFrame == frameType ||
- nsLayoutAtoms::bcTableCellFrame == frameType;
+ return nsGkAtoms::tableCellFrame == frameType ||
+ nsGkAtoms::bcTableCellFrame == frameType;
@@ -51 +50 @@ static inline PRBool IS_TABLE_CELL(nsIAt
-#endif /* nsLayoutAtoms_h___ */
+#endif /* nsGkAtoms_h___ */
Index: mozilla/layout/base/nsPresShell.cpp
===================================================================
RCS file: /cvsroot/mozilla/layout/base/nsPresShell.cpp,v
retrieving revision 3.938
diff -u -p -0 -r3.938 nsPresShell.cpp
--- mozilla/layout/base/nsPresShell.cpp 26 Sep 2006 22:29:59 -0000 3.938
+++ mozilla/layout/base/nsPresShell.cpp 3 Oct 2006 22:57:06 -0000
@@ -94 +93,0 @@
-#include "nsLayoutAtoms.h"
@@ -101 +99,0 @@
-#include "nsHTMLAtoms.h"
@@ -2398 +2396 @@ PresShell::SetPrefNoScriptRule()
- nsLayoutAtoms::scriptEnabledBeforePrintPreview)));
+ nsGkAtoms::scriptEnabledBeforePrintPreview)));
@@ -3436 +3434 @@ PresShell::CompleteMove(PRBool aForward,
- if (frameType != nsLayoutAtoms::areaFrame)
+ if (frameType != nsGkAtoms::areaFrame)
@@ -3442 +3440 @@ PresShell::CompleteMove(PRBool aForward,
- }while(frameType != nsLayoutAtoms::areaFrame);
+ }while(frameType != nsGkAtoms::areaFrame);
@@ -3585 +3583 @@ nsIPresShell::GetRootScrollFrame() const
- if (!rootFrame || nsLayoutAtoms::viewportFrame != rootFrame->GetType())
+ if (!rootFrame || nsGkAtoms::viewportFrame != rootFrame->GetType())
@@ -3588 +3586 @@ nsIPresShell::GetRootScrollFrame() const
- if (!theFrame || nsLayoutAtoms::scrollFrame != theFrame->GetType())
+ if (!theFrame || nsGkAtoms::scrollFrame != theFrame->GetType())
@@ -4070 +4068 @@ PresShell::GoToAnchor(const nsAString& a
- if (content->Tag() == nsHTMLAtoms::a &&
+ if (content->Tag() == nsGkAtoms::a &&
@@ -4435 +4433 @@ PresShell::ScrollFrameIntoView(nsIFrame
- (frameType = frame->GetType()) == nsLayoutAtoms::inlineFrame) {
+ (frameType = frame->GetType()) == nsGkAtoms::inlineFrame) {
@@ -4442 +4440 @@ PresShell::ScrollFrameIntoView(nsIFrame
- frameType == nsLayoutAtoms::blockFrame) {
+ frameType == nsGkAtoms::blockFrame) {
@@ -6831 +6829 @@ ReframeImageBoxes(nsIFrame *aFrame, void
- if (aFrame->GetType() == nsLayoutAtoms::imageBoxFrame) {
+ if (aFrame->GetType() == nsGkAtoms::imageBoxFrame) {
@@ -7116 +7114 @@ CompareTrees(nsPresContext* aFirstPresCo
- k1->GetProperty(nsLayoutAtoms::spaceManagerProperty));
+ k1->GetProperty(nsGkAtoms::spaceManagerProperty));
@@ -7120 +7118 @@ CompareTrees(nsPresContext* aFirstPresCo
- k2->GetProperty(nsLayoutAtoms::spaceManagerProperty));
+ k2->GetProperty(nsGkAtoms::spaceManagerProperty));
Index: mozilla/layout/forms/nsComboboxControlFrame.cpp
===================================================================
RCS file: /cvsroot/mozilla/layout/forms/nsComboboxControlFrame.cpp,v
retrieving revision 1.376
diff -u -p -0 -r1.376 nsComboboxControlFrame.cpp
--- mozilla/layout/forms/nsComboboxControlFrame.cpp 30 Sep 2006 05:07:49 -0000 1.376
+++ mozilla/layout/forms/nsComboboxControlFrame.cpp 3 Oct 2006 22:57:07 -0000
@@ -46 +45,0 @@
-#include "nsHTMLAtoms.h"
@@ -51 +49,0 @@
-#include "nsLayoutAtoms.h"
@@ -524 +522 @@ nsComboboxControlFrame::SetButtonFrameSi
- if (mButtonFrame->GetType() == nsLayoutAtoms::gfxButtonControlFrame) {
+ if (mButtonFrame->GetType() == nsGkAtoms::gfxButtonControlFrame) {
@@ -1498 +1496 @@ nsComboboxControlFrame::ShowDropDown(PRB
- if (mContent->HasAttr(kNameSpaceID_None, nsHTMLAtoms::disabled)) {
+ if (mContent->HasAttr(kNameSpaceID_None, nsGkAtoms::disabled)) {
@@ -1719 +1717 @@ nsComboboxControlFrame::HandleEvent(nsPr
- if (mContent->HasAttr(kNameSpaceID_None, nsHTMLAtoms::disabled)) {
+ if (mContent->HasAttr(kNameSpaceID_None, nsGkAtoms::disabled)) {
@@ -1805 +1803 @@ nsComboboxControlFrame::CreateAnonymousC
- nimgr->GetNodeInfo(nsHTMLAtoms::input, nsnull, kNameSpaceID_None,
+ nimgr->GetNodeInfo(nsGkAtoms::input, nsnull, kNameSpaceID_None,
@@ -1823 +1821 @@ nsComboboxControlFrame::CreateAnonymousC
- btnContent->SetAttr(kNameSpaceID_None, nsHTMLAtoms::type, NS_LITERAL_STRING("button"), PR_FALSE);
+ btnContent->SetAttr(kNameSpaceID_None, nsGkAtoms::type, NS_LITERAL_STRING("button"), PR_FALSE);
@@ -1825 +1823 @@ nsComboboxControlFrame::CreateAnonymousC
- btnContent->SetAttr(kNameSpaceID_None, nsHTMLAtoms::tabindex,
+ btnContent->SetAttr(kNameSpaceID_None, nsGkAtoms::tabindex,
@@ -1937 +1935 @@ nsComboboxControlFrame::GetFirstChild(ns
- if (nsLayoutAtoms::popupList == aListName) {
+ if (nsGkAtoms::popupList == aListName) {
@@ -1948 +1946 @@ nsComboboxControlFrame::SetInitialChildL
- if (nsLayoutAtoms::popupList == aListName) {
+ if (nsGkAtoms::popupList == aListName) {
@@ -1978 +1976 @@ nsComboboxControlFrame::GetAdditionalChi
- return nsLayoutAtoms::popupList;
+ return nsGkAtoms::popupList;
@@ -2090 +2088 @@ void nsComboboxControlFrame::PaintFocus(
- if (!mContent->HasAttr(kNameSpaceID_None, nsHTMLAtoms::disabled) &&
+ if (!mContent->HasAttr(kNameSpaceID_None, nsGkAtoms::disabled) &&
Index: mozilla/layout/forms/nsFieldSetFrame.cpp
===================================================================
RCS file: /cvsroot/mozilla/layout/forms/nsFieldSetFrame.cpp,v
retrieving revision 3.151
diff -u -p -0 -r3.151 nsFieldSetFrame.cpp
--- mozilla/layout/forms/nsFieldSetFrame.cpp 19 Sep 2006 04:26:19 -0000 3.151
+++ mozilla/layout/forms/nsFieldSetFrame.cpp 3 Oct 2006 22:57:07 -0000
@@ -55,2 +54,0 @@
-#include "nsHTMLAtoms.h"
-#include "nsLayoutAtoms.h"
@@ -138 +136 @@ nsFieldSetFrame::GetType() const
- return nsLayoutAtoms::fieldSetFrame;
+ return nsGkAtoms::fieldSetFrame;
@@ -682 +680 @@ nsFieldSetFrame::MaybeSetLegend(nsIFrame
- if (!mLegendFrame && aFrameList->GetType() == nsLayoutAtoms::legendFrame) {
+ if (!mLegendFrame && aFrameList->GetType() == nsGkAtoms::legendFrame) {
Index: mozilla/layout/forms/nsGfxButtonControlFrame.cpp
===================================================================
RCS file: /cvsroot/mozilla/layout/forms/nsGfxButtonControlFrame.cpp,v
retrieving revision 1.135
diff -u -p -0 -r1.135 nsGfxButtonControlFrame.cpp
--- mozilla/layout/forms/nsGfxButtonControlFrame.cpp 19 Jul 2006 04:32:57 -0000 1.135
+++ mozilla/layout/forms/nsGfxButtonControlFrame.cpp 3 Oct 2006 22:57:07 -0000
@@ -50 +49,0 @@
-#include "nsLayoutAtoms.h"
@@ -55 +53,0 @@
-#include "nsHTMLAtoms.h"
@@ -80 +78 @@ nsGfxButtonControlFrame::GetType() const
- return nsLayoutAtoms::gfxButtonControlFrame;
+ return nsGkAtoms::gfxButtonControlFrame;
@@ -287 +285 @@ nsGfxButtonControlFrame::AttributeChange
- if (nsHTMLAtoms::value == aAttribute) {
+ if (nsGkAtoms::value == aAttribute) {
Index: mozilla/layout/forms/nsHTMLButtonControlFrame.cpp
===================================================================
RCS file: /cvsroot/mozilla/layout/forms/nsHTMLButtonControlFrame.cpp,v
retrieving revision 3.209
diff -u -p -0 -r3.209 nsHTMLButtonControlFrame.cpp
--- mozilla/layout/forms/nsHTMLButtonControlFrame.cpp 6 Jul 2006 10:43:51 -0000 3.209
+++ mozilla/layout/forms/nsHTMLButtonControlFrame.cpp 3 Oct 2006 22:57:08 -0000
@@ -53 +52,0 @@
-#include "nsHTMLAtoms.h"
@@ -73 +71,0 @@
-#include "nsLayoutAtoms.h"
@@ -161 +159 @@ nsHTMLButtonControlFrame::GetType() cons
- return nsLayoutAtoms::HTMLButtonControlFrame;
+ return nsGkAtoms::HTMLButtonControlFrame;
@@ -457,2 +455,2 @@ nsresult nsHTMLButtonControlFrame::SetFo
- if (nsHTMLAtoms::value == aName) {
- return mContent->SetAttr(kNameSpaceID_None, nsHTMLAtoms::value,
+ if (nsGkAtoms::value == aName) {
+ return mContent->SetAttr(kNameSpaceID_None, nsGkAtoms::value,
@@ -466,2 +464,2 @@ nsresult nsHTMLButtonControlFrame::GetFo
- if (nsHTMLAtoms::value == aName)
- mContent->GetAttr(kNameSpaceID_None, nsHTMLAtoms::value, aValue);
+ if (nsGkAtoms::value == aName)
+ mContent->GetAttr(kNameSpaceID_None, nsGkAtoms::value, aValue);
Index: mozilla/layout/forms/nsImageControlFrame.cpp
===================================================================
RCS file: /cvsroot/mozilla/layout/forms/nsImageControlFrame.cpp,v
retrieving revision 3.113
diff -u -p -0 -r3.113 nsImageControlFrame.cpp
--- mozilla/layout/forms/nsImageControlFrame.cpp 6 Jul 2006 10:43:51 -0000 3.113
+++ mozilla/layout/forms/nsImageControlFrame.cpp 3 Oct 2006 22:57:08 -0000
@@ -50 +49,0 @@
-#include "nsHTMLAtoms.h"
@@ -57 +55,0 @@
-#include "nsLayoutAtoms.h"
@@ -166 +164 @@ NS_IMETHODIMP nsImageControlFrame::GetAc
- if (mContent->Tag() == nsHTMLAtoms::button) {
+ if (mContent->Tag() == nsGkAtoms::button) {
@@ -169 +167 @@ NS_IMETHODIMP nsImageControlFrame::GetAc
- else if (mContent->Tag() == nsHTMLAtoms::input) {
+ else if (mContent->Tag() == nsGkAtoms::input) {
@@ -193 +191 @@ nsImageControlFrame::GetType() const
- return nsLayoutAtoms::imageControlFrame;
+ return nsGkAtoms::imageControlFrame;
@@ -227 +225 @@ nsImageControlFrame::HandleEvent(nsPresC
- if (mContent->HasAttr(kNameSpaceID_None, nsHTMLAtoms::disabled)) { // XXX cache disabled
+ if (mContent->HasAttr(kNameSpaceID_None, nsGkAtoms::disabled)) { // XXX cache disabled
Index: mozilla/layout/forms/nsLegendFrame.cpp
===================================================================
RCS file: /cvsroot/mozilla/layout/forms/nsLegendFrame.cpp,v
retrieving revision 3.65
diff -u -p -0 -r3.65 nsLegendFrame.cpp
--- mozilla/layout/forms/nsLegendFrame.cpp 10 Apr 2006 00:16:16 -0000 3.65
+++ mozilla/layout/forms/nsLegendFrame.cpp 3 Oct 2006 22:57:08 -0000
@@ -50,2 +49,0 @@
-#include "nsHTMLAtoms.h"
-#include "nsLayoutAtoms.h"
@@ -71 +69 @@ nsLegendFrame::GetType() const
- return nsLayoutAtoms::legendFrame;
+ return nsGkAtoms::legendFrame;
@@ -124 +122 @@ PRInt32 nsLegendFrame::GetAlign()
- const nsAttrValue* attr = content->GetParsedAttr(nsHTMLAtoms::align);
+ const nsAttrValue* attr = content->GetParsedAttr(nsGkAtoms::align);
Index: mozilla/layout/forms/nsListControlFrame.cpp
===================================================================
RCS file: /cvsroot/mozilla/layout/forms/nsListControlFrame.cpp,v
retrieving revision 1.408
diff -u -p -0 -r1.408 nsListControlFrame.cpp
--- mozilla/layout/forms/nsListControlFrame.cpp 30 Sep 2006 05:07:49 -0000 1.408
+++ mozilla/layout/forms/nsListControlFrame.cpp 3 Oct 2006 22:57:09 -0000
@@ -46 +45,0 @@
-#include "nsHTMLAtoms.h"
@@ -75 +73,0 @@
-#include "nsLayoutAtoms.h"
@@ -582 +580 @@ IsOptGroup(nsIContent *aContent)
- return (aContent->NodeInfo()->Equals(nsHTMLAtoms::optgroup) &&
+ return (aContent->NodeInfo()->Equals(nsGkAtoms::optgroup) &&
@@ -589 +587 @@ IsOption(nsIContent *aContent)
- return (aContent->NodeInfo()->Equals(nsHTMLAtoms::option) &&
+ return (aContent->NodeInfo()->Equals(nsGkAtoms::option) &&
@@ -1391 +1389 @@ nsListControlFrame::HandleEvent(nsPresCo
- if (mContent->HasAttr(kNameSpaceID_None, nsHTMLAtoms::disabled))
+ if (mContent->HasAttr(kNameSpaceID_None, nsGkAtoms::disabled))
@@ -2037 +2035 @@ nsListControlFrame::SetFormProperty(nsIA
- if (nsHTMLAtoms::selected == aName) {
+ if (nsGkAtoms::selected == aName) {
@@ -2039 +2037 @@ nsListControlFrame::SetFormProperty(nsIA
- } else if (nsHTMLAtoms::selectedindex == aName) {
+ } else if (nsGkAtoms::selectedindex == aName) {
@@ -2055 +2053 @@ nsListControlFrame::GetFormProperty(nsIA
- if (nsHTMLAtoms::selected == aName) {
+ if (nsGkAtoms::selected == aName) {
@@ -2066 +2064 @@ nsListControlFrame::GetFormProperty(nsIA
- } else if (nsHTMLAtoms::selectedindex == aName) {
+ } else if (nsGkAtoms::selectedindex == aName) {
@@ -2156 +2154 @@ nsListControlFrame::GetType() const
- return nsLayoutAtoms::listControlFrame;
+ return nsGkAtoms::listControlFrame;
@@ -2268 +2266 @@ nsListControlFrame::MouseUp(nsIDOMEvent*
- if (mContent->HasAttr(kNameSpaceID_None, nsHTMLAtoms::disabled)) {
+ if (mContent->HasAttr(kNameSpaceID_None, nsGkAtoms::disabled)) {
@@ -2517 +2515 @@ nsListControlFrame::MouseDown(nsIDOMEven
- if (mContent->HasAttr(kNameSpaceID_None, nsHTMLAtoms::disabled)) {
+ if (mContent->HasAttr(kNameSpaceID_None, nsGkAtoms::disabled)) {
@@ -2847 +2845 @@ nsListControlFrame::KeyPress(nsIDOMEvent
- if (mContent->HasAttr(kNameSpaceID_None, nsHTMLAtoms::disabled))
+ if (mContent->HasAttr(kNameSpaceID_None, nsGkAtoms::disabled))
Index: mozilla/layout/forms/nsSelectsAreaFrame.cpp
===================================================================
RCS file: /cvsroot/mozilla/layout/forms/nsSelectsAreaFrame.cpp,v
retrieving revision 1.24
diff -u -p -0 -r1.24 nsSelectsAreaFrame.cpp
--- mozilla/layout/forms/nsSelectsAreaFrame.cpp 18 Apr 2006 02:41:42 -0000 1.24
+++ mozilla/layout/forms/nsSelectsAreaFrame.cpp 3 Oct 2006 22:57:09 -0000
@@ -164 +164 @@ static nsListControlFrame* GetEnclosingL
- if (frame->GetType() == nsLayoutAtoms::listControlFrame)
+ if (frame->GetType() == nsGkAtoms::listControlFrame)
Index: mozilla/layout/forms/nsTextControlFrame.cpp
===================================================================
RCS file: /cvsroot/mozilla/layout/forms/nsTextControlFrame.cpp,v
retrieving revision 3.233
diff -u -p -0 -r3.233 nsTextControlFrame.cpp
--- mozilla/layout/forms/nsTextControlFrame.cpp 14 Sep 2006 00:54:44 -0000 3.233
+++ mozilla/layout/forms/nsTextControlFrame.cpp 3 Oct 2006 22:57:10 -0000
@@ -77 +76,0 @@
-#include "nsHTMLAtoms.h"
@@ -89 +87,0 @@
-#include "nsLayoutAtoms.h" //getframetype
@@ -174 +172 @@ GetWrapPropertyEnum(nsIContent* aContent
- {&nsHTMLAtoms::HARD, &nsHTMLAtoms::OFF, nsnull};
+ {&nsGkAtoms::HARD, &nsGkAtoms::OFF, nsnull};
@@ -176 +174 @@ GetWrapPropertyEnum(nsIContent* aContent
- switch (aContent->FindAttrValueIn(kNameSpaceID_None, nsHTMLAtoms::wrap,
+ switch (aContent->FindAttrValueIn(kNameSpaceID_None, nsGkAtoms::wrap,
@@ -913 +911 @@ nsTextInputSelectionImpl::CompleteMove(P
- if (child->Tag() == nsHTMLAtoms::br)
+ if (child->Tag() == nsGkAtoms::br)
@@ -1212 +1210 @@ nsTextControlFrame::GetType() const
- return nsLayoutAtoms::textInputFrame;
+ return nsGkAtoms::textInputFrame;
@@ -1228 +1226 @@ PRBool nsTextControlFrame::IsTextArea()
- return mContent && mContent->Tag() == nsHTMLAtoms::textarea;
+ return mContent && mContent->Tag() == nsGkAtoms::textarea;
@@ -1252 +1250 @@ nsTextControlFrame::GetCols()
- const nsAttrValue* attr = content->GetParsedAttr(nsHTMLAtoms::cols);
+ const nsAttrValue* attr = content->GetParsedAttr(nsGkAtoms::cols);
@@ -1261 +1259 @@ nsTextControlFrame::GetCols()
- const nsAttrValue* attr = content->GetParsedAttr(nsHTMLAtoms::size);
+ const nsAttrValue* attr = content->GetParsedAttr(nsGkAtoms::size);
@@ -1282 +1280 @@ nsTextControlFrame::GetRows()
- const nsAttrValue* attr = content->GetParsedAttr(nsHTMLAtoms::rows);
+ const nsAttrValue* attr = content->GetParsedAttr(nsGkAtoms::rows);
@@ -1602 +1600 @@ nsTextControlFrame::CreateFrameFor(nsPre
- if (mContent->HasAttr(kNameSpaceID_None, nsHTMLAtoms::readonly))
+ if (mContent->HasAttr(kNameSpaceID_None, nsGkAtoms::readonly))
@@ -1607 +1605 @@ nsTextControlFrame::CreateFrameFor(nsPre
- if (mContent->HasAttr(kNameSpaceID_None, nsHTMLAtoms::disabled))
+ if (mContent->HasAttr(kNameSpaceID_None, nsGkAtoms::disabled))
@@ -1737 +1735 @@ nsTextControlFrame::CreateAnonymousConte
- nsresult rv = doc->NodeInfoManager()->GetNodeInfo(nsHTMLAtoms::div, nsnull,
+ nsresult rv = doc->NodeInfoManager()->GetNodeInfo(nsGkAtoms::div, nsnull,
@@ -1762 +1760 @@ nsTextControlFrame::CreateAnonymousConte
- rv = divContent->SetAttr(kNameSpaceID_None, nsHTMLAtoms::_class,
+ rv = divContent->SetAttr(kNameSpaceID_None, nsGkAtoms::_class,
@@ -1773 +1771 @@ nsTextControlFrame::CreateAnonymousConte
- rv = divContent->SetAttr(kNameSpaceID_None, nsHTMLAtoms::style,
+ rv = divContent->SetAttr(kNameSpaceID_None, nsGkAtoms::style,
@@ -1782 +1780 @@ nsTextControlFrame::CreateAnonymousConte
- // rv = divContent->SetAttr(kNameSpaceID_None,nsXULAtoms::debug, NS_LITERAL_STRING("true"), PR_FALSE);
+ // rv = divContent->SetAttr(kNameSpaceID_None,nsGkAtoms::debug, NS_LITERAL_STRING("true"), PR_FALSE);
@@ -1964 +1962 @@ nsresult nsTextControlFrame::SetFormProp
- if (nsHTMLAtoms::value == aName)
+ if (nsGkAtoms::value == aName)
@@ -1973 +1971 @@ nsresult nsTextControlFrame::SetFormProp
- else if (nsHTMLAtoms::select == aName)
+ else if (nsGkAtoms::select == aName)
@@ -1996 +1994 @@ nsTextControlFrame::GetFormProperty(nsIA
- if (nsHTMLAtoms::value == aName) {
+ if (nsGkAtoms::value == aName) {
@@ -2082 +2080 @@ nsTextControlFrame::SelectAllContents()
- if (child->Tag() == nsHTMLAtoms::br)
+ if (child->Tag() == nsGkAtoms::br)
@@ -2422 +2420 @@ nsTextControlFrame::AttributeChanged(PRI
- if (nsHTMLAtoms::maxlength == aAttribute)
+ if (nsGkAtoms::maxlength == aAttribute)
@@ -2441 +2439 @@ nsTextControlFrame::AttributeChanged(PRI
- else if (nsHTMLAtoms::readonly == aAttribute)
+ else if (nsGkAtoms::readonly == aAttribute)
@@ -2445 +2443 @@ nsTextControlFrame::AttributeChanged(PRI
- if (AttributeExists(nsHTMLAtoms::readonly))
+ if (AttributeExists(nsGkAtoms::readonly))
@@ -2460 +2458 @@ nsTextControlFrame::AttributeChanged(PRI
- else if (mEditor && nsHTMLAtoms::disabled == aAttribute)
+ else if (mEditor && nsGkAtoms::disabled == aAttribute)
@@ -2464 +2462 @@ nsTextControlFrame::AttributeChanged(PRI
- if (AttributeExists(nsHTMLAtoms::disabled))
+ if (AttributeExists(nsGkAtoms::disabled))
@@ -2544 +2542 @@ nsTextControlFrame::GetMaxLength(PRInt32
- const nsAttrValue* attr = content->GetParsedAttr(nsHTMLAtoms::maxlength);
+ const nsAttrValue* attr = content->GetParsedAttr(nsGkAtoms::maxlength);
Index: mozilla/layout/generic/nsAbsoluteContainingBlock.h
===================================================================
RCS file: /cvsroot/mozilla/layout/generic/nsAbsoluteContainingBlock.h,v
retrieving revision 1.31
diff -u -p -0 -r1.31 nsAbsoluteContainingBlock.h
--- mozilla/layout/generic/nsAbsoluteContainingBlock.h 10 Apr 2006 00:16:17 -0000 1.31
+++ mozilla/layout/generic/nsAbsoluteContainingBlock.h 3 Oct 2006 22:57:10 -0000
@@ -48 +47,0 @@
-#include "nsLayoutAtoms.h"
@@ -63 +62 @@ class nsPresContext;
- * @see nsLayoutAtoms::absoluteList
+ * @see nsGkAtoms::absoluteList
@@ -72 +71 @@ public:
- virtual nsIAtom* GetChildListName() const { return nsLayoutAtoms::absoluteList; }
+ virtual nsIAtom* GetChildListName() const { return nsGkAtoms::absoluteList; }
Index: mozilla/layout/generic/nsAreaFrame.cpp
===================================================================
RCS file: /cvsroot/mozilla/layout/generic/nsAreaFrame.cpp,v
retrieving revision 1.102
diff -u -p -0 -r1.102 nsAreaFrame.cpp
--- mozilla/layout/generic/nsAreaFrame.cpp 10 Apr 2006 00:16:17 -0000 1.102
+++ mozilla/layout/generic/nsAreaFrame.cpp 3 Oct 2006 22:57:10 -0000
@@ -47 +46,0 @@
-#include "nsHTMLAtoms.h"
@@ -50 +48,0 @@
-#include "nsLayoutAtoms.h"
@@ -54 +51,0 @@
-#include "nsXULAtoms.h"
@@ -84 +81 @@ nsAreaFrame::RegUnregAccessKey(PRBool aD
- if (!mContent->NodeInfo()->Equals(nsXULAtoms::label, kNameSpaceID_XUL))
+ if (!mContent->NodeInfo()->Equals(nsGkAtoms::label, kNameSpaceID_XUL))
@@ -92 +89 @@ nsAreaFrame::RegUnregAccessKey(PRBool aD
- if (!mContent->HasAttr(kNameSpaceID_None, nsXULAtoms::control))
+ if (!mContent->HasAttr(kNameSpaceID_None, nsGkAtoms::control))
@@ -96 +93 @@ nsAreaFrame::RegUnregAccessKey(PRBool aD
- mContent->GetAttr(kNameSpaceID_None, nsXULAtoms::accesskey, accessKey);
+ mContent->GetAttr(kNameSpaceID_None, nsGkAtoms::accesskey, accessKey);
@@ -151 +148 @@ nsAreaFrame::AttributeChanged(PRInt32 aN
- if (aAttribute == nsXULAtoms::accesskey || aAttribute == nsXULAtoms::control)
+ if (aAttribute == nsGkAtoms::accesskey || aAttribute == nsGkAtoms::control)
@@ -161 +158 @@ nsAreaFrame::GetType() const
- return nsLayoutAtoms::areaFrame;
+ return nsGkAtoms::areaFrame;
Index: mozilla/layout/generic/nsBRFrame.cpp
===================================================================
RCS file: /cvsroot/mozilla/layout/generic/nsBRFrame.cpp,v
retrieving revision 1.64
diff -u -p -0 -r1.64 nsBRFrame.cpp
--- mozilla/layout/generic/nsBRFrame.cpp 11 Sep 2006 20:42:59 -0000 1.64
+++ mozilla/layout/generic/nsBRFrame.cpp 3 Oct 2006 22:57:10 -0000
@@ -46 +45,0 @@
-#include "nsHTMLAtoms.h"
@@ -49 +47,0 @@
-#include "nsLayoutAtoms.h"
@@ -197 +195 @@ BRFrame::GetType() const
- return nsLayoutAtoms::brFrame;
+ return nsGkAtoms::brFrame;
Index: mozilla/layout/generic/nsBidiFrames.cpp
===================================================================
RCS file: /cvsroot/mozilla/layout/generic/nsBidiFrames.cpp,v
retrieving revision 1.11
diff -u -p -0 -r1.11 nsBidiFrames.cpp
--- mozilla/layout/generic/nsBidiFrames.cpp 26 Mar 2006 21:30:30 -0000 1.11
+++ mozilla/layout/generic/nsBidiFrames.cpp 3 Oct 2006 22:57:10 -0000
@@ -42 +41,0 @@
-#include "nsLayoutAtoms.h"
@@ -63 +62 @@ nsDirectionalFrame::GetChar(void) const
- * @see nsLayoutAtoms::directionalFrame
+ * @see nsGkAtoms::directionalFrame
@@ -68 +67 @@ nsDirectionalFrame::GetType() const
- return nsLayoutAtoms::directionalFrame;
+ return nsGkAtoms::directionalFrame;
Index: mozilla/layout/generic/nsBlockFrame.cpp
===================================================================
RCS file: /cvsroot/mozilla/layout/generic/nsBlockFrame.cpp,v
retrieving revision 3.792
diff -u -p -0 -r3.792 nsBlockFrame.cpp
--- mozilla/layout/generic/nsBlockFrame.cpp 22 Sep 2006 01:53:13 -0000 3.792
+++ mozilla/layout/generic/nsBlockFrame.cpp 3 Oct 2006 22:57:13 -0000
@@ -68 +67,0 @@
-#include "nsHTMLAtoms.h"
@@ -72 +70,0 @@
-#include "nsLayoutAtoms.h"
@@ -480 +478 @@ nsBlockFrame::GetType() const
- return nsLayoutAtoms::blockFrame;
+ return nsGkAtoms::blockFrame;
@@ -519 +517 @@ nsBlockFrame::GetFirstChild(nsIAtom* aLi
- else if (aListName == nsLayoutAtoms::overflowList) {
+ else if (aListName == nsGkAtoms::overflowList) {
@@ -523 +521 @@ nsBlockFrame::GetFirstChild(nsIAtom* aLi
- else if (aListName == nsLayoutAtoms::overflowOutOfFlowList) {
+ else if (aListName == nsGkAtoms::overflowOutOfFlowList) {
@@ -526 +524 @@ nsBlockFrame::GetFirstChild(nsIAtom* aLi
- else if (aListName == nsLayoutAtoms::floatList) {
+ else if (aListName == nsGkAtoms::floatList) {
@@ -529 +527 @@ nsBlockFrame::GetFirstChild(nsIAtom* aLi
- else if (aListName == nsLayoutAtoms::bulletList) {
+ else if (aListName == nsGkAtoms::bulletList) {
@@ -542 +540 @@ nsBlockFrame::GetAdditionalChildListName
- return nsLayoutAtoms::floatList;
+ return nsGkAtoms::floatList;
@@ -544 +542 @@ nsBlockFrame::GetAdditionalChildListName
- return nsLayoutAtoms::bulletList;
+ return nsGkAtoms::bulletList;
@@ -546 +544 @@ nsBlockFrame::GetAdditionalChildListName
- return nsLayoutAtoms::overflowList;
+ return nsGkAtoms::overflowList;
@@ -548 +546 @@ nsBlockFrame::GetAdditionalChildListName
- return nsLayoutAtoms::overflowOutOfFlowList;
+ return nsGkAtoms::overflowOutOfFlowList;
@@ -571 +569 @@ static PRBool IsContinuationPlaceholder(
- nsLayoutAtoms::placeholderFrame == aFrame->GetType();
+ nsGkAtoms::placeholderFrame == aFrame->GetType();
@@ -934 +932 @@ nsBlockFrame::Reflow(nsPresContext*
- if ((nsLayoutAtoms::blockFrame == fType || nsLayoutAtoms::areaFrame == fType) &&
+ if ((nsGkAtoms::blockFrame == fType || nsGkAtoms::areaFrame == fType) &&
@@ -1040 +1038 @@ nsBlockFrame::Reflow(nsPresContext*
- rv = SetProperty(nsLayoutAtoms::spaceManagerProperty,
+ rv = SetProperty(nsGkAtoms::spaceManagerProperty,
@@ -1346,2 +1344,2 @@ nsBlockFrame::ComputeFinalSize(const nsH
- if (prs->frame->GetType() == nsLayoutAtoms::blockFrame ||
- prs->frame->GetType() == nsLayoutAtoms::areaFrame) {
+ if (prs->frame->GetType() == nsGkAtoms::blockFrame ||
+ prs->frame->GetType() == nsGkAtoms::areaFrame) {
@@ -3082 +3080 @@ nsBlockFrame::AttributeChanged(PRInt32
- if (nsHTMLAtoms::start == aAttribute) {
+ if (nsGkAtoms::start == aAttribute) {
@@ -3091 +3089 @@ nsBlockFrame::AttributeChanged(PRInt32
- else if (nsHTMLAtoms::value == aAttribute) {
+ else if (nsGkAtoms::value == aAttribute) {
@@ -3668,2 +3666,2 @@ nsBlockFrame::ReflowBlockFrame(nsBlockRe
- NS_ASSERTION(nifBlock->GetType() == nsLayoutAtoms::blockFrame
- || nifBlock->GetType() == nsLayoutAtoms::areaFrame,
+ NS_ASSERTION(nifBlock->GetType() == nsGkAtoms::blockFrame
+ || nifBlock->GetType() == nsGkAtoms::areaFrame,
@@ -4273 +4271 @@ nsBlockFrame::ReflowInlineFrame(nsBlockR
- rv = (nsLayoutAtoms::placeholderFrame == frameType)
+ rv = (nsGkAtoms::placeholderFrame == frameType)
@@ -4287 +4285 @@ nsBlockFrame::ReflowInlineFrame(nsBlockR
- nsLayoutAtoms::placeholderFrame != frameType;
+ nsGkAtoms::placeholderFrame != frameType;
@@ -4289,2 +4287,2 @@ nsBlockFrame::ReflowInlineFrame(nsBlockR
- if ((nsLayoutAtoms::inlineFrame == frameType) ||
- (nsLayoutAtoms::lineFrame == frameType)) {
+ if ((nsGkAtoms::inlineFrame == frameType) ||
+ (nsGkAtoms::lineFrame == frameType)) {
@@ -4314 +4312 @@ nsBlockFrame::ReflowInlineFrame(nsBlockR
- if (nsLayoutAtoms::placeholderFrame == aFrame->GetType()) {
+ if (nsGkAtoms::placeholderFrame == aFrame->GetType()) {
@@ -4907 +4905 @@ nsBlockFrame::HandleOverflowPlaceholders
- if (nsLayoutAtoms::placeholderFrame != aFrame->GetType()) {
+ if (nsGkAtoms::placeholderFrame != aFrame->GetType()) {
@@ -5269 +5267 @@ nsBlockFrame::GetOverflowLines() const
- GetProperty(nsLayoutAtoms::overflowLinesProperty));
+ GetProperty(nsGkAtoms::overflowLinesProperty));
@@ -5282 +5280 @@ nsBlockFrame::RemoveOverflowLines()
- UnsetProperty(nsLayoutAtoms::overflowLinesProperty));
+ UnsetProperty(nsGkAtoms::overflowLinesProperty));
@@ -5316 +5314 @@ nsBlockFrame::SetOverflowLines(nsLineLis
- SetProperty(this, nsLayoutAtoms::overflowLinesProperty, aOverflowLines,
+ SetProperty(this, nsGkAtoms::overflowLinesProperty, aOverflowLines,
@@ -5331 +5329 @@ nsBlockFrame::GetOverflowOutOfFlows() co
- GetProperty(nsLayoutAtoms::overflowOutOfFlowsProperty));
+ GetProperty(nsGkAtoms::overflowOutOfFlowsProperty));
@@ -5345 +5343 @@ nsBlockFrame::SetOverflowOutOfFlows(cons
- UnsetProperty(nsLayoutAtoms::overflowOutOfFlowsProperty));
+ UnsetProperty(nsGkAtoms::overflowOutOfFlowsProperty));
@@ -5349 +5347 @@ nsBlockFrame::SetOverflowOutOfFlows(cons
- SetProperty(nsLayoutAtoms::overflowOutOfFlowsProperty,
+ SetProperty(nsGkAtoms::overflowOutOfFlowsProperty,
@@ -5362 +5360 @@ nsBlockFrame::GetOverflowPlaceholders()
- GetProperty(nsLayoutAtoms::overflowPlaceholdersProperty));
+ GetProperty(nsGkAtoms::overflowPlaceholdersProperty));
@@ -5390 +5388 @@ nsBlockFrame::AppendFrames(nsIAtom* aLi
- else if (nsLayoutAtoms::floatList == aListName) {
+ else if (nsGkAtoms::floatList == aListName) {
@@ -5439 +5437 @@ nsBlockFrame::InsertFrames(nsIAtom* aLi
- else if (nsLayoutAtoms::floatList == aListName) {
+ else if (nsGkAtoms::floatList == aListName) {
@@ -5444 +5442 @@ nsBlockFrame::InsertFrames(nsIAtom* aLi
- else if (nsLayoutAtoms::nextBidi == aListName) {}
+ else if (nsGkAtoms::nextBidi == aListName) {}
@@ -5464 +5462 @@ nsBlockFrame::InsertFrames(nsIAtom* aLi
- if (aListName != nsLayoutAtoms::nextBidi)
+ if (aListName != nsGkAtoms::nextBidi)
@@ -5477 +5475 @@ ShouldPutNextSiblingOnNewLine(nsIFrame*
- if (type == nsLayoutAtoms::brFrame)
+ if (type == nsGkAtoms::brFrame)
@@ -5479 +5477 @@ ShouldPutNextSiblingOnNewLine(nsIFrame*
- if (type == nsLayoutAtoms::textFrame)
+ if (type == nsGkAtoms::textFrame)
@@ -5482 +5480 @@ ShouldPutNextSiblingOnNewLine(nsIFrame*
- if (type == nsLayoutAtoms::placeholderFrame)
+ if (type == nsGkAtoms::placeholderFrame)
@@ -5689 +5687 @@ static PRBool BlockHasAnyFloats(nsIFrame
- if (block->GetFirstChild(nsLayoutAtoms::floatList))
+ if (block->GetFirstChild(nsGkAtoms::floatList))
@@ -5725 +5723 @@ nsBlockFrame::RemoveFrame(nsIAtom* aLis
- else if (nsLayoutAtoms::floatList == aListName) {
+ else if (nsGkAtoms::floatList == aListName) {
@@ -5730 +5728 @@ nsBlockFrame::RemoveFrame(nsIAtom* aLis
- else if (nsLayoutAtoms::nextBidi == aListName) {
+ else if (nsGkAtoms::nextBidi == aListName) {
@@ -5799,2 +5797,2 @@ static nsresult RemoveBlockChild(nsIFram
- NS_ASSERTION(nextBlock->GetType() == nsLayoutAtoms::blockFrame ||
- nextBlock->GetType() == nsLayoutAtoms::areaFrame,
+ NS_ASSERTION(nextBlock->GetType() == nsGkAtoms::blockFrame ||
+ nextBlock->GetType() == nsGkAtoms::areaFrame,
@@ -5828 +5826 @@ nsBlockFrame::DoRemoveFrame(nsIFrame* aD
- PRBool isPlaceholder = nsLayoutAtoms::placeholderFrame == aDeletedFrame->GetType();
+ PRBool isPlaceholder = nsGkAtoms::placeholderFrame == aDeletedFrame->GetType();
@@ -6209 +6207 @@ nsBlockFrame::ReflowFloat(nsBlockReflowS
- if (floatFrame->GetType() == nsLayoutAtoms::letterFrame) {
+ if (floatFrame->GetType() == nsGkAtoms::letterFrame) {
@@ -6283 +6281 @@ nsBlockFrame::ReflowFloat(nsBlockReflowS
- if (nsLayoutAtoms::placeholderFrame == next->GetType()) {
+ if (nsGkAtoms::placeholderFrame == next->GetType()) {
@@ -6606 +6604 @@ NS_IMETHODIMP nsBlockFrame::GetAccessibl
- if (mContent->Tag() == nsHTMLAtoms::hr) {
+ if (mContent->Tag() == nsGkAtoms::hr) {
@@ -6658 +6656 @@ void nsBlockFrame::ClearLineCursor() {
- UnsetProperty(nsLayoutAtoms::lineCursorProperty);
+ UnsetProperty(nsGkAtoms::lineCursorProperty);
@@ -6668 +6666 @@ void nsBlockFrame::SetupLineCursor() {
- SetProperty(nsLayoutAtoms::lineCursorProperty,
+ SetProperty(nsGkAtoms::lineCursorProperty,
@@ -6679 +6677 @@ nsLineBox* nsBlockFrame::GetFirstLineCon
- GetProperty(nsLayoutAtoms::lineCursorProperty));
+ GetProperty(nsGkAtoms::lineCursorProperty));
@@ -6695 +6693 @@ nsLineBox* nsBlockFrame::GetFirstLineCon
- SetProperty(nsLayoutAtoms::lineCursorProperty,
+ SetProperty(nsGkAtoms::lineCursorProperty,
@@ -6834 +6832 @@ nsBlockFrame::IsChild(nsIFrame* aFrame)
- PRBool isPlaceholder = nsLayoutAtoms::placeholderFrame == aFrame->GetType();
+ PRBool isPlaceholder = nsGkAtoms::placeholderFrame == aFrame->GetType();
@@ -6904 +6902 @@ nsBlockFrame::SetInitialChildList(nsIAto
- else if (nsLayoutAtoms::floatList == aListName) {
+ else if (nsGkAtoms::floatList == aListName) {
@@ -6987,4 +6985,4 @@ nsBlockFrame::FrameStartsCounterScope(ns
- return localName == nsHTMLAtoms::ol ||
- localName == nsHTMLAtoms::ul ||
- localName == nsHTMLAtoms::dir ||
- localName == nsHTMLAtoms::menu;
+ return localName == nsGkAtoms::ol ||
+ localName == nsGkAtoms::ul ||
+ localName == nsGkAtoms::dir ||
+ localName == nsGkAtoms::menu;
@@ -7009 +7007 @@ nsBlockFrame::RenumberLists(nsPresContex
- const nsAttrValue* attr = hc->GetParsedAttr(nsHTMLAtoms::start);
+ const nsAttrValue* attr = hc->GetParsedAttr(nsGkAtoms::start);
Index: mozilla/layout/generic/nsBlockReflowContext.cpp
===================================================================
RCS file: /cvsroot/mozilla/layout/generic/nsBlockReflowContext.cpp,v
retrieving revision 1.143
diff -u -p -0 -r1.143 nsBlockReflowContext.cpp
--- mozilla/layout/generic/nsBlockReflowContext.cpp 29 Jun 2006 01:19:48 -0000 1.143
+++ mozilla/layout/generic/nsBlockReflowContext.cpp 3 Oct 2006 22:57:13 -0000
@@ -56 +55,0 @@
-#include "nsLayoutAtoms.h"
@@ -89 +88 @@ static nsIFrame* DescendIntoBlockLevelFr
- if (type == nsLayoutAtoms::columnSetFrame)
+ if (type == nsGkAtoms::columnSetFrame)
@@ -492 +491 @@ nsBlockReflowContext::ReflowBlock(const
- propTable->GetProperty(mFrame, nsLayoutAtoms::computedOffsetProperty));
+ propTable->GetProperty(mFrame, nsGkAtoms::computedOffsetProperty));
@@ -499 +498 @@ nsBlockReflowContext::ReflowBlock(const
- propTable->SetProperty(mFrame, nsLayoutAtoms::computedOffsetProperty,
+ propTable->SetProperty(mFrame, nsGkAtoms::computedOffsetProperty,
Index: mozilla/layout/generic/nsBlockReflowState.cpp
===================================================================
RCS file: /cvsroot/mozilla/layout/generic/nsBlockReflowState.cpp,v
retrieving revision 3.516
diff -u -p -0 -r3.516 nsBlockReflowState.cpp
--- mozilla/layout/generic/nsBlockReflowState.cpp 25 Aug 2006 22:55:32 -0000 3.516
+++ mozilla/layout/generic/nsBlockReflowState.cpp 3 Oct 2006 22:57:14 -0000
@@ -50 +49,0 @@
-#include "nsLayoutAtoms.h"
@@ -55 +53,0 @@
-#include "nsHTMLAtoms.h"
@@ -81 +79 @@ nsBlockReflowState::nsBlockReflowState(c
- mBlock->SetProperty(nsLayoutAtoms::overflowPlaceholdersProperty,
+ mBlock->SetProperty(nsGkAtoms::overflowPlaceholdersProperty,
@@ -192 +190 @@ nsBlockReflowState::~nsBlockReflowState(
- mBlock->UnsetProperty(nsLayoutAtoms::overflowPlaceholdersProperty);
+ mBlock->UnsetProperty(nsGkAtoms::overflowPlaceholdersProperty);
@@ -239 +237 @@ nsBlockReflowState::ComputeBlockAvailSpa
- aFrame->GetType() != nsLayoutAtoms::scrollFrame) // or scroll frames
+ aFrame->GetType() != nsGkAtoms::scrollFrame) // or scroll frames
@@ -450 +448 @@ nsBlockReflowState::RecoverFloats(nsLine
- nsLayoutAtoms::computedOffsetProperty));
+ nsGkAtoms::computedOffsetProperty));
@@ -914 +912 @@ nsBlockReflowState::FlowAndPlaceFloat(ns
- if (nsLayoutAtoms::tableOuterFrame == prevFrame->GetType()) {
+ if (nsGkAtoms::tableOuterFrame == prevFrame->GetType()) {
@@ -921 +919 @@ nsBlockReflowState::FlowAndPlaceFloat(ns
- if (content->AttrValueIs(kNameSpaceID_None, nsHTMLAtoms::align,
+ if (content->AttrValueIs(kNameSpaceID_None, nsGkAtoms::align,
Index: mozilla/layout/generic/nsBulletFrame.cpp
===================================================================
RCS file: /cvsroot/mozilla/layout/generic/nsBulletFrame.cpp,v
retrieving revision 1.151
diff -u -p -0 -r1.151 nsBulletFrame.cpp
--- mozilla/layout/generic/nsBulletFrame.cpp 19 Sep 2006 04:26:20 -0000 1.151
+++ mozilla/layout/generic/nsBulletFrame.cpp 3 Oct 2006 22:57:14 -0000
@@ -42 +41,0 @@
-#include "nsHTMLAtoms.h"
@@ -55 +53,0 @@
-#include "nsLayoutAtoms.h"
@@ -125 +123 @@ nsBulletFrame::GetType() const
- return nsLayoutAtoms::bulletFrame;
+ return nsGkAtoms::bulletFrame;
@@ -428 +426 @@ nsBulletFrame::SetListItemOrdinal(PRInt3
- const nsAttrValue* attr = hc->GetParsedAttr(nsHTMLAtoms::value);
+ const nsAttrValue* attr = hc->GetParsedAttr(nsGkAtoms::value);
Index: mozilla/layout/generic/nsColumnSetFrame.cpp
===================================================================
RCS file: /cvsroot/mozilla/layout/generic/nsColumnSetFrame.cpp,v
retrieving revision 3.23
diff -u -p -0 -r3.23 nsColumnSetFrame.cpp
--- mozilla/layout/generic/nsColumnSetFrame.cpp 10 Apr 2006 00:16:17 -0000 3.23
+++ mozilla/layout/generic/nsColumnSetFrame.cpp 3 Oct 2006 22:57:15 -0000
@@ -48 +47,0 @@
-#include "nsLayoutAtoms.h"
@@ -167 +166 @@ nsColumnSetFrame::GetType() const
- return nsLayoutAtoms::columnSetFrame;
+ return nsGkAtoms::columnSetFrame;
Index: mozilla/layout/generic/nsContainerFrame.cpp
===================================================================
RCS file: /cvsroot/mozilla/layout/generic/nsContainerFrame.cpp,v
retrieving revision 1.262
diff -u -p -0 -r1.262 nsContainerFrame.cpp
--- mozilla/layout/generic/nsContainerFrame.cpp 29 Aug 2006 22:00:26 -0000 1.262
+++ mozilla/layout/generic/nsContainerFrame.cpp 3 Oct 2006 22:57:15 -0000
@@ -57 +56,0 @@
-#include "nsLayoutAtoms.h"
@@ -181 +180 @@ nsContainerFrame::GetFirstChild(nsIAtom*
- } else if (nsLayoutAtoms::overflowList == aListName) {
+ } else if (nsGkAtoms::overflowList == aListName) {
@@ -192 +191 @@ nsContainerFrame::GetAdditionalChildList
- return nsLayoutAtoms::overflowList;
+ return nsGkAtoms::overflowList;
@@ -692,2 +691,2 @@ nsContainerFrame::FrameNeedsView(nsIFram
- if ((frameType == nsLayoutAtoms::blockFrame) ||
- (frameType == nsLayoutAtoms::areaFrame)) {
+ if ((frameType == nsGkAtoms::blockFrame) ||
+ (frameType == nsGkAtoms::areaFrame)) {
@@ -925 +924 @@ nsContainerFrame::GetOverflowFrames(nsPr
- nsLayoutAtoms::overflowProperty);
+ nsGkAtoms::overflowProperty);
@@ -929 +928 @@ nsContainerFrame::GetOverflowFrames(nsPr
- nsLayoutAtoms::overflowProperty);
+ nsGkAtoms::overflowProperty);
@@ -952 +951 @@ nsContainerFrame::SetOverflowFrames(nsPr
- nsLayoutAtoms::overflowProperty,
+ nsGkAtoms::overflowProperty,
Index: mozilla/layout/generic/nsFirstLetterFrame.cpp
===================================================================
RCS file: /cvsroot/mozilla/layout/generic/nsFirstLetterFrame.cpp,v
retrieving revision 1.63
diff -u -p -0 -r1.63 nsFirstLetterFrame.cpp
--- mozilla/layout/generic/nsFirstLetterFrame.cpp 7 Aug 2006 07:40:28 -0000 1.63
+++ mozilla/layout/generic/nsFirstLetterFrame.cpp 3 Oct 2006 22:57:15 -0000
@@ -46,2 +45,0 @@
-#include "nsHTMLAtoms.h"
-#include "nsLayoutAtoms.h"
@@ -107 +105 @@ nsFirstLetterFrame::GetType() const
- return nsLayoutAtoms::letterFrame;
+ return nsGkAtoms::letterFrame;
Index: mozilla/layout/generic/nsFrame.cpp
===================================================================
RCS file: /cvsroot/mozilla/layout/generic/nsFrame.cpp,v
retrieving revision 3.679
diff -u -p -0 -r3.679 nsFrame.cpp
--- mozilla/layout/generic/nsFrame.cpp 2 Oct 2006 19:33:48 -0000 3.679
+++ mozilla/layout/generic/nsFrame.cpp 3 Oct 2006 22:57:18 -0000
@@ -88 +87,0 @@
-#include "nsLayoutAtoms.h"
@@ -91 +89,0 @@
-#include "nsHTMLAtoms.h"
@@ -999 +997 @@ static PRBool ApplyAbsPosClipping(nsDisp
- GetFirstChild(nsLayoutAtoms::fixedList) &&
+ GetFirstChild(nsGkAtoms::fixedList) &&
@@ -1025,3 +1023,3 @@ static PRBool ApplyOverflowHiddenClippin
- return type == nsLayoutAtoms::tableFrame ||
- type == nsLayoutAtoms::tableCellFrame ||
- type == nsLayoutAtoms::bcTableCellFrame;
+ return type == nsGkAtoms::tableFrame ||
+ type == nsGkAtoms::tableCellFrame ||
+ type == nsGkAtoms::bcTableCellFrame;
@@ -1308 +1306 @@ nsIFrame::BuildDisplayListForChild(nsDis
- if (childType == nsLayoutAtoms::placeholderFrame) {
+ if (childType == nsGkAtoms::placeholderFrame) {
@@ -1324 +1322 @@ nsIFrame::BuildDisplayListForChild(nsDis
- aChild->GetProperty(nsLayoutAtoms::outOfFlowDirtyRectProperty));
+ aChild->GetProperty(nsGkAtoms::outOfFlowDirtyRectProperty));
@@ -2303 +2301 @@ static FrameContentRange GetRangeForFram
- if (type == nsLayoutAtoms::textFrame) {
+ if (type == nsGkAtoms::textFrame) {
@@ -2308 +2306 @@ static FrameContentRange GetRangeForFram
- if (type == nsLayoutAtoms::brFrame) {
+ if (type == nsGkAtoms::brFrame) {
@@ -2929 +2927 @@ nsIFrame::GetView() const
- void *value = GetProperty(nsLayoutAtoms::viewProperty, &rv);
+ void *value = GetProperty(nsGkAtoms::viewProperty, &rv);
@@ -2949 +2947 @@ nsIFrame::SetView(nsIView* aView)
- nsresult rv = SetProperty(nsLayoutAtoms::viewProperty, aView, nsnull);
+ nsresult rv = SetProperty(nsGkAtoms::viewProperty, aView, nsnull);
@@ -3969 +3967 @@ nsFrame::GetNextPrevLineFromeBlockFrame(
- if (resultFrame->GetType() == nsLayoutAtoms::tableOuterFrame)
+ if (resultFrame->GetType() == nsGkAtoms::tableOuterFrame)
@@ -4133 +4131 @@ FindBlockFrameOrBR(nsIFrame* aFrame, nsD
- aFrame->GetType() == nsLayoutAtoms::brFrame) {
+ aFrame->GetType() == nsGkAtoms::brFrame) {
@@ -4417,2 +4415,2 @@ nsIFrame::PeekOffset(nsPeekOffsetStruct*
- if (aPos->mResultFrame->GetType() == nsLayoutAtoms::tableOuterFrame ||
- aPos->mResultFrame->GetType() == nsLayoutAtoms::tableCellFrame)
+ if (aPos->mResultFrame->GetType() == nsGkAtoms::tableOuterFrame ||
+ aPos->mResultFrame->GetType() == nsGkAtoms::tableCellFrame)
@@ -4802 +4800 @@ nsIFrame::GetOverflowAreaProperty(PRBool
- nsLayoutAtoms::overflowAreaProperty);
+ nsGkAtoms::overflowAreaProperty);
@@ -4810 +4808 @@ nsIFrame::GetOverflowAreaProperty(PRBool
- propTable->SetProperty(this, nsLayoutAtoms::overflowAreaProperty,
+ propTable->SetProperty(this, nsGkAtoms::overflowAreaProperty,
@@ -4857 +4855 @@ nsIFrame::FinishAndStoreOverflow(nsRect*
- DeleteProperty(nsLayoutAtoms::overflowAreaProperty);
+ DeleteProperty(nsGkAtoms::overflowAreaProperty);
@@ -4915 +4913 @@ GetIBSpecialSibling(nsPresContext* aPres
- * Now look up the nsLayoutAtoms::IBSplitSpecialPrevSibling
+ * Now look up the nsGkAtoms::IBSplitSpecialPrevSibling
@@ -4922 +4920 @@ GetIBSpecialSibling(nsPresContext* aPres
- nsLayoutAtoms::IBSplitSpecialPrevSibling, &rv));
+ nsGkAtoms::IBSplitSpecialPrevSibling, &rv));
@@ -5199 +5197 @@ nsIFrame::IsFocusable(PRInt32 *aTabIndex
- GetType() == nsLayoutAtoms::scrollFrame &&
+ GetType() == nsGkAtoms::scrollFrame &&
@@ -5202 +5200 @@ nsIFrame::IsFocusable(PRInt32 *aTabIndex
- !mContent->HasAttr(kNameSpaceID_None, nsHTMLAtoms::tabindex)) {
+ !mContent->HasAttr(kNameSpaceID_None, nsGkAtoms::tabindex)) {
@@ -6164 +6162 @@ nsFrame::BoxMetrics() const
- NS_STATIC_CAST(nsBoxLayoutMetrics*, GetProperty(nsLayoutAtoms::boxMetricsProperty));
+ NS_STATIC_CAST(nsBoxLayoutMetrics*, GetProperty(nsGkAtoms::boxMetricsProperty));
@@ -6177 +6175 @@ nsFrame::SetParent(const nsIFrame* aPare
- DeleteProperty(nsLayoutAtoms::boxMetricsProperty);
+ DeleteProperty(nsGkAtoms::boxMetricsProperty);
@@ -6206 +6204 @@ nsFrame::InitBoxMetrics(PRBool aClear)
- DeleteProperty(nsLayoutAtoms::boxMetricsProperty);
+ DeleteProperty(nsGkAtoms::boxMetricsProperty);
@@ -6209 +6207 @@ nsFrame::InitBoxMetrics(PRBool aClear)
- SetProperty(nsLayoutAtoms::boxMetricsProperty, metrics, DeleteBoxMetrics);
+ SetProperty(nsGkAtoms::boxMetricsProperty, metrics, DeleteBoxMetrics);
@@ -6734,32 +6732,32 @@ void DR_State::InitFrameTypeTable()
- AddFrameTypeInfo(nsLayoutAtoms::areaFrame, "area", "area");
- AddFrameTypeInfo(nsLayoutAtoms::blockFrame, "block", "block");
- AddFrameTypeInfo(nsLayoutAtoms::brFrame, "br", "br");
- AddFrameTypeInfo(nsLayoutAtoms::bulletFrame, "bullet", "bullet");
- AddFrameTypeInfo(nsLayoutAtoms::gfxButtonControlFrame, "button", "gfxButtonControl");
- AddFrameTypeInfo(nsLayoutAtoms::HTMLButtonControlFrame, "HTMLbutton", "HTMLButtonControl");
- AddFrameTypeInfo(nsLayoutAtoms::HTMLCanvasFrame, "HTMLCanvas","HTMLCanvas");
- AddFrameTypeInfo(nsLayoutAtoms::subDocumentFrame, "subdoc", "subDocument");
- AddFrameTypeInfo(nsLayoutAtoms::imageFrame, "img", "image");
- AddFrameTypeInfo(nsLayoutAtoms::inlineFrame, "inline", "inline");
- AddFrameTypeInfo(nsLayoutAtoms::letterFrame, "letter", "letter");
- AddFrameTypeInfo(nsLayoutAtoms::lineFrame, "line", "line");
- AddFrameTypeInfo(nsLayoutAtoms::listControlFrame, "select", "select");
- AddFrameTypeInfo(nsLayoutAtoms::objectFrame, "obj", "object");
- AddFrameTypeInfo(nsLayoutAtoms::pageFrame, "page", "page");
- AddFrameTypeInfo(nsLayoutAtoms::placeholderFrame, "place", "placeholder");
- AddFrameTypeInfo(nsLayoutAtoms::positionedInlineFrame, "posInline", "positionedInline");
- AddFrameTypeInfo(nsLayoutAtoms::canvasFrame, "canvas", "canvas");
- AddFrameTypeInfo(nsLayoutAtoms::rootFrame, "root", "root");
- AddFrameTypeInfo(nsLayoutAtoms::scrollFrame, "scroll", "scroll");
- AddFrameTypeInfo(nsLayoutAtoms::tableCaptionFrame, "caption", "tableCaption");
- AddFrameTypeInfo(nsLayoutAtoms::tableCellFrame, "cell", "tableCell");
- AddFrameTypeInfo(nsLayoutAtoms::bcTableCellFrame, "bcCell", "bcTableCell");
- AddFrameTypeInfo(nsLayoutAtoms::tableColFrame, "col", "tableCol");
- AddFrameTypeInfo(nsLayoutAtoms::tableColGroupFrame, "colG", "tableColGroup");
- AddFrameTypeInfo(nsLayoutAtoms::tableFrame, "tbl", "table");
- AddFrameTypeInfo(nsLayoutAtoms::tableOuterFrame, "tblO", "tableOuter");
- AddFrameTypeInfo(nsLayoutAtoms::tableRowGroupFrame, "rowG", "tableRowGroup");
- AddFrameTypeInfo(nsLayoutAtoms::tableRowFrame, "row", "tableRow");
- AddFrameTypeInfo(nsLayoutAtoms::textInputFrame, "textCtl", "textInput");
- AddFrameTypeInfo(nsLayoutAtoms::textFrame, "text", "text");
- AddFrameTypeInfo(nsLayoutAtoms::viewportFrame, "VP", "viewport");
+ AddFrameTypeInfo(nsGkAtoms::areaFrame, "area", "area");
+ AddFrameTypeInfo(nsGkAtoms::blockFrame, "block", "block");
+ AddFrameTypeInfo(nsGkAtoms::brFrame, "br", "br");
+ AddFrameTypeInfo(nsGkAtoms::bulletFrame, "bullet", "bullet");
+ AddFrameTypeInfo(nsGkAtoms::gfxButtonControlFrame, "button", "gfxButtonControl");
+ AddFrameTypeInfo(nsGkAtoms::HTMLButtonControlFrame, "HTMLbutton", "HTMLButtonControl");
+ AddFrameTypeInfo(nsGkAtoms::HTMLCanvasFrame, "HTMLCanvas","HTMLCanvas");
+ AddFrameTypeInfo(nsGkAtoms::subDocumentFrame, "subdoc", "subDocument");
+ AddFrameTypeInfo(nsGkAtoms::imageFrame, "img", "image");
+ AddFrameTypeInfo(nsGkAtoms::inlineFrame, "inline", "inline");
+ AddFrameTypeInfo(nsGkAtoms::letterFrame, "letter", "letter");
+ AddFrameTypeInfo(nsGkAtoms::lineFrame, "line", "line");
+ AddFrameTypeInfo(nsGkAtoms::listControlFrame, "select", "select");
+ AddFrameTypeInfo(nsGkAtoms::objectFrame, "obj", "object");
+ AddFrameTypeInfo(nsGkAtoms::pageFrame, "page", "page");
+ AddFrameTypeInfo(nsGkAtoms::placeholderFrame, "place", "placeholder");
+ AddFrameTypeInfo(nsGkAtoms::positionedInlineFrame, "posInline", "positionedInline");
+ AddFrameTypeInfo(nsGkAtoms::canvasFrame, "canvas", "canvas");
+ AddFrameTypeInfo(nsGkAtoms::rootFrame, "root", "root");
+ AddFrameTypeInfo(nsGkAtoms::scrollFrame, "scroll", "scroll");
+ AddFrameTypeInfo(nsGkAtoms::tableCaptionFrame, "caption", "tableCaption");
+ AddFrameTypeInfo(nsGkAtoms::tableCellFrame, "cell", "tableCell");
+ AddFrameTypeInfo(nsGkAtoms::bcTableCellFrame, "bcCell", "bcTableCell");
+ AddFrameTypeInfo(nsGkAtoms::tableColFrame, "col", "tableCol");
+ AddFrameTypeInfo(nsGkAtoms::tableColGroupFrame, "colG", "tableColGroup");
+ AddFrameTypeInfo(nsGkAtoms::tableFrame, "tbl", "table");
+ AddFrameTypeInfo(nsGkAtoms::tableOuterFrame, "tblO", "tableOuter");
+ AddFrameTypeInfo(nsGkAtoms::tableRowGroupFrame, "rowG", "tableRowGroup");
+ AddFrameTypeInfo(nsGkAtoms::tableRowFrame, "row", "tableRow");
+ AddFrameTypeInfo(nsGkAtoms::textInputFrame, "textCtl", "textInput");
+ AddFrameTypeInfo(nsGkAtoms::textFrame, "text", "text");
+ AddFrameTypeInfo(nsGkAtoms::viewportFrame, "VP", "viewport");
Index: mozilla/layout/generic/nsFrameFrame.cpp
===================================================================
RCS file: /cvsroot/mozilla/layout/generic/nsFrameFrame.cpp,v
retrieving revision 3.304
diff -u -p -0 -r3.304 nsFrameFrame.cpp
--- mozilla/layout/generic/nsFrameFrame.cpp 5 May 2006 06:52:19 -0000 3.304
+++ mozilla/layout/generic/nsFrameFrame.cpp 3 Oct 2006 22:57:18 -0000
@@ -68 +67,0 @@
-#include "nsHTMLAtoms.h"
@@ -78 +76,0 @@
-#include "nsLayoutAtoms.h"
@@ -357 +355 @@ nsSubDocumentFrame::GetType() const
- return nsLayoutAtoms::subDocumentFrame;
+ return nsGkAtoms::subDocumentFrame;
@@ -479 +477 @@ nsSubDocumentFrame::AttributeChanged(PRI
- if (aAttribute == nsHTMLAtoms::src) {
+ if (aAttribute == nsGkAtoms::src) {
@@ -485 +483 @@ nsSubDocumentFrame::AttributeChanged(PRI
- else if (aAttribute == nsHTMLAtoms::noresize) {
+ else if (aAttribute == nsGkAtoms::noresize) {
@@ -488 +486 @@ nsSubDocumentFrame::AttributeChanged(PRI
- if (mContent->GetParent()->Tag() == nsHTMLAtoms::frameset) {
+ if (mContent->GetParent()->Tag() == nsGkAtoms::frameset) {
@@ -504 +502 @@ nsSubDocumentFrame::AttributeChanged(PRI
- else if (aAttribute == nsHTMLAtoms::type) {
+ else if (aAttribute == nsGkAtoms::type) {
@@ -540 +538 @@ nsSubDocumentFrame::AttributeChanged(PRI
- mContent->GetAttr(kNameSpaceID_None, nsHTMLAtoms::type, value);
+ mContent->GetAttr(kNameSpaceID_None, nsGkAtoms::type, value);
@@ -629 +627 @@ nsSize nsSubDocumentFrame::GetMargin()
- const nsAttrValue* attr = content->GetParsedAttr(nsHTMLAtoms::marginwidth);
+ const nsAttrValue* attr = content->GetParsedAttr(nsGkAtoms::marginwidth);
@@ -632 +630 @@ nsSize nsSubDocumentFrame::GetMargin()
- attr = content->GetParsedAttr(nsHTMLAtoms::marginheight);
+ attr = content->GetParsedAttr(nsGkAtoms::marginheight);
Index: mozilla/layout/generic/nsFrameSetFrame.cpp
===================================================================
RCS file: /cvsroot/mozilla/layout/generic/nsFrameSetFrame.cpp,v
retrieving revision 3.185
diff -u -p -0 -r3.185 nsFrameSetFrame.cpp
--- mozilla/layout/generic/nsFrameSetFrame.cpp 2 Jul 2006 07:23:09 -0000 3.185
+++ mozilla/layout/generic/nsFrameSetFrame.cpp 3 Oct 2006 22:57:19 -0000
@@ -57 +56,0 @@
-#include "nsHTMLAtoms.h"
@@ -75 +73,0 @@
-#include "nsLayoutAtoms.h"
@@ -283 +281 @@ nsHTMLFramesetFrame::FrameResizePrefCall
- nsHTMLAtoms::frameborder);
+ nsGkAtoms::frameborder);
@@ -294 +292 @@ nsHTMLFramesetFrame::FrameResizePrefCall
- nsHTMLAtoms::frameborder,
+ nsGkAtoms::frameborder,
@@ -402 +400 @@ nsHTMLFramesetFrame::Init(nsIContent*
- if (tag == nsHTMLAtoms::frameset || tag == nsHTMLAtoms::frame) {
+ if (tag == nsGkAtoms::frameset || tag == nsGkAtoms::frame) {
@@ -407 +405 @@ nsHTMLFramesetFrame::Init(nsIContent*
- if (tag == nsHTMLAtoms::frameset) {
+ if (tag == nsGkAtoms::frameset) {
@@ -674 +672 @@ PRInt32 nsHTMLFramesetFrame::GetBorderWi
- const nsAttrValue* attr = content->GetParsedAttr(nsHTMLAtoms::border);
+ const nsAttrValue* attr = content->GetParsedAttr(nsGkAtoms::border);
@@ -737 +735 @@ nsHTMLFramesetFrame* nsHTMLFramesetFrame
- contentParent->Tag() == nsHTMLAtoms::frameset) {
+ contentParent->Tag() == nsGkAtoms::frameset) {
@@ -887 +885 @@ nsFrameborder GetFrameBorderHelper(nsGen
- const nsAttrValue* attr = aContent->GetParsedAttr(nsHTMLAtoms::frameborder);
+ const nsAttrValue* attr = aContent->GetParsedAttr(nsGkAtoms::frameborder);
@@ -940 +938 @@ nscolor nsHTMLFramesetFrame::GetBorderCo
- const nsAttrValue* attr = content->GetParsedAttr(nsHTMLAtoms::bordercolor);
+ const nsAttrValue* attr = content->GetParsedAttr(nsGkAtoms::bordercolor);
@@ -957 +955 @@ nscolor nsHTMLFramesetFrame::GetBorderCo
- const nsAttrValue* attr = content->GetParsedAttr(nsHTMLAtoms::bordercolor);
+ const nsAttrValue* attr = content->GetParsedAttr(nsGkAtoms::bordercolor);
@@ -1265 +1263 @@ nsHTMLFramesetFrame::GetType() const
- return nsLayoutAtoms::frameSetFrame;
+ return nsGkAtoms::frameSetFrame;
@@ -1320 +1318 @@ nsHTMLFramesetFrame::GetNoResize(nsIFram
- return content && content->HasAttr(kNameSpaceID_None, nsHTMLAtoms::noresize);
+ return content && content->HasAttr(kNameSpaceID_None, nsGkAtoms::noresize);
@@ -1358 +1356 @@ nsHTMLFramesetFrame::RecalculateBorderRe
- if (ni->Equals(nsHTMLAtoms::frameset)) {
+ if (ni->Equals(nsGkAtoms::frameset)) {
@@ -1360 +1358 @@ nsHTMLFramesetFrame::RecalculateBorderRe
- } else if (ni->Equals(nsHTMLAtoms::frame)) {
+ } else if (ni->Equals(nsGkAtoms::frame)) {
@@ -1507 +1505 @@ nsHTMLFramesetFrame::MouseDrag(nsPresCon
- mContent->SetAttr(kNameSpaceID_None, nsHTMLAtoms::cols, newColAttr, PR_TRUE);
+ mContent->SetAttr(kNameSpaceID_None, nsGkAtoms::cols, newColAttr, PR_TRUE);
@@ -1530 +1528 @@ nsHTMLFramesetFrame::MouseDrag(nsPresCon
- mContent->SetAttr(kNameSpaceID_None, nsHTMLAtoms::rows, newRowAttr, PR_TRUE);
+ mContent->SetAttr(kNameSpaceID_None, nsGkAtoms::rows, newRowAttr, PR_TRUE);
Index: mozilla/layout/generic/nsGfxScrollFrame.cpp
===================================================================
RCS file: /cvsroot/mozilla/layout/generic/nsGfxScrollFrame.cpp,v
retrieving revision 3.271
diff -u -p -0 -r3.271 nsGfxScrollFrame.cpp
--- mozilla/layout/generic/nsGfxScrollFrame.cpp 24 Aug 2006 05:22:16 -0000 3.271
+++ mozilla/layout/generic/nsGfxScrollFrame.cpp 3 Oct 2006 22:57:20 -0000
@@ -52,3 +51,0 @@
-#include "nsLayoutAtoms.h"
-#include "nsXULAtoms.h"
-#include "nsHTMLAtoms.h"
@@ -232 +229 @@ nsHTMLScrollFrame::GetType() const
- return nsLayoutAtoms::scrollFrame;
+ return nsGkAtoms::scrollFrame;
@@ -1079 +1076 @@ nsXULScrollFrame::GetType() const
- return nsLayoutAtoms::scrollFrame;
+ return nsGkAtoms::scrollFrame;
@@ -1613 +1610 @@ nsGfxScrollFrameInner::ReloadChildFrames
- content->GetAttr(kNameSpaceID_None, nsXULAtoms::orient, value);
+ content->GetAttr(kNameSpaceID_None, nsGkAtoms::orient, value);
@@ -1689 +1686 @@ nsGfxScrollFrameInner::CreateAnonymousCo
- nodeInfoManager->GetNodeInfo(nsXULAtoms::scrollbar, nsnull,
+ nodeInfoManager->GetNodeInfo(nsGkAtoms::scrollbar, nsnull,
@@ -1696 +1693 @@ nsGfxScrollFrameInner::CreateAnonymousCo
- content->SetAttr(kNameSpaceID_None, nsXULAtoms::orient,
+ content->SetAttr(kNameSpaceID_None, nsGkAtoms::orient,
@@ -1703 +1700 @@ nsGfxScrollFrameInner::CreateAnonymousCo
- content->SetAttr(kNameSpaceID_None, nsXULAtoms::orient,
+ content->SetAttr(kNameSpaceID_None, nsGkAtoms::orient,
@@ -1709 +1706 @@ nsGfxScrollFrameInner::CreateAnonymousCo
- nodeInfoManager->GetNodeInfo(nsXULAtoms::scrollcorner, nsnull,
+ nodeInfoManager->GetNodeInfo(nsGkAtoms::scrollcorner, nsnull,
@@ -1733 +1730 @@ nsGfxScrollFrameInner::InternalScrollPos
- SetCoordAttribute(mVScrollbarBox, nsXULAtoms::curpos,
+ SetCoordAttribute(mVScrollbarBox, nsGkAtoms::curpos,
@@ -1737 +1734 @@ nsGfxScrollFrameInner::InternalScrollPos
- SetCoordAttribute(mHScrollbarBox, nsXULAtoms::curpos,
+ SetCoordAttribute(mHScrollbarBox, nsGkAtoms::curpos,
@@ -1799 +1796 @@ void nsGfxScrollFrameInner::CurPosAttrib
- nscoord x = GetCoordAttribute(mHScrollbarBox, nsXULAtoms::curpos,
+ nscoord x = GetCoordAttribute(mHScrollbarBox, nsGkAtoms::curpos,
@@ -1802 +1799 @@ void nsGfxScrollFrameInner::CurPosAttrib
- nscoord y = GetCoordAttribute(mVScrollbarBox, nsXULAtoms::curpos,
+ nscoord y = GetCoordAttribute(mVScrollbarBox, nsGkAtoms::curpos,
@@ -1818 +1815 @@ void nsGfxScrollFrameInner::CurPosAttrib
- PRBool isSmooth = aContent->HasAttr(kNameSpaceID_None, nsXULAtoms::smooth);
+ PRBool isSmooth = aContent->HasAttr(kNameSpaceID_None, nsGkAtoms::smooth);
@@ -2407 +2404 @@ nsGfxScrollFrameInner::LayoutScrollbars(
- SetCoordAttribute(mVScrollbarBox, nsXULAtoms::curpos, curPosY - minY);
+ SetCoordAttribute(mVScrollbarBox, nsGkAtoms::curpos, curPosY - minY);
@@ -2409,3 +2406,3 @@ nsGfxScrollFrameInner::LayoutScrollbars(
- SetCoordAttribute(mVScrollbarBox, nsXULAtoms::maxpos, maxY - minY);
- SetCoordAttribute(mVScrollbarBox, nsXULAtoms::pageincrement, nscoord(aScrollArea.height - fontHeight));
- SetCoordAttribute(mVScrollbarBox, nsXULAtoms::increment, fontHeight);
+ SetCoordAttribute(mVScrollbarBox, nsGkAtoms::maxpos, maxY - minY);
+ SetCoordAttribute(mVScrollbarBox, nsGkAtoms::pageincrement, nscoord(aScrollArea.height - fontHeight));
+ SetCoordAttribute(mVScrollbarBox, nsGkAtoms::increment, fontHeight);
@@ -2427 +2424 @@ nsGfxScrollFrameInner::LayoutScrollbars(
- SetCoordAttribute(mHScrollbarBox, nsXULAtoms::curpos, curPosX - minX);
+ SetCoordAttribute(mHScrollbarBox, nsGkAtoms::curpos, curPosX - minX);
@@ -2429,3 +2426,3 @@ nsGfxScrollFrameInner::LayoutScrollbars(
- SetCoordAttribute(mHScrollbarBox, nsXULAtoms::maxpos, maxX - minX);
- SetCoordAttribute(mHScrollbarBox, nsXULAtoms::pageincrement, nscoord(float(aScrollArea.width)*0.8));
- SetCoordAttribute(mHScrollbarBox, nsXULAtoms::increment, 10*mOnePixel);
+ SetCoordAttribute(mHScrollbarBox, nsGkAtoms::maxpos, maxX - minX);
+ SetCoordAttribute(mHScrollbarBox, nsGkAtoms::pageincrement, nscoord(float(aScrollArea.width)*0.8));
+ SetCoordAttribute(mHScrollbarBox, nsGkAtoms::increment, 10*mOnePixel);
@@ -2497 +2494 @@ nsGfxScrollFrameInner::LayoutScrollbars(
- if (parentFrame->GetFirstChild(nsLayoutAtoms::fixedList)) {
+ if (parentFrame->GetFirstChild(nsGkAtoms::fixedList)) {
@@ -2501 +2498 @@ nsGfxScrollFrameInner::LayoutScrollbars(
- nsLayoutAtoms::fixedList);
+ nsGkAtoms::fixedList);
@@ -2520 +2517 @@ nsGfxScrollFrameInner::SetScrollbarEnabl
- nsHTMLAtoms::disabled,
+ nsGkAtoms::disabled,
Index: mozilla/layout/generic/nsHTMLCanvasFrame.cpp
===================================================================
RCS file: /cvsroot/mozilla/layout/generic/nsHTMLCanvasFrame.cpp,v
retrieving revision 1.12
diff -u -p -0 -r1.12 nsHTMLCanvasFrame.cpp
--- mozilla/layout/generic/nsHTMLCanvasFrame.cpp 14 Jul 2006 03:02:37 -0000 1.12
+++ mozilla/layout/generic/nsHTMLCanvasFrame.cpp 3 Oct 2006 22:57:20 -0000
@@ -44 +43,0 @@
-#include "nsLayoutAtoms.h"
@@ -249 +248 @@ nsHTMLCanvasFrame::GetType() const
- return nsLayoutAtoms::HTMLCanvasFrame;
+ return nsGkAtoms::HTMLCanvasFrame;
Index: mozilla/layout/generic/nsHTMLContainerFrame.cpp
===================================================================
RCS file: /cvsroot/mozilla/layout/generic/nsHTMLContainerFrame.cpp,v
retrieving revision 3.219
diff -u -p -0 -r3.219 nsHTMLContainerFrame.cpp
--- mozilla/layout/generic/nsHTMLContainerFrame.cpp 12 Sep 2006 03:47:38 -0000 3.219
+++ mozilla/layout/generic/nsHTMLContainerFrame.cpp 3 Oct 2006 22:57:20 -0000
@@ -47 +46,0 @@
-#include "nsLayoutAtoms.h"
@@ -307 +306 @@ HasTextFrameDescendant(nsPresContext* aP
- if (kid->GetType() == nsLayoutAtoms::textFrame) {
+ if (kid->GetType() == nsGkAtoms::textFrame) {
Index: mozilla/layout/generic/nsHTMLFrame.cpp
===================================================================
RCS file: /cvsroot/mozilla/layout/generic/nsHTMLFrame.cpp,v
retrieving revision 1.165
diff -u -p -0 -r1.165 nsHTMLFrame.cpp
--- mozilla/layout/generic/nsHTMLFrame.cpp 14 Jul 2006 03:02:37 -0000 1.165
+++ mozilla/layout/generic/nsHTMLFrame.cpp 3 Oct 2006 22:57:21 -0000
@@ -52 +51,0 @@
-#include "nsHTMLAtoms.h"
@@ -55 +53,0 @@
-#include "nsLayoutAtoms.h"
@@ -126 +124 @@ public:
- * @see nsLayoutAtoms::canvasFrame
+ * @see nsGkAtoms::canvasFrame
@@ -655 +653 @@ CanvasFrame::GetType() const
- return nsLayoutAtoms::canvasFrame;
+ return nsGkAtoms::canvasFrame;
Index: mozilla/layout/generic/nsHTMLReflowState.cpp
===================================================================
RCS file: /cvsroot/mozilla/layout/generic/nsHTMLReflowState.cpp,v
retrieving revision 1.238
diff -u -p -0 -r1.238 nsHTMLReflowState.cpp
--- mozilla/layout/generic/nsHTMLReflowState.cpp 20 Jun 2006 21:13:05 -0000 1.238
+++ mozilla/layout/generic/nsHTMLReflowState.cpp 3 Oct 2006 22:57:22 -0000
@@ -45 +44,0 @@
-#include "nsHTMLAtoms.h"
@@ -48 +46,0 @@
-#include "nsLayoutAtoms.h"
@@ -717 +715 @@ GetIntrinsicSizeFor(nsIFrame* aFrame, ns
- if (aFrame->GetType() == nsLayoutAtoms::imageFrame) {
+ if (aFrame->GetType() == nsGkAtoms::imageFrame) {
@@ -1480,3 +1478,3 @@ CalcQuirkContainingBlockHeight(const nsH
- if (nsLayoutAtoms::blockFrame == frameType ||
- nsLayoutAtoms::areaFrame == frameType ||
- nsLayoutAtoms::scrollFrame == frameType) {
+ if (nsGkAtoms::blockFrame == frameType ||
+ nsGkAtoms::areaFrame == frameType ||
+ nsGkAtoms::scrollFrame == frameType) {
@@ -1484 +1482 @@ CalcQuirkContainingBlockHeight(const nsH
- if (nsLayoutAtoms::areaFrame == frameType) {
+ if (nsGkAtoms::areaFrame == frameType) {
@@ -1507 +1505 @@ CalcQuirkContainingBlockHeight(const nsH
- else if (nsLayoutAtoms::canvasFrame == frameType) {
+ else if (nsGkAtoms::canvasFrame == frameType) {
@@ -1511 +1509 @@ CalcQuirkContainingBlockHeight(const nsH
- if (nsLayoutAtoms::scrollFrame == scrollState->frame->GetType()) {
+ if (nsGkAtoms::scrollFrame == scrollState->frame->GetType()) {
@@ -1515 +1513 @@ CalcQuirkContainingBlockHeight(const nsH
- else if (nsLayoutAtoms::pageContentFrame == frameType) {
+ else if (nsGkAtoms::pageContentFrame == frameType) {
@@ -1527 +1525 @@ CalcQuirkContainingBlockHeight(const nsH
- result = (nsLayoutAtoms::pageContentFrame == frameType)
+ result = (nsGkAtoms::pageContentFrame == frameType)
@@ -1534,2 +1532,2 @@ CalcQuirkContainingBlockHeight(const nsH
- if ((nsLayoutAtoms::canvasFrame == frameType) ||
- (nsLayoutAtoms::pageContentFrame == frameType)) {
+ if ((nsGkAtoms::canvasFrame == frameType) ||
+ (nsGkAtoms::pageContentFrame == frameType)) {
@@ -1546 +1544 @@ CalcQuirkContainingBlockHeight(const nsH
- NS_ASSERTION(contentTag == nsHTMLAtoms::html, "First ancestor is not HTML");
+ NS_ASSERTION(contentTag == nsGkAtoms::html, "First ancestor is not HTML");
@@ -1553 +1551 @@ CalcQuirkContainingBlockHeight(const nsH
- NS_ASSERTION(contentTag == nsHTMLAtoms::body, "Second ancestor is not BODY");
+ NS_ASSERTION(contentTag == nsGkAtoms::body, "Second ancestor is not BODY");
@@ -1561 +1559 @@ CalcQuirkContainingBlockHeight(const nsH
- else if (nsLayoutAtoms::areaFrame == frameType) {
+ else if (nsGkAtoms::areaFrame == frameType) {
@@ -1563 +1561 @@ CalcQuirkContainingBlockHeight(const nsH
- if (nsLayoutAtoms::canvasFrame == rs->parentReflowState->frame->GetType()) {
+ if (nsGkAtoms::canvasFrame == rs->parentReflowState->frame->GetType()) {
@@ -1736 +1734 @@ nsHTMLReflowState::InitConstraints(nsPre
- if (nsLayoutAtoms::scrollFrame == fType) {
+ if (nsGkAtoms::scrollFrame == fType) {
@@ -2034 +2032 @@ nsHTMLReflowState::ComputeBlockBoxData(n
- if (nsLayoutAtoms::tableOuterFrame == fType) {
+ if (nsGkAtoms::tableOuterFrame == fType) {
@@ -2036,2 +2034,2 @@ nsHTMLReflowState::ComputeBlockBoxData(n
- } else if ((nsLayoutAtoms::tableFrame == fType) ||
- (nsLayoutAtoms::tableCaptionFrame == fType)) {
+ } else if ((nsGkAtoms::tableFrame == fType) ||
+ (nsGkAtoms::tableCaptionFrame == fType)) {
@@ -2446,4 +2444,4 @@ nsHTMLReflowState::ComputePadding(nscoor
- if ((nsLayoutAtoms::tableRowGroupFrame == frameType) ||
- (nsLayoutAtoms::tableColGroupFrame == frameType) ||
- (nsLayoutAtoms::tableRowFrame == frameType) ||
- (nsLayoutAtoms::tableColFrame == frameType)) {
+ if ((nsGkAtoms::tableRowGroupFrame == frameType) ||
+ (nsGkAtoms::tableColGroupFrame == frameType) ||
+ (nsGkAtoms::tableRowFrame == frameType) ||
+ (nsGkAtoms::tableColFrame == frameType)) {
Index: mozilla/layout/generic/nsIFrame.h
===================================================================
RCS file: /cvsroot/mozilla/layout/generic/nsIFrame.h,v
retrieving revision 3.336
diff -u -p -0 -r3.336 nsIFrame.h
--- mozilla/layout/generic/nsIFrame.h 2 Oct 2006 19:33:48 -0000 3.336
+++ mozilla/layout/generic/nsIFrame.h 3 Oct 2006 22:57:23 -0000
@@ -1168 +1168 @@ public:
- * @see nsLayoutAtoms
+ * @see nsGkAtoms
@@ -1504 +1504 @@ public:
-NS_PTR_TO_INT32(frame->GetProperty(nsLayoutAtoms::baseLevel))
+NS_PTR_TO_INT32(frame->GetProperty(nsGkAtoms::baseLevel))
@@ -1507 +1507 @@ NS_PTR_TO_INT32(frame->GetProperty(nsLay
-NS_PTR_TO_INT32(frame->GetProperty(nsLayoutAtoms::embeddingLevel))
+NS_PTR_TO_INT32(frame->GetProperty(nsGkAtoms::embeddingLevel))
Index: mozilla/layout/generic/nsImageFrame.cpp
===================================================================
RCS file: /cvsroot/mozilla/layout/generic/nsImageFrame.cpp,v
retrieving revision 1.391
diff -u -p -0 -r1.391 nsImageFrame.cpp
--- mozilla/layout/generic/nsImageFrame.cpp 31 Jul 2006 07:08:45 -0000 1.391
+++ mozilla/layout/generic/nsImageFrame.cpp 3 Oct 2006 22:57:23 -0000
@@ -51 +50,0 @@
-#include "nsHTMLAtoms.h"
@@ -79 +77,0 @@
-#include "nsLayoutAtoms.h"
@@ -489,3 +487,3 @@ nsImageFrame::ShouldCreateImageFrameFor(
- if (!aContent->HasAttr(kNameSpaceID_None, nsHTMLAtoms::alt) &&
- localName != nsHTMLAtoms::object &&
- localName != nsHTMLAtoms::input) {
+ if (!aContent->HasAttr(kNameSpaceID_None, nsGkAtoms::alt) &&
+ localName != nsGkAtoms::object &&
+ localName != nsGkAtoms::input) {
@@ -972 +970 @@ nsImageFrame::Reflow(nsPresContext*
- if (nsLayoutAtoms::imageFrame == GetType()) {
+ if (nsGkAtoms::imageFrame == GetType()) {
@@ -1521 +1519 @@ nsImageFrame::GetImageMap(nsPresContext*
- mContent->GetAttr(kNameSpaceID_None, nsHTMLAtoms::usemap, usemap);
+ mContent->GetAttr(kNameSpaceID_None, nsGkAtoms::usemap, usemap);
@@ -1577 +1575 @@ nsImageFrame::IsServerImageMap()
- return mContent->HasAttr(kNameSpaceID_None, nsHTMLAtoms::ismap);
+ return mContent->HasAttr(kNameSpaceID_None, nsGkAtoms::ismap);
@@ -1783 +1781 @@ nsImageFrame::AttributeChanged(PRInt32 a
- if (nsHTMLAtoms::alt == aAttribute)
+ if (nsGkAtoms::alt == aAttribute)
@@ -1795 +1793 @@ nsImageFrame::GetType() const
- return nsLayoutAtoms::imageFrame;
+ return nsGkAtoms::imageFrame;
Index: mozilla/layout/generic/nsInlineFrame.cpp
===================================================================
RCS file: /cvsroot/mozilla/layout/generic/nsInlineFrame.cpp,v
retrieving revision 3.263
diff -u -p -0 -r3.263 nsInlineFrame.cpp
--- mozilla/layout/generic/nsInlineFrame.cpp 11 Sep 2006 20:43:00 -0000 3.263
+++ mozilla/layout/generic/nsInlineFrame.cpp 3 Oct 2006 22:57:24 -0000
@@ -43 +42,0 @@
-#include "nsHTMLAtoms.h"
@@ -51 +49,0 @@
-#include "nsLayoutAtoms.h"
@@ -105 +103 @@ nsInlineFrame::GetType() const
- return nsLayoutAtoms::inlineFrame;
+ return nsGkAtoms::inlineFrame;
@@ -200 +198 @@ nsInlineFrame::AppendFrames(nsIAtom*
- if (aListName != nsLayoutAtoms::nextBidi)
+ if (aListName != nsGkAtoms::nextBidi)
@@ -229 +227 @@ nsInlineFrame::InsertFrames(nsIAtom*
- if (aListName != nsLayoutAtoms::nextBidi)
+ if (aListName != nsGkAtoms::nextBidi)
@@ -255 +253 @@ nsInlineFrame::RemoveFrame(nsIAtom*
- if (nsLayoutAtoms::nextBidi != aListName)
+ if (nsGkAtoms::nextBidi != aListName)
@@ -269 +267 @@ nsInlineFrame::RemoveFrame(nsIAtom*
- aOldFrame->GetType() == nsLayoutAtoms::brFrame;
+ aOldFrame->GetType() == nsGkAtoms::brFrame;
@@ -274 +272 @@ nsInlineFrame::RemoveFrame(nsIAtom*
- if (nsLayoutAtoms::nextBidi != aListName) {
+ if (nsGkAtoms::nextBidi != aListName) {
@@ -750 +748 @@ nsInlineFrame::ReflowInlineFrame(nsPresC
- if (nsLayoutAtoms::placeholderFrame == aFrame->GetType()) {
+ if (nsGkAtoms::placeholderFrame == aFrame->GetType()) {
@@ -861,2 +859,2 @@ NS_IMETHODIMP nsInlineFrame::GetAccessib
- if ((tagAtom == nsHTMLAtoms::img || tagAtom == nsHTMLAtoms::input ||
- tagAtom == nsHTMLAtoms::label) && mContent->IsNodeOfType(nsINode::eHTML)) {
+ if ((tagAtom == nsGkAtoms::img || tagAtom == nsGkAtoms::input ||
+ tagAtom == nsGkAtoms::label) && mContent->IsNodeOfType(nsINode::eHTML)) {
@@ -867 +865 @@ NS_IMETHODIMP nsInlineFrame::GetAccessib
- if (tagAtom == nsHTMLAtoms::input) // Broken
+ if (tagAtom == nsGkAtoms::input) // Broken
@@ -869 +867 @@ NS_IMETHODIMP nsInlineFrame::GetAccessib
- else if (tagAtom == nsHTMLAtoms::img) // Create accessible for broken ![]()
+ else if (tagAtom == nsGkAtoms::img) // Create accessible for broken ![]()
@@ -871 +869 @@ NS_IMETHODIMP nsInlineFrame::GetAccessib
- else if (tagAtom == nsHTMLAtoms::label) // Creat accessible for