From 461f05b3f0b0a8bc87253b14ebba11ecf9351806 Mon Sep 17 00:00:00 2001
From: Henri Sivonen <hsivonen@iki.fi>
Date: Tue, 24 Nov 2009 14:28:18 +0200
Subject: [PATCH] Bug 529544 - Shut down the HTML5 parser thread from an
 observer (random crash [@ mozilla::storage::Connection::Close()]). r=sdwilsh.

--HG--
extra : rebase_source : b63735cb935261066b0836d451967a87a5c22929
---
 parser/html/nsHtml5Module.cpp                 | 33 +++++++++++++++++--
 parser/htmlparser/tests/mochitest/Makefile.in |  4 +--
 .../tests/mochitest/test_compatmode.html      | 10 +++---
 3 files changed, 36 insertions(+), 11 deletions(-)

diff --git a/parser/html/nsHtml5Module.cpp b/parser/html/nsHtml5Module.cpp
index daad73913b9e..33f8e8a66dd2 100644
--- a/parser/html/nsHtml5Module.cpp
+++ b/parser/html/nsHtml5Module.cpp
@@ -46,6 +46,8 @@
 #include "nsHtml5TreeBuilder.h"
 #include "nsHtml5UTF16Buffer.h"
 #include "nsHtml5Module.h"
+#include "nsIObserverService.h"
+#include "nsIServiceManager.h"
 
 // static
 PRBool nsHtml5Module::sEnabled = PR_FALSE;
@@ -90,9 +92,6 @@ nsHtml5Module::ReleaseStatics()
   nsHtml5Tokenizer::releaseStatics();
   nsHtml5TreeBuilder::releaseStatics();
   nsHtml5UTF16Buffer::releaseStatics();
-  if (sStreamParserThread) {
-    sStreamParserThread->Shutdown();
-  }
   NS_IF_RELEASE(sStreamParserThread);
   NS_IF_RELEASE(sMainThread);
 }
@@ -116,6 +115,29 @@ nsHtml5Module::Initialize(nsIParser* aParser, nsIDocument* aDoc, nsIURI* aURI, n
   return parser->Initialize(aDoc, aURI, aContainer, aChannel);
 }
 
+class nsHtml5ParserThreadTerminator : public nsIObserver
+{
+  public:
+    NS_DECL_ISUPPORTS
+    nsHtml5ParserThreadTerminator(nsIThread* aThread)
+      : mThread(aThread)
+    {}
+    NS_IMETHODIMP Observe(nsISupports *, const char *topic, const PRUnichar *)
+    {
+      NS_ASSERTION(!strcmp(topic, "xpcom-shutdown-threads"), 
+                   "Unexpected topic");
+      if (mThread) {
+        mThread->Shutdown();
+        mThread = nsnull;
+      }
+      return NS_OK;
+    }
+  private:
+    nsCOMPtr<nsIThread> mThread;
+};
+
+NS_IMPL_ISUPPORTS1(nsHtml5ParserThreadTerminator, nsIObserver)
+
 // static 
 nsIThread*
 nsHtml5Module::GetStreamParserThread()
@@ -124,6 +146,11 @@ nsHtml5Module::GetStreamParserThread()
     if (!sStreamParserThread) {
       NS_NewThread(&sStreamParserThread);
       NS_ASSERTION(sStreamParserThread, "Thread creation failed!");
+      nsCOMPtr<nsIObserverService> os = do_GetService("@mozilla.org/observer-service;1");
+      NS_ASSERTION(os, "do_GetService failed");
+      os->AddObserver(new nsHtml5ParserThreadTerminator(sStreamParserThread), 
+                      "xpcom-shutdown-threads",
+                      PR_FALSE);
     }
     return sStreamParserThread;
   }
diff --git a/parser/htmlparser/tests/mochitest/Makefile.in b/parser/htmlparser/tests/mochitest/Makefile.in
index ac787859ed5e..dcddf627295e 100644
--- a/parser/htmlparser/tests/mochitest/Makefile.in
+++ b/parser/htmlparser/tests/mochitest/Makefile.in
@@ -57,6 +57,7 @@ _TEST_FILES =	parser_datreader.js \
 		test_bug396568.html \
 		test_bug418464.html \
 		test_bug460437.xhtml \
+		test_bug502091.html \
 		bug_502091_iframe.html \
 		test_compatmode.html \
 		regressions.txt \
@@ -65,6 +66,3 @@ _TEST_FILES =	parser_datreader.js \
 
 libs:: $(_TEST_FILES)
 	$(INSTALL) $(foreach f,$^,"$f") $(DEPTH)/_tests/testing/mochitest/tests/$(relativesrcdir)
-
-# Disabled due to bug 529544
-#		test_bug502091.html \
diff --git a/parser/htmlparser/tests/mochitest/test_compatmode.html b/parser/htmlparser/tests/mochitest/test_compatmode.html
index 17090f87ea16..2c7b618aeacf 100644
--- a/parser/htmlparser/tests/mochitest/test_compatmode.html
+++ b/parser/htmlparser/tests/mochitest/test_compatmode.html
@@ -77,12 +77,12 @@ function finishTest() {
 function test(mode,i){
   is(mode,doctypes[i],doctypes[i+1]);
   if (i == doctypes.length - 2) {
-//    if (typeof(gOriginalHtml5Pref) == "undefined") {
-//      doTestHtml5(); Disabled due to bug 529544
-//    }
-//    else {
+    if (typeof(gOriginalHtml5Pref) == "undefined") {
+      doTestHtml5();
+    }
+    else {
       finishTest();
-//    }
+    }
   }
 }