From a15fb4630a4890b97bdd0116d214ac4406cbe070 Mon Sep 17 00:00:00 2001
From: "allan%beaufour.dk" <allan%beaufour.dk>
Date: Tue, 7 Mar 2006 09:20:12 +0000
Subject: [PATCH] [XForms] Backup instances before dispatching xforms-ready.
 Bug 329510, r=aaronr+smaug

---
 extensions/xforms/nsXFormsModelElement.cpp | 11 ++---------
 extensions/xforms/nsXFormsModelElement.h   |  1 -
 2 files changed, 2 insertions(+), 10 deletions(-)

diff --git a/extensions/xforms/nsXFormsModelElement.cpp b/extensions/xforms/nsXFormsModelElement.cpp
index 3f057533c81..d8855ac6e71 100644
--- a/extensions/xforms/nsXFormsModelElement.cpp
+++ b/extensions/xforms/nsXFormsModelElement.cpp
@@ -557,9 +557,6 @@ nsXFormsModelElement::HandleDefault(nsIDOMEvent *aEvent, PRBool *aHandled)
     rv = Rebuild();
   } else if (type.EqualsASCII(sXFormsEventsEntries[eEvent_ModelConstructDone].name)) {
     rv = ConstructDone();
-  } else if (type.EqualsASCII(sXFormsEventsEntries[eEvent_Ready].name)) {
-    Ready();
-    mReadyHandled = PR_TRUE;
   } else if (type.EqualsASCII(sXFormsEventsEntries[eEvent_Reset].name)) {
     Reset();
   } else if (type.EqualsASCII(sXFormsEventsEntries[eEvent_BindingException].name)) {
@@ -1417,12 +1414,6 @@ nsXFormsModelElement::Reset()
   nsXFormsUtils::DispatchEvent(mElement, eEvent_Refresh);
 }
 
-void
-nsXFormsModelElement::Ready()
-{
-  BackupOrRestoreInstanceData(PR_FALSE);
-}
-
 // This function will restore all of the model's instance data to it's original
 // state if the supplied boolean is PR_TRUE.  If it is PR_FALSE, this function
 // will cause this model's instance data to be backed up.
@@ -1584,6 +1575,8 @@ nsXFormsModelElement::MaybeNotifyCompletion()
   for (i = 0; i < models->Count(); ++i) {
     nsXFormsModelElement *model =
         NS_STATIC_CAST(nsXFormsModelElement *, models->ElementAt(i));
+    model->BackupOrRestoreInstanceData(PR_FALSE);
+    model->mReadyHandled = PR_TRUE;
     nsXFormsUtils::DispatchEvent(model->mElement, eEvent_Ready);
   }
 }
diff --git a/extensions/xforms/nsXFormsModelElement.h b/extensions/xforms/nsXFormsModelElement.h
index b12c55766e5..159e529ef3f 100644
--- a/extensions/xforms/nsXFormsModelElement.h
+++ b/extensions/xforms/nsXFormsModelElement.h
@@ -179,7 +179,6 @@ private:
   NS_HIDDEN_(already_AddRefed<nsIDOMDocument>)
     FindInstanceDocument(const nsAString &aID);
   NS_HIDDEN_(void)     Reset();
-  NS_HIDDEN_(void)     Ready();
   NS_HIDDEN_(void)     BackupOrRestoreInstanceData(PRBool restore);
 
   /** Initializes the MIPs on all form controls */