remove parts of patch for bug 276959 that were not intended to be checked in.

content/base/src/nsGenericElement.cpp

@@ -1296,14 +1296,7 @@ nsGenericElement::GetAttribute(const nsAString& aName,
   const nsAttrName* name = InternalGetExistingAttrNameFromQName(aName);
 
   if (!name) {
-    if (mNodeInfo->NamespaceID() == kNameSpaceID_XUL) {
-      // XXX should be SetDOMStringToNull(aReturn);
-      // See bug 232598
-      aReturn.Truncate();
-    }
-    else {
-      SetDOMStringToNull(aReturn);
-    }
+    SetDOMStringToNull(aReturn);
 
     return NS_OK;
   }

content/base/src/nsGenericElement.h

@@ -63,7 +63,6 @@ class nsDOMAttributeMap;
 class nsIURI;
 class nsVoidArray;
 class nsINodeInfo;
-class nsIControllers;
 
 typedef unsigned long PtrBits;
 
@@ -89,20 +88,8 @@ typedef unsigned long PtrBits;
 /** Whether this content has had any properties set on it */
 #define GENERIC_ELEMENT_HAS_PROPERTIES         0x00000010U
 
-/**
- * Next three bits are used for XUL Element's lazy state.
- * @see nsIXULContent
- */
-#define GENERIC_ELEMENT_CHILDREN_TO_REBUILT    0x00000020U
-
-#define GENERIC_ELEMENT_TEMPLATE_BUILT         0x00000040U
-
-#define GENERIC_ELEMENT_CONTAINER_BUILT        0x00000080U
-
-#define GENERIC_ELEMENT_LAZY_STATE_OFFSET 5
-
 /** The number of bits to shift the bit field to get at the content ID */
-#define GENERIC_ELEMENT_CONTENT_ID_BITS_OFFSET 8
+#define GENERIC_ELEMENT_CONTENT_ID_BITS_OFFSET 5
 
 /** This mask masks out the bits that are used for the content ID */
 #define GENERIC_ELEMENT_CONTENT_ID_MASK \
@@ -181,18 +168,11 @@ public:
    */
   nsRefPtr<nsDOMAttributeMap> mAttributeMap;
 
-  union {
-    /**
-    * The nearest enclosing content node with a binding that created us.
-    * @see nsGenericElement::GetBindingParent
-    */
-    nsIContent* mBindingParent;  // [Weak]
-
-    /**
-    * The controllers of the XUL Element.
-    */
-    nsIControllers* mControllers; // [OWNER]
-  };
+  /**
+   * The nearest enclosing content node with a binding that created us.
+   * @see nsGenericElement::GetBindingParent
+   */
+  nsIContent* mBindingParent; // [Weak]
 
   // DEPRECATED, DON'T USE THIS
   PRUint32 mContentID;