M webclient/classes_spec/org/mozilla/webclient/DocumentLoadEvent.java

- add event masks for Ajax

M webclient/classes_spec/org/mozilla/webclient/PageInfoListener.java

- Document map values for ajax events

M webclient/src_moz/AjaxListener.cpp
M webclient/src_moz/AjaxListener.h

- Flesh out implementation as much as the underlying browser allows.
  For mozilla, this means start, end, and error.

M webclient/src_moz/EmbedProgress.cpp
M webclient/src_moz/EmbedProgress.h

- move the initialization of the AjaxListener into SetEventRegistration().

- Expose NativeBrowserControl * getter

- Make RequestToURIString public

M webclient/src_share/jni_util.cpp
M webclient/src_share/jni_util.h

- new map keys: readyState, responseText, responseXML

- new event masks START_AJAX, END_AJAX, ERROR_AJAX

M webclient/test/manual/src/classes/org/mozilla/webclient/test/TestBrowser.java

- print map values for AJAX cases.


git-svn-id: svn://10.0.0.236/trunk@221541 18797224-902f-48f8-a5cc-f745e15eee43

mozilla/java/webclient/src_moz/EmbedProgress.cpp

@@ -90,15 +90,6 @@ EmbedProgress::SetEventRegistration(jobject yourEventRegistration)
         ::util_ThrowExceptionToJava(env, "Exception: EmbedProgress->SetEventRegistration(): can't create NewGlobalRef\n\tfor eventRegistration");
 	rv = NS_ERROR_FAILURE;
     }
-
-    return rv;
-}
-
-nsresult 
-EmbedProgress::SetCapturePageInfo(jboolean newState)
-{
-    mCapturePageInfo = newState;
-    nsresult rv = NS_OK;
     AjaxListener *observer = nsnull;
     rv = GetAjaxListener(&observer);
     if (observer && NS_SUCCEEDED(rv)) {
@@ -109,6 +100,14 @@ EmbedProgress::SetCapturePageInfo(jboolean newState)
 	    observer->StopObserving();
 	}
     }
+
+    return rv;
+}
+
+nsresult 
+EmbedProgress::SetCapturePageInfo(jboolean newState)
+{
+    mCapturePageInfo = newState;
     return NS_OK;
 }
 
@@ -479,6 +478,11 @@ EmbedProgress::OnSecurityChange(nsIWebProgress *aWebProgress,
   return NS_OK;
 }
 
+NativeBrowserControl* EmbedProgress::GetOwner()
+{
+    return mOwner;
+}
+
 NS_IMETHODIMP
 EmbedProgress::GetAjaxListener(AjaxListener* *result)
 {