added nsLayoutAtoms

content/shared/src/nsLayoutAtoms.cpp

@@ -0,0 +1,68 @@
+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
+ *
+ * The contents of this file are subject to the Netscape Public License
+ * Version 1.0 (the "NPL"); you may not use this file except in
+ * compliance with the NPL.  You may obtain a copy of the NPL at
+ * http://www.mozilla.org/NPL/
+ *
+ * Software distributed under the NPL is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL
+ * for the specific language governing rights and limitations under the
+ * NPL.
+ *
+ * The Initial Developer of this code under the NPL is Netscape
+ * Communications Corporation.  Portions created by Netscape are
+ * Copyright (C) 1998 Netscape Communications Corporation.  All Rights
+ * Reserved.
+ */
+#include "nsLayoutAtoms.h"
+
+// XXX make this be autogenerated. doh!
+
+nsIAtom* nsLayoutAtoms::all;
+nsIAtom* nsLayoutAtoms::aural;
+nsIAtom* nsLayoutAtoms::braille;
+nsIAtom* nsLayoutAtoms::embossed;
+nsIAtom* nsLayoutAtoms::handheld;
+nsIAtom* nsLayoutAtoms::print;
+nsIAtom* nsLayoutAtoms::projection;
+nsIAtom* nsLayoutAtoms::screen;
+nsIAtom* nsLayoutAtoms::tty;
+nsIAtom* nsLayoutAtoms::tv;
+
+static nsrefcnt gRefCnt;
+
+void nsLayoutAtoms::AddrefAtoms()
+{
+  if (0 == gRefCnt) {
+    all = NS_NewAtom("ALL");
+    aural = NS_NewAtom("AURAL");
+    braille = NS_NewAtom("BRAILLE");
+    embossed = NS_NewAtom("EMBOSSED");
+    handheld = NS_NewAtom("HANDHELD");
+    print = NS_NewAtom("PRINT");
+    projection = NS_NewAtom("PROJECTION");
+    screen = NS_NewAtom("SCREEN");
+    tty = NS_NewAtom("TTY");
+    tv = NS_NewAtom("TV");
+  }
+  ++gRefCnt;
+}
+
+void nsLayoutAtoms::ReleaseAtoms()
+{
+  NS_PRECONDITION(gRefCnt != 0, "bad release atoms");
+  if (--gRefCnt == 0) {
+    NS_RELEASE(all);
+    NS_RELEASE(aural);
+    NS_RELEASE(braille);
+    NS_RELEASE(embossed);
+    NS_RELEASE(handheld);
+    NS_RELEASE(print);
+    NS_RELEASE(projection);
+    NS_RELEASE(screen);
+    NS_RELEASE(tty);
+    NS_RELEASE(tv);
+  }
+}
+

layout/base/nsLayoutAtoms.cpp

@@ -0,0 +1,68 @@
+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
+ *
+ * The contents of this file are subject to the Netscape Public License
+ * Version 1.0 (the "NPL"); you may not use this file except in
+ * compliance with the NPL.  You may obtain a copy of the NPL at
+ * http://www.mozilla.org/NPL/
+ *
+ * Software distributed under the NPL is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL
+ * for the specific language governing rights and limitations under the
+ * NPL.
+ *
+ * The Initial Developer of this code under the NPL is Netscape
+ * Communications Corporation.  Portions created by Netscape are
+ * Copyright (C) 1998 Netscape Communications Corporation.  All Rights
+ * Reserved.
+ */
+#include "nsLayoutAtoms.h"
+
+// XXX make this be autogenerated. doh!
+
+nsIAtom* nsLayoutAtoms::all;
+nsIAtom* nsLayoutAtoms::aural;
+nsIAtom* nsLayoutAtoms::braille;
+nsIAtom* nsLayoutAtoms::embossed;
+nsIAtom* nsLayoutAtoms::handheld;
+nsIAtom* nsLayoutAtoms::print;
+nsIAtom* nsLayoutAtoms::projection;
+nsIAtom* nsLayoutAtoms::screen;
+nsIAtom* nsLayoutAtoms::tty;
+nsIAtom* nsLayoutAtoms::tv;
+
+static nsrefcnt gRefCnt;
+
+void nsLayoutAtoms::AddrefAtoms()
+{
+  if (0 == gRefCnt) {
+    all = NS_NewAtom("ALL");
+    aural = NS_NewAtom("AURAL");
+    braille = NS_NewAtom("BRAILLE");
+    embossed = NS_NewAtom("EMBOSSED");
+    handheld = NS_NewAtom("HANDHELD");
+    print = NS_NewAtom("PRINT");
+    projection = NS_NewAtom("PROJECTION");
+    screen = NS_NewAtom("SCREEN");
+    tty = NS_NewAtom("TTY");
+    tv = NS_NewAtom("TV");
+  }
+  ++gRefCnt;
+}
+
+void nsLayoutAtoms::ReleaseAtoms()
+{
+  NS_PRECONDITION(gRefCnt != 0, "bad release atoms");
+  if (--gRefCnt == 0) {
+    NS_RELEASE(all);
+    NS_RELEASE(aural);
+    NS_RELEASE(braille);
+    NS_RELEASE(embossed);
+    NS_RELEASE(handheld);
+    NS_RELEASE(print);
+    NS_RELEASE(projection);
+    NS_RELEASE(screen);
+    NS_RELEASE(tty);
+    NS_RELEASE(tv);
+  }
+}
+

layout/base/nsPresContext.cpp

