Merge m-c to inbound.
authorRyan VanderMeulen <ryanvm@gmail.com>
Tue, 19 Feb 2013 05:58:41 -0500
changeset 132188 88d66cdbdc81e898d72c580e7d3c411f78dc4eaa
parent 132187 64a2c3fb2052f981a243dc315425ebed719900c8 (current diff)
parent 132160 a0c57dffd179b3718e696579cc14dd10d408a591 (diff)
child 132189 cc37417e2c284aed960f98ffa479de4ccdd5c7c3
push id2323
push userbbajaj@mozilla.com
push dateMon, 01 Apr 2013 19:47:02 +0000
treeherdermozilla-beta@7712be144d91 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
milestone21.0a1
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
Merge m-c to inbound.
--- a/content/html/content/src/HTMLOptionElement.cpp
+++ b/content/html/content/src/HTMLOptionElement.cpp
@@ -95,18 +95,17 @@ NS_HTML_CONTENT_INTERFACE_TABLE_TAIL_CLA
 
 
 NS_IMPL_ELEMENT_CLONE(HTMLOptionElement)
 
 
 NS_IMETHODIMP
 HTMLOptionElement::GetForm(nsIDOMHTMLFormElement** aForm)
 {
-  NS_ENSURE_ARG_POINTER(aForm);
-  *aForm = GetForm();
+  NS_ADDREF(*aForm = GetForm());
   return NS_OK;
 }
 
 nsHTMLFormElement*
 HTMLOptionElement::GetForm()
 {
   nsHTMLSelectElement* selectControl = GetSelect();
   return selectControl ? selectControl->GetForm() : nullptr;