bug=52883

author=ashuk
r,a=edburns

Make webclient work with the tip.

java/webclient/src_moz/CBrowserContainer.cpp

@@ -86,7 +86,7 @@ NS_IMPL_ADDREF(CBrowserContainer)
 NS_IMPL_RELEASE(CBrowserContainer)
 
 NS_INTERFACE_MAP_BEGIN(CBrowserContainer)
-  //  	NS_INTERFACE_MAP_ENTRY_AMBIGUOUS(nsISupports, nsIWebBrowserChrome)
+    NS_INTERFACE_MAP_ENTRY_AMBIGUOUS(nsISupports, nsIWebBrowserChrome)
 	NS_INTERFACE_MAP_ENTRY(nsIInterfaceRequestor)
 	NS_INTERFACE_MAP_ENTRY(nsIWebBrowserChrome)
 	NS_INTERFACE_MAP_ENTRY(nsIURIContentListener)
@@ -108,17 +108,11 @@ NS_INTERFACE_MAP_END
 
 NS_IMETHODIMP CBrowserContainer::GetInterface(const nsIID & uuid, void * *result)
 {
-	const nsIID &iid = NS_GET_IID(nsIPrompt);
-	if (memcmp(&uuid, &iid, sizeof(nsIID)) == 0)
-	{
-		*result = (nsIPrompt *) this;
-		AddRef();
-		return NS_OK;
-	}
-    return NS_ERROR_FAILURE;
+    return QueryInterface(uuid, result);
 }
 
 
+
 ///////////////////////////////////////////////////////////////////////////////
 // nsIPrompt
 
@@ -1384,4 +1378,3 @@ nsresult JNICALL CBrowserContainer::takeActionOnNode(nsCOMPtr<nsIDOMNode> curren
 // Local functions
 //
 
-

java/webclient/src_moz/Makefile.win

@@ -145,6 +145,3 @@ clobber::
 	rm -f nsSetupRegistry.cpp
 	rm -f runem.bat
 
-
-edburns:
-	echo $(LLIBS)

java/webclient/src_moz/nsActions.cpp

@@ -38,9 +38,12 @@
 #include "nsISHEntry.h"
 #include "nsIURI.h"
 #include "nsIDocShellTreeItem.h"
+#include "nsIWebNavigation.h"
 
 #include "ns_util.h"
 
+#include "nsEmbedAPI.h"  // for NS_TermEmbedding
+
 void *          handleEvent     (PLEvent * event);
 void            destroyEvent    (PLEvent * event);
 
@@ -135,7 +138,7 @@ void *
 wsLoadURLEvent::handleEvent ()
 {
   if (mWebNavigation && mURL) {
-    nsresult rv = mWebNavigation->LoadURI(mURL->GetUnicode());
+      nsresult rv = mWebNavigation->LoadURI(mURL->GetUnicode(), nsIWebNavigation::LOAD_FLAGS_NONE);
   }
   return nsnull;
 } // handleEvent()
@@ -743,7 +746,7 @@ wsDeallocateInitContextEvent::handleEvent ()
     util_DeallocateShareInitContext(&(mInitContext->shareContext));
 
     //  delete mInitContext;
-        
+    NS_TermEmbedding();
     return (void *) NS_OK;
 } // handleEvent()