merge backout
authorDão Gottwald <dao@mozilla.com>
Tue, 27 Sep 2011 10:53:28 +0200
changeset 77692 80fdbbe5390628042da27a6c300fa87005accde3
parent 77690 4549ae3561440f69d5fa2531c912759e76fb69f4 (current diff)
parent 77691 8b31900dda21d8ca91f57ebe857d1fcc16094a44 (diff)
child 77693 ac92a6d8297c555da8dc9ae8196e7e10730f0569
push id3
push userfelipc@gmail.com
push dateFri, 30 Sep 2011 20:09:13 +0000
milestone9.0a1
merge backout
content/base/src/nsDocument.cpp
--- a/content/base/public/nsIDocument.h
+++ b/content/base/public/nsIDocument.h
@@ -1574,17 +1574,17 @@ public:
   enum DeprecatedOperations {
 #include "nsDeprecatedOperationList.h"
     eDeprecatedOperationCount
   };
 #undef DEPRECATED_OPERATION
   void WarnOnceAbout(DeprecatedOperations aOperation);
 
 private:
-  PRUint64 mWarnedAbout;
+  PRUint32 mWarnedAbout;
 
 protected:
   ~nsIDocument()
   {
     // XXX The cleanup of mNodeInfoManager (calling DropDocumentReference and
     //     releasing it) happens in the nsDocument destructor. We'd prefer to
     //     do it here but nsNodeInfoManager is a concrete class that we don't
     //     want to expose to users of the nsIDocument API outside of Gecko.
--- a/content/base/src/nsDocument.cpp
+++ b/content/base/src/nsDocument.cpp
@@ -8151,17 +8151,17 @@ static const char* kWarnings[] = {
 #include "nsDeprecatedOperationList.h"
   nsnull
 };
 #undef DEPRECATED_OPERATION
 
 void
 nsIDocument::WarnOnceAbout(DeprecatedOperations aOperation)
 {
-  PR_STATIC_ASSERT(eDeprecatedOperationCount <= 64);
+  PR_STATIC_ASSERT(eDeprecatedOperationCount <= 32);
   if (mWarnedAbout & (1 << aOperation)) {
     return;
   }
   mWarnedAbout |= (1 << aOperation);
   nsContentUtils::ReportToConsole(nsContentUtils::eDOM_PROPERTIES,
                                   kWarnings[aOperation],
                                   nsnull, 0,
                                   nsnull,