From 0f73d45160865b1aea70ed7a5b9c66a9b9dbe598 Mon Sep 17 00:00:00 2001 From: "troy%netscape.com" Date: Tue, 20 Apr 1999 18:22:28 +0000 Subject: [PATCH] Change to atoms --- content/html/content/src/nsHTMLAtoms.cpp | 6 ------ content/shared/src/nsHTMLAtoms.cpp | 6 ------ layout/generic/nsBlockFrame.cpp | 2 +- layout/generic/nsBlockReflowState.cpp | 2 +- layout/generic/nsBlockReflowState.h | 2 +- layout/generic/nsInlineFrame.cpp | 2 +- layout/html/base/src/nsBlockFrame.cpp | 2 +- layout/html/base/src/nsBlockReflowState.cpp | 2 +- layout/html/base/src/nsBlockReflowState.h | 2 +- layout/html/base/src/nsHTMLAtoms.cpp | 6 ------ layout/html/base/src/nsInlineFrame.cpp | 2 +- 11 files changed, 8 insertions(+), 26 deletions(-) diff --git a/content/html/content/src/nsHTMLAtoms.cpp b/content/html/content/src/nsHTMLAtoms.cpp index 7591279b210c..fb8bafb427ef 100644 --- a/content/html/content/src/nsHTMLAtoms.cpp +++ b/content/html/content/src/nsHTMLAtoms.cpp @@ -43,7 +43,6 @@ nsIAtom* nsHTMLAtoms::axis; nsIAtom* nsHTMLAtoms::background; nsIAtom* nsHTMLAtoms::below; nsIAtom* nsHTMLAtoms::bgcolor; -nsIAtom* nsHTMLAtoms::blockFrame; nsIAtom* nsHTMLAtoms::body; nsIAtom* nsHTMLAtoms::border; nsIAtom* nsHTMLAtoms::bordercolor; @@ -142,7 +141,6 @@ nsIAtom* nsHTMLAtoms::id; nsIAtom* nsHTMLAtoms::iframe; nsIAtom* nsHTMLAtoms::img; nsIAtom* nsHTMLAtoms::index; -nsIAtom* nsHTMLAtoms::inlineFrame; nsIAtom* nsHTMLAtoms::input; nsIAtom* nsHTMLAtoms::ismap; nsIAtom* nsHTMLAtoms::label; @@ -305,7 +303,6 @@ void nsHTMLAtoms::AddrefAtoms() background = NS_NewAtom("background"); below = NS_NewAtom("below"); bgcolor = NS_NewAtom("bgcolor"); - blockFrame = NS_NewAtom("BlockFrame"); body = NS_NewAtom("body"); border = NS_NewAtom("border"); bordercolor = NS_NewAtom("bordercolor"); @@ -405,7 +402,6 @@ void nsHTMLAtoms::AddrefAtoms() iframe = NS_NewAtom("iframe"); img = NS_NewAtom("img"); index = NS_NewAtom("index"); - inlineFrame = NS_NewAtom("InlineFrame"); input = NS_NewAtom("input"); ismap = NS_NewAtom("ismap"); label = NS_NewAtom("label"); @@ -565,7 +561,6 @@ void nsHTMLAtoms::ReleaseAtoms() NS_RELEASE(background); NS_RELEASE(below); NS_RELEASE(bgcolor); - NS_RELEASE(blockFrame); NS_RELEASE(body); NS_RELEASE(border); NS_RELEASE(bordercolor); @@ -659,7 +654,6 @@ void nsHTMLAtoms::ReleaseAtoms() NS_RELEASE(iframe); NS_RELEASE(img); NS_RELEASE(index); - NS_RELEASE(inlineFrame); NS_RELEASE(input); NS_RELEASE(ismap); NS_RELEASE(label); diff --git a/content/shared/src/nsHTMLAtoms.cpp b/content/shared/src/nsHTMLAtoms.cpp index 7591279b210c..fb8bafb427ef 100644 --- a/content/shared/src/nsHTMLAtoms.cpp +++ b/content/shared/src/nsHTMLAtoms.cpp @@ -43,7 +43,6 @@ nsIAtom* nsHTMLAtoms::axis; nsIAtom* nsHTMLAtoms::background; nsIAtom* nsHTMLAtoms::below; nsIAtom* nsHTMLAtoms::bgcolor; -nsIAtom* nsHTMLAtoms::blockFrame; nsIAtom* nsHTMLAtoms::body; nsIAtom* nsHTMLAtoms::border; nsIAtom* nsHTMLAtoms::bordercolor; @@ -142,7 +141,6 @@ nsIAtom* nsHTMLAtoms::id; nsIAtom* nsHTMLAtoms::iframe; nsIAtom* nsHTMLAtoms::img; nsIAtom* nsHTMLAtoms::index; -nsIAtom* nsHTMLAtoms::inlineFrame; nsIAtom* nsHTMLAtoms::input; nsIAtom* nsHTMLAtoms::ismap; nsIAtom* nsHTMLAtoms::label; @@ -305,7 +303,6 @@ void nsHTMLAtoms::AddrefAtoms() background = NS_NewAtom("background"); below = NS_NewAtom("below"); bgcolor = NS_NewAtom("bgcolor"); - blockFrame = NS_NewAtom("BlockFrame"); body = NS_NewAtom("body"); border = NS_NewAtom("border"); bordercolor = NS_NewAtom("bordercolor"); @@ -405,7 +402,6 @@ void nsHTMLAtoms::AddrefAtoms() iframe = NS_NewAtom("iframe"); img = NS_NewAtom("img"); index = NS_NewAtom("index"); - inlineFrame = NS_NewAtom("InlineFrame"); input = NS_NewAtom("input"); ismap = NS_NewAtom("ismap"); label = NS_NewAtom("label"); @@ -565,7 +561,6 @@ void nsHTMLAtoms::ReleaseAtoms() NS_RELEASE(background); NS_RELEASE(below); NS_RELEASE(bgcolor); - NS_RELEASE(blockFrame); NS_RELEASE(body); NS_RELEASE(border); NS_RELEASE(bordercolor); @@ -659,7 +654,6 @@ void nsHTMLAtoms::ReleaseAtoms() NS_RELEASE(iframe); NS_RELEASE(img); NS_RELEASE(index); - NS_RELEASE(inlineFrame); NS_RELEASE(input); NS_RELEASE(ismap); NS_RELEASE(label); diff --git a/layout/generic/nsBlockFrame.cpp b/layout/generic/nsBlockFrame.cpp index 5d98c7224d31..f38b9c1a3e93 100644 --- a/layout/generic/nsBlockFrame.cpp +++ b/layout/generic/nsBlockFrame.cpp @@ -1010,7 +1010,7 @@ NS_IMETHODIMP nsBlockFrame::GetFrameType(nsIAtom** aType) const { NS_PRECONDITION(nsnull != aType, "null OUT parameter pointer"); - *aType = nsHTMLAtoms::blockFrame; + *aType = nsLayoutAtoms::blockFrame; NS_ADDREF(*aType); return NS_OK; } diff --git a/layout/generic/nsBlockReflowState.cpp b/layout/generic/nsBlockReflowState.cpp index 5d98c7224d31..f38b9c1a3e93 100644 --- a/layout/generic/nsBlockReflowState.cpp +++ b/layout/generic/nsBlockReflowState.cpp @@ -1010,7 +1010,7 @@ NS_IMETHODIMP nsBlockFrame::GetFrameType(nsIAtom** aType) const { NS_PRECONDITION(nsnull != aType, "null OUT parameter pointer"); - *aType = nsHTMLAtoms::blockFrame; + *aType = nsLayoutAtoms::blockFrame; NS_ADDREF(*aType); return NS_OK; } diff --git a/layout/generic/nsBlockReflowState.h b/layout/generic/nsBlockReflowState.h index 5d98c7224d31..f38b9c1a3e93 100644 --- a/layout/generic/nsBlockReflowState.h +++ b/layout/generic/nsBlockReflowState.h @@ -1010,7 +1010,7 @@ NS_IMETHODIMP nsBlockFrame::GetFrameType(nsIAtom** aType) const { NS_PRECONDITION(nsnull != aType, "null OUT parameter pointer"); - *aType = nsHTMLAtoms::blockFrame; + *aType = nsLayoutAtoms::blockFrame; NS_ADDREF(*aType); return NS_OK; } diff --git a/layout/generic/nsInlineFrame.cpp b/layout/generic/nsInlineFrame.cpp index 0f7c5f766c8a..9c4668f339de 100644 --- a/layout/generic/nsInlineFrame.cpp +++ b/layout/generic/nsInlineFrame.cpp @@ -253,7 +253,7 @@ NS_IMETHODIMP nsInlineFrame::GetFrameType(nsIAtom** aType) const { NS_PRECONDITION(nsnull != aType, "null OUT parameter pointer"); - *aType = nsHTMLAtoms::inlineFrame; + *aType = nsLayoutAtoms::inlineFrame; NS_ADDREF(*aType); return NS_OK; } diff --git a/layout/html/base/src/nsBlockFrame.cpp b/layout/html/base/src/nsBlockFrame.cpp index 5d98c7224d31..f38b9c1a3e93 100644 --- a/layout/html/base/src/nsBlockFrame.cpp +++ b/layout/html/base/src/nsBlockFrame.cpp @@ -1010,7 +1010,7 @@ NS_IMETHODIMP nsBlockFrame::GetFrameType(nsIAtom** aType) const { NS_PRECONDITION(nsnull != aType, "null OUT parameter pointer"); - *aType = nsHTMLAtoms::blockFrame; + *aType = nsLayoutAtoms::blockFrame; NS_ADDREF(*aType); return NS_OK; } diff --git a/layout/html/base/src/nsBlockReflowState.cpp b/layout/html/base/src/nsBlockReflowState.cpp index 5d98c7224d31..f38b9c1a3e93 100644 --- a/layout/html/base/src/nsBlockReflowState.cpp +++ b/layout/html/base/src/nsBlockReflowState.cpp @@ -1010,7 +1010,7 @@ NS_IMETHODIMP nsBlockFrame::GetFrameType(nsIAtom** aType) const { NS_PRECONDITION(nsnull != aType, "null OUT parameter pointer"); - *aType = nsHTMLAtoms::blockFrame; + *aType = nsLayoutAtoms::blockFrame; NS_ADDREF(*aType); return NS_OK; } diff --git a/layout/html/base/src/nsBlockReflowState.h b/layout/html/base/src/nsBlockReflowState.h index 5d98c7224d31..f38b9c1a3e93 100644 --- a/layout/html/base/src/nsBlockReflowState.h +++ b/layout/html/base/src/nsBlockReflowState.h @@ -1010,7 +1010,7 @@ NS_IMETHODIMP nsBlockFrame::GetFrameType(nsIAtom** aType) const { NS_PRECONDITION(nsnull != aType, "null OUT parameter pointer"); - *aType = nsHTMLAtoms::blockFrame; + *aType = nsLayoutAtoms::blockFrame; NS_ADDREF(*aType); return NS_OK; } diff --git a/layout/html/base/src/nsHTMLAtoms.cpp b/layout/html/base/src/nsHTMLAtoms.cpp index 7591279b210c..fb8bafb427ef 100644 --- a/layout/html/base/src/nsHTMLAtoms.cpp +++ b/layout/html/base/src/nsHTMLAtoms.cpp @@ -43,7 +43,6 @@ nsIAtom* nsHTMLAtoms::axis; nsIAtom* nsHTMLAtoms::background; nsIAtom* nsHTMLAtoms::below; nsIAtom* nsHTMLAtoms::bgcolor; -nsIAtom* nsHTMLAtoms::blockFrame; nsIAtom* nsHTMLAtoms::body; nsIAtom* nsHTMLAtoms::border; nsIAtom* nsHTMLAtoms::bordercolor; @@ -142,7 +141,6 @@ nsIAtom* nsHTMLAtoms::id; nsIAtom* nsHTMLAtoms::iframe; nsIAtom* nsHTMLAtoms::img; nsIAtom* nsHTMLAtoms::index; -nsIAtom* nsHTMLAtoms::inlineFrame; nsIAtom* nsHTMLAtoms::input; nsIAtom* nsHTMLAtoms::ismap; nsIAtom* nsHTMLAtoms::label; @@ -305,7 +303,6 @@ void nsHTMLAtoms::AddrefAtoms() background = NS_NewAtom("background"); below = NS_NewAtom("below"); bgcolor = NS_NewAtom("bgcolor"); - blockFrame = NS_NewAtom("BlockFrame"); body = NS_NewAtom("body"); border = NS_NewAtom("border"); bordercolor = NS_NewAtom("bordercolor"); @@ -405,7 +402,6 @@ void nsHTMLAtoms::AddrefAtoms() iframe = NS_NewAtom("iframe"); img = NS_NewAtom("img"); index = NS_NewAtom("index"); - inlineFrame = NS_NewAtom("InlineFrame"); input = NS_NewAtom("input"); ismap = NS_NewAtom("ismap"); label = NS_NewAtom("label"); @@ -565,7 +561,6 @@ void nsHTMLAtoms::ReleaseAtoms() NS_RELEASE(background); NS_RELEASE(below); NS_RELEASE(bgcolor); - NS_RELEASE(blockFrame); NS_RELEASE(body); NS_RELEASE(border); NS_RELEASE(bordercolor); @@ -659,7 +654,6 @@ void nsHTMLAtoms::ReleaseAtoms() NS_RELEASE(iframe); NS_RELEASE(img); NS_RELEASE(index); - NS_RELEASE(inlineFrame); NS_RELEASE(input); NS_RELEASE(ismap); NS_RELEASE(label); diff --git a/layout/html/base/src/nsInlineFrame.cpp b/layout/html/base/src/nsInlineFrame.cpp index 0f7c5f766c8a..9c4668f339de 100644 --- a/layout/html/base/src/nsInlineFrame.cpp +++ b/layout/html/base/src/nsInlineFrame.cpp @@ -253,7 +253,7 @@ NS_IMETHODIMP nsInlineFrame::GetFrameType(nsIAtom** aType) const { NS_PRECONDITION(nsnull != aType, "null OUT parameter pointer"); - *aType = nsHTMLAtoms::inlineFrame; + *aType = nsLayoutAtoms::inlineFrame; NS_ADDREF(*aType); return NS_OK; }