Bug 333896 Convert GetAttr calls to AttrValueIs and FindAttrValueIn.

Patch by alfred.peng@sun.com.
dbaron: review+
roc: superreview+

widget/public/Makefile.in

@@ -72,10 +72,6 @@ EXPORTS		= \
 		nsIDeviceContextSpecFactory.h \
 		$(NULL)
 
-ifneq (,$(filter mac cocoa,$(MOZ_WIDGET_TOOLKIT)))
-EXPORTS       += nsWidgetAtoms.h nsWidgetAtomList.h
-endif
-
 XPIDLSRCS	= \
 		nsIAppShell.idl \
 		nsIFilePicker.idl \

widget/src/Makefile.in

@@ -72,7 +72,7 @@ endif
 #
 ifdef MOZ_ENABLE_GTK
 DIRS		+= gtksuperwin
-DIRS            += gtkxtbin
+DIRS		+= gtkxtbin
 DIRS		+= gtk
 endif
 

widget/src/beos/nsToolkit.cpp

@@ -40,6 +40,7 @@
 #include "prmon.h"
 #include "nsSwitchToUIThread.h"
 #include "prprf.h"
+#include "nsWidgetAtoms.h"
 
 // 
 // Static thread local storage index of the Toolkit 
@@ -205,6 +206,8 @@ NS_METHOD nsToolkit::Init(PRThread *aThread)
 
   cached = false;
 
+  nsWidgetAtoms::RegisterAtoms();
+
   return NS_OK;
 }
 

widget/src/build/Makefile.in

@@ -73,7 +73,6 @@ endif
 LOCAL_INCLUDES	= \
 		-I$(srcdir) \
 		-I$(srcdir)/../xpwidgets \
-		-I$(srcdir)/../../public \
 		-I$(srcdir)/../windows \
 		$(NULL)
 

widget/src/gtk/Makefile.in

@@ -143,7 +143,6 @@ endif
 
 LOCAL_INCLUDES	= \
 		-I$(srcdir)/../xpwidgets \
-		-I$(srcdir)/../../public \
 		-I$(srcdir) \
 		-I$(topsrcdir)/gfx/src/gtk \
 		$(NULL)

widget/src/gtk2/Makefile.in

@@ -163,7 +163,6 @@ endif
 DEFINES		+= 
 INCLUDES	+= \
 		-I$(srcdir)/../xpwidgets \
-		-I$(srcdir)/../../public \
 		$(NULL)
 
 test_container: mozdrawingarea.o mozcontainer.o test_container.c

widget/src/os2/nsToolkit.cpp

@@ -39,6 +39,7 @@
 
 #include "nsToolkit.h"
 #include "nsSwitchToUIThread.h"
+#include "nsWidgetAtoms.h"
 
 // Window procedure for the internal window
 static MRESULT EXPENTRY nsToolkitWindowProc(HWND, ULONG, MPARAM, MPARAM);
@@ -192,6 +193,9 @@ NS_METHOD nsToolkit::Init(PRThread *aThread)
         // create a thread where the message pump will run
         CreateUIThread();
     }
+
+    nsWidgetAtoms::RegisterAtoms();
+
     return NS_OK;
 }
 

widget/src/photon/nsToolkit.cpp

@@ -37,6 +37,7 @@
 
 #include "nsToolkit.h"
 #include "nscore.h"
+#include "nsWidgetAtoms.h"
 
 //
 // Static thread local storage index of the Toolkit 
@@ -74,6 +75,8 @@ nsToolkit::~nsToolkit()
 //-------------------------------------------------------------------------
 NS_METHOD nsToolkit::Init(PRThread *aThread)
 {
+  nsWidgetAtoms::RegisterAtoms();
+
   return NS_OK;
 }
 

widget/src/qt/nsToolkit.cpp

@@ -42,6 +42,7 @@
 #include "nsToolkit.h"
 #include "nsGUIEvent.h"
 #include "plevent.h"
+#include "nsWidgetAtoms.h"
 
 // Static thread local storage index of the Toolkit
 // object associated with a given thread...
@@ -71,6 +72,8 @@ NS_IMPL_ISUPPORTS1(nsToolkit, nsIToolkit)
 //-------------------------------------------------------------------------
 NS_IMETHODIMP nsToolkit::Init(PRThread *aThread)
 {
+  nsWidgetAtoms::RegisterAtoms();
+
   return NS_OK;
 }
 

widget/src/windows/Makefile.in

@@ -120,7 +120,6 @@ EXPORTS		= nsdefs.h
 LOCAL_INCLUDES	= \
 		-I. \
 		-I$(srcdir)/../xpwidgets \
-		-I$(srcdir)/../../public \
 		-I$(srcdir) \
 		$(NULL)
 

