From e284b18b93cb3df8b1c93319a7baa5734bdd0f96 Mon Sep 17 00:00:00 2001 From: Kyle Huey Date: Wed, 24 Nov 2010 01:09:48 +0100 Subject: [PATCH] Bug 613027: Make nsHTMLFieldSetElement participate in cycle collection properly. r=peterv a=blocking-final --- content/html/content/crashtests/613027.html | 21 +++++++++++++++++++ .../html/content/crashtests/crashtests.list | 1 + .../content/src/nsHTMLFieldSetElement.cpp | 5 +++-- .../html/content/src/nsHTMLFieldSetElement.h | 2 +- 4 files changed, 26 insertions(+), 3 deletions(-) create mode 100644 content/html/content/crashtests/613027.html diff --git a/content/html/content/crashtests/613027.html b/content/html/content/crashtests/613027.html new file mode 100644 index 000000000000..a866860f1060 --- /dev/null +++ b/content/html/content/crashtests/613027.html @@ -0,0 +1,21 @@ + + + + + + + diff --git a/content/html/content/crashtests/crashtests.list b/content/html/content/crashtests/crashtests.list index ad556be3484c..72dc20f83b62 100644 --- a/content/html/content/crashtests/crashtests.list +++ b/content/html/content/crashtests/crashtests.list @@ -22,3 +22,4 @@ load 596785-1.html load 596785-2.html load 606430-1.html load 602117.html +load 613027.html diff --git a/content/html/content/src/nsHTMLFieldSetElement.cpp b/content/html/content/src/nsHTMLFieldSetElement.cpp index 955372137e50..9ec60636392b 100644 --- a/content/html/content/src/nsHTMLFieldSetElement.cpp +++ b/content/html/content/src/nsHTMLFieldSetElement.cpp @@ -66,7 +66,8 @@ nsHTMLFieldSetElement::~nsHTMLFieldSetElement() // nsISupports -NS_IMPL_CYCLE_COLLECTION_UNLINK_BEGIN(nsHTMLFieldSetElement) +NS_IMPL_CYCLE_COLLECTION_UNLINK_BEGIN_INHERITED(nsHTMLFieldSetElement, + nsGenericHTMLFormElement) NS_IMPL_CYCLE_COLLECTION_UNLINK_NSCOMPTR(mElements) NS_IMPL_CYCLE_COLLECTION_UNLINK_END @@ -82,7 +83,7 @@ NS_IMPL_RELEASE_INHERITED(nsHTMLFieldSetElement, nsGenericElement) DOMCI_NODE_DATA(HTMLFieldSetElement, nsHTMLFieldSetElement) // QueryInterface implementation for nsHTMLFieldSetElement -NS_INTERFACE_TABLE_HEAD(nsHTMLFieldSetElement) +NS_INTERFACE_TABLE_HEAD_CYCLE_COLLECTION_INHERITED(nsHTMLFieldSetElement) NS_HTML_CONTENT_INTERFACE_TABLE2(nsHTMLFieldSetElement, nsIDOMHTMLFieldSetElement, nsIConstraintValidation) diff --git a/content/html/content/src/nsHTMLFieldSetElement.h b/content/html/content/src/nsHTMLFieldSetElement.h index fb04eadba08c..a4d2732de5fb 100644 --- a/content/html/content/src/nsHTMLFieldSetElement.h +++ b/content/html/content/src/nsHTMLFieldSetElement.h @@ -55,7 +55,7 @@ public: virtual ~nsHTMLFieldSetElement(); // nsISupports - NS_DECL_CYCLE_COLLECTING_ISUPPORTS + NS_DECL_ISUPPORTS_INHERITED // nsIDOMNode NS_FORWARD_NSIDOMNODE(nsGenericHTMLFormElement::)