Bug 502176 bustage fix - Restore the refcount tracing code to nsHtml5Tokenizer. a=orange.
authorHenri Sivonen <hsivonen@iki.fi>
Wed, 10 Nov 2010 12:03:48 +0200
changeset 57198 3cd4bdbfce3b0ab1b9a7e0c3b30b0f1555fe0b65
parent 57197 9623c20329488f0511d7a5d93805aa0243e2c91d
child 57199 df1d1ff6b48909528d670a829e3be11e12cbe38c
push id16842
push userhsivonen@iki.fi
push dateWed, 10 Nov 2010 10:05:39 +0000
treeherdermozilla-central@3cd4bdbfce3b [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersorange
bugs502176
milestone2.0b8pre
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 502176 bustage fix - Restore the refcount tracing code to nsHtml5Tokenizer. a=orange.
parser/html/javasrc/Tokenizer.java
parser/html/nsHtml5Tokenizer.cpp
parser/html/nsHtml5Tokenizer.h
--- a/parser/html/javasrc/Tokenizer.java
+++ b/parser/html/javasrc/Tokenizer.java
@@ -6909,16 +6909,20 @@ public class Tokenizer implements Locato
      * @param encodingDeclarationHandler
      *            the encodingDeclarationHandler to set
      */
     public void setEncodingDeclarationHandler(
             EncodingDeclarationHandler encodingDeclarationHandler) {
         this.encodingDeclarationHandler = encodingDeclarationHandler;
     }
     
+    void destructor() {
+        // The translator will write refcount tracing stuff here
+    }
+    
     // [NOCPP[
     
     /**
      * Sets an offset to be added to the position reported to 
      * <code>TransitionHandler</code>.
      * 
      * @param offset the offset
      */
--- a/parser/html/nsHtml5Tokenizer.cpp
+++ b/parser/html/nsHtml5Tokenizer.cpp
@@ -3875,16 +3875,22 @@ nsHtml5Tokenizer::initializeWithoutStart
 }
 
 void 
 nsHtml5Tokenizer::setEncodingDeclarationHandler(nsHtml5StreamParser* encodingDeclarationHandler)
 {
   this->encodingDeclarationHandler = encodingDeclarationHandler;
 }
 
+
+nsHtml5Tokenizer::~nsHtml5Tokenizer()
+{
+  MOZ_COUNT_DTOR(nsHtml5Tokenizer);
+}
+
 void
 nsHtml5Tokenizer::initializeStatics()
 {
 }
 
 void
 nsHtml5Tokenizer::releaseStatics()
 {
--- a/parser/html/nsHtml5Tokenizer.h
+++ b/parser/html/nsHtml5Tokenizer.h
@@ -282,16 +282,17 @@ class nsHtml5Tokenizer
   public:
     void end();
     void requestSuspension();
     PRBool isInDataState();
     void resetToDataState();
     void loadState(nsHtml5Tokenizer* other);
     void initializeWithoutStarting();
     void setEncodingDeclarationHandler(nsHtml5StreamParser* encodingDeclarationHandler);
+    ~nsHtml5Tokenizer();
     static void initializeStatics();
     static void releaseStatics();
 };
 
 #define NS_HTML5TOKENIZER_DATA_AND_RCDATA_MASK ~1
 #define NS_HTML5TOKENIZER_DATA 0
 #define NS_HTML5TOKENIZER_RCDATA 1
 #define NS_HTML5TOKENIZER_SCRIPT_DATA 2