widget/src/xlib/nsToolkit.cpp

@@ -40,6 +40,7 @@
 #include "nsToolkit.h"
 #include "nsGCCache.h"
 #include "nsAppShell.h" // needed for nsAppShell::GetXlibRgbHandle()
+#include "nsWidgetAtoms.h"
 
 // Static Thread Local Storage index of the toolkit object associated with
 // a given thread...
@@ -84,6 +85,8 @@ NS_METHOD nsToolkit::Init(PRThread *aThread)
 {
   CreateSharedGC();
 
+  nsWidgetAtoms::RegisterAtoms();
+
   return NS_OK;
 }
 

widget/src/xpwidgets/Makefile.in

@@ -98,7 +98,6 @@ endif
 
 LOCAL_INCLUDES	= \
 		-I$(srcdir)/../$(MOZ_WIDGET_TOOLKIT) \
-		-I$(srcdir)/../../public \
 		-I$(srcdir) \
 		$(NULL)
 

widget/src/xpwidgets/nsWidgetAtomList.h

@@ -54,51 +54,45 @@
 
  ******/
 
+WIDGET_ATOM(accesskey, "accesskey") // The shortcut key for a menu or menu item
 WIDGET_ATOM(ascending, "ascending")
+WIDGET_ATOM(autocheck, "autocheck")
+WIDGET_ATOM(checkbox, "checkbox")
 WIDGET_ATOM(checked, "checked")
 WIDGET_ATOM(_class, "class")
+WIDGET_ATOM(collapsed, "collapsed")
+WIDGET_ATOM(command, "command")
 WIDGET_ATOM(curpos, "curpos")
 WIDGET_ATOM(_default, "default")
 WIDGET_ATOM(descending, "descending")
 WIDGET_ATOM(disabled, "disabled")
-WIDGET_ATOM(focused, "focused")
-WIDGET_ATOM(maxpos, "maxpos")
-WIDGET_ATOM(mode, "mode")
-WIDGET_ATOM(mozmenuactive, "_moz-menuactive")
-WIDGET_ATOM(readonly, "readonly")
-WIDGET_ATOM(selected, "selected")
-WIDGET_ATOM(sortdirection, "sortDirection")
-WIDGET_ATOM(_true, "true")
-WIDGET_ATOM(value, "value")
-
-#if defined(XP_MACOSX)
-WIDGET_ATOM(accesskey, "accesskey") // The shortcut key for a menu or menu item
-WIDGET_ATOM(autocheck, "autocheck")
-WIDGET_ATOM(checkbox, "checkbox")
-WIDGET_ATOM(collapsed, "collapsed")
-WIDGET_ATOM(command, "command")
 WIDGET_ATOM(_false, "false")
+WIDGET_ATOM(firsttab, "first-tab")
+WIDGET_ATOM(focused, "focused")
 WIDGET_ATOM(hidden, "hidden")
 WIDGET_ATOM(horizontal, "horizontal")
 WIDGET_ATOM(id, "id")
+WIDGET_ATOM(input, "input")
 WIDGET_ATOM(key, "key") // The key element / attribute
 WIDGET_ATOM(label, "label")
+WIDGET_ATOM(maxpos, "maxpos")
 WIDGET_ATOM(menu, "menu") // Represents an XP menu
 WIDGET_ATOM(menuitem, "menuitem") // Represents an XP menu item
 WIDGET_ATOM(menupopup, "menupopup") // The XP menu's children.
 WIDGET_ATOM(menuseparator, "menuseparator")  // Divider between menu items
 WIDGET_ATOM(minpos, "minpos")
+WIDGET_ATOM(mode, "mode")
 WIDGET_ATOM(modifiers, "modifiers") // The modifiers attribute
+WIDGET_ATOM(mozinputchecked, "_moz-input-checked")
+WIDGET_ATOM(mozmenuactive, "_moz-menuactive")
 WIDGET_ATOM(name, "name")
 WIDGET_ATOM(open, "open") // Whether or not a menu, tree, etc. is open
 WIDGET_ATOM(orient, "orient")
 WIDGET_ATOM(radio, "radio")
+WIDGET_ATOM(readonly, "readonly")
+WIDGET_ATOM(selected, "selected")
+WIDGET_ATOM(sortdirection, "sortDirection")
+WIDGET_ATOM(_true, "true")
 WIDGET_ATOM(type, "type")
-#endif
-
-#if defined(MOZ_WIDGET_GTK) || defined(MOZ_WIDGET_GTK2)
-WIDGET_ATOM(firsttab, "first-tab")
-WIDGET_ATOM(input, "input")
-WIDGET_ATOM(mozinputchecked, "_moz-input-checked")
-#endif
+WIDGET_ATOM(value, "value")