@@ -30,6 +30,7 @@
 #include "nsIDocument.h"
 #include "nsIFrame.h"
 #include "nsIStyleContext.h"
+#include "nsLayoutAtoms.h"
 #ifdef _WIN32
 #include <windows.h>
 #endif
@@ -67,6 +68,7 @@ nsPresContext::nsPresContext()
                       NSIntPointsToTwips(10))
 {
   NS_INIT_REFCNT();
+  nsLayoutAtoms::AddrefAtoms();
   mCompatibilityMode = eCompatibility_NavQuirks;
 
 #ifdef _WIN32
@@ -108,6 +110,7 @@ nsPresContext::~nsPresContext()
   }
   NS_IF_RELEASE(mPrefs);
   NS_IF_RELEASE(mBaseURL);
+  nsLayoutAtoms::ReleaseAtoms();
 }
 
 nsrefcnt

layout/base/src/Makefile.in

@@ -47,6 +47,7 @@ CPPSRCS =				\
 	nsXIFConverter.cpp		\
 	nsRange.cpp		\
 	nsRangeList.cpp		\
+	nsLayoutAtoms.cpp		\
 	$(NULL)
 
 MODULE = raptor

layout/base/src/makefile.win

@@ -39,6 +39,7 @@ CPPSRCS =				\
 	nsTextFragment.cpp		\
 	nsXIFConverter.cpp		\
 	nsRangeList.cpp		\
+	nsLayoutAtoms.cpp		\
 	$(NULL)
 
 MODULE=raptor 
@@ -64,6 +65,7 @@ CPP_OBJS=					\
 	.\$(OBJDIR)\nsTextFragment.obj		\
 	.\$(OBJDIR)\nsXIFConverter.obj		\
 	.\$(OBJDIR)\nsRangeList.obj		\
+	.\$(OBJDIR)\nsLayoutAtoms.obj		\
 	$(NULL)
 
 LINCS=-I$(PUBLIC)\xpcom -I$(PUBLIC)\raptor \

layout/base/src/nsLayoutAtoms.cpp

@@ -0,0 +1,68 @@
+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
+ *
+ * The contents of this file are subject to the Netscape Public License
+ * Version 1.0 (the "NPL"); you may not use this file except in
+ * compliance with the NPL.  You may obtain a copy of the NPL at
+ * http://www.mozilla.org/NPL/
+ *
+ * Software distributed under the NPL is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL
+ * for the specific language governing rights and limitations under the
+ * NPL.
+ *
+ * The Initial Developer of this code under the NPL is Netscape
+ * Communications Corporation.  Portions created by Netscape are
+ * Copyright (C) 1998 Netscape Communications Corporation.  All Rights
+ * Reserved.
+ */
+#include "nsLayoutAtoms.h"
+
+// XXX make this be autogenerated. doh!
+
+nsIAtom* nsLayoutAtoms::all;
+nsIAtom* nsLayoutAtoms::aural;
+nsIAtom* nsLayoutAtoms::braille;
+nsIAtom* nsLayoutAtoms::embossed;
+nsIAtom* nsLayoutAtoms::handheld;
+nsIAtom* nsLayoutAtoms::print;
+nsIAtom* nsLayoutAtoms::projection;
+nsIAtom* nsLayoutAtoms::screen;
+nsIAtom* nsLayoutAtoms::tty;
+nsIAtom* nsLayoutAtoms::tv;
+
+static nsrefcnt gRefCnt;
+
+void nsLayoutAtoms::AddrefAtoms()
+{
+  if (0 == gRefCnt) {
+    all = NS_NewAtom("ALL");
+    aural = NS_NewAtom("AURAL");
+    braille = NS_NewAtom("BRAILLE");
+    embossed = NS_NewAtom("EMBOSSED");
+    handheld = NS_NewAtom("HANDHELD");
+    print = NS_NewAtom("PRINT");
+    projection = NS_NewAtom("PROJECTION");
+    screen = NS_NewAtom("SCREEN");
+    tty = NS_NewAtom("TTY");
+    tv = NS_NewAtom("TV");
+  }
+  ++gRefCnt;
+}
+
+void nsLayoutAtoms::ReleaseAtoms()
+{
+  NS_PRECONDITION(gRefCnt != 0, "bad release atoms");
+  if (--gRefCnt == 0) {
+    NS_RELEASE(all);
+    NS_RELEASE(aural);
+    NS_RELEASE(braille);
+    NS_RELEASE(embossed);
+    NS_RELEASE(handheld);
+    NS_RELEASE(print);
+    NS_RELEASE(projection);
+    NS_RELEASE(screen);
+    NS_RELEASE(tty);
+    NS_RELEASE(tv);
+  }
+}
+

layout/base/src/nsPresContext.cpp

@@ -30,6 +30,7 @@
 #include "nsIDocument.h"
 #include "nsIFrame.h"
 #include "nsIStyleContext.h"
+#include "nsLayoutAtoms.h"
 #ifdef _WIN32
 #include <windows.h>
 #endif
@@ -67,6 +68,7 @@ nsPresContext::nsPresContext()
                       NSIntPointsToTwips(10))
 {
   NS_INIT_REFCNT();
+  nsLayoutAtoms::AddrefAtoms();
   mCompatibilityMode = eCompatibility_NavQuirks;
 
 #ifdef _WIN32
@@ -108,6 +110,7 @@ nsPresContext::~nsPresContext()
   }
   NS_IF_RELEASE(mPrefs);
   NS_IF_RELEASE(mBaseURL);
+  nsLayoutAtoms::ReleaseAtoms();
 }
 
 nsrefcnt