Move event dispatching from revalidate to refresh, as per the errata. Bug 300586, r=aaronr+doronr, a=mkaply, NPOTB

extensions/xforms/nsXFormsModelElement.cpp

@@ -529,10 +529,6 @@ nsXFormsModelElement::Rebuild()
   printf("nsXFormsModelElement::Rebuild()\n");
 #endif
 
-  // TODO: Clear graph and re-attach elements
-
-  mControlsNeedingRefresh.Clear();
-
   // 1 . Clear graph
   nsresult rv;
   rv = mMDG.Clear();
@@ -670,6 +666,17 @@ nsXFormsModelElement::Revalidate()
   // Revalidate nodes
   mMDG.Revalidate(&mChangedNodes);
 
+  return NS_OK;
+}
+
+NS_IMETHODIMP
+nsXFormsModelElement::Refresh()
+{
+#ifdef DEBUG
+  printf("nsXFormsModelElement::Refresh()\n");
+#endif
+  nsPostRefresh postRefresh = nsPostRefresh();
+
   // Iterate over all form controls if not during initialization phase (then
   // this is handled in InitializeControls())
   if (mDocumentLoaded) {
@@ -767,8 +774,7 @@ nsXFormsModelElement::Revalidate()
       if (rebind || refresh) {
         nsresult rv = SetStatesInternal(control, boundNode);
         NS_ENSURE_SUCCESS(rv, rv);
-        if (mControlsNeedingRefresh.IndexOf(control) == -1)
-          mControlsNeedingRefresh.AppendElement(control);
+        control->Refresh();
       }
     }
 
@@ -781,29 +787,6 @@ nsXFormsModelElement::Revalidate()
   return NS_OK;
 }
 
-NS_IMETHODIMP
-nsXFormsModelElement::Refresh()
-{
-#ifdef DEBUG
-  printf("nsXFormsModelElement::Refresh()\n");
-#endif
-  nsPostRefresh postRefresh = nsPostRefresh();
-
-  if (mDocumentLoaded) { // if not during initialization phase
-    PRInt32 controlCount = mControlsNeedingRefresh.Count();
-    for (PRInt32 i = 0; i < controlCount; ++i) {
-      nsIXFormsControl* control = NS_STATIC_CAST(nsIXFormsControl*,
-                                                 mControlsNeedingRefresh[i]);
-      if (control)
-        control->Refresh();
-    }
-
-    mControlsNeedingRefresh.Clear();
-  }
-
-  return NS_OK;
-}
-
 // nsISchemaLoadListener
 
 NS_IMETHODIMP
@@ -912,7 +895,6 @@ NS_IMETHODIMP
 nsXFormsModelElement::RemoveFormControl(nsIXFormsControl *aControl)
 {
   mFormControls.RemoveElement(aControl);
-  mControlsNeedingRefresh.RemoveElement(aControl);
   return NS_OK;
 }
 

extensions/xforms/nsXFormsModelElement.h

@@ -200,9 +200,6 @@ private:
    */
   nsCOMArray<nsIDOMNode>    mChangedNodes;
 
-  /* Controls that need to a Refresh() */
-  nsVoidArray       mControlsNeedingRefresh;
-
   // This flag indicates whether or not the document fired DOMContentLoaded
   PRBool mDocumentLoaded;