Fixed bug 23629.

The build failed due to changes in nsIDocumentLoaderObserver interface.

Reviewed by sdv@sparc.spb.su

java/dom/nsIJavaDOM.h

@@ -1,80 +0,0 @@
-/* 
- The contents of this file are subject to the Mozilla Public
- License Version 1.1 (the "License"); you may not use this file
- except in compliance with the License. You may obtain a copy of
- the License at http://www.mozilla.org/MPL/
-
- Software distributed under the License is distributed on an "AS
- IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
- implied. See the License for the specific language governing
- rights and limitations under the License.
-
- The Original Code is mozilla.org code.
-
- The Initial Developer of the Original Code is Sun Microsystems,
- Inc. Portions created by Sun are
- Copyright (C) 1999 Sun Microsystems, Inc. All
- Rights Reserved.
-
- Contributor(s): 
-*/
-
-#ifndef __nsIJavaDOM_h__
-#define __nsIJavaDOM_h__
-
-#include "nsISupports.h"
-#include "nsString.h"
-#include "nsIDocumentLoaderObserver.h"
-#include "jni.h"
-
-class nsIURI;
-
-/* {9cc0ca50-0e31-11d3-8a61-0004ac56c4a5} */
-#define NS_IJAVADOM_IID_STR "9cc0ca50-0e31-11d3-8a61-0004ac56c4a5"
-#define NS_IJAVADOM_IID \
-  {0x9cc0ca50, 0x0e31, 0x11d3, \
-    { 0x8a, 0x61, 0x00, 0x04, 0xac, 0x56, 0xc4, 0xa5 }}
-#define NS_JAVADOM_CID \
-  {0xd6b2e820, 0x9113, 0x11d3, \
-    { 0x9c, 0x11, 0x0, 0x10, 0x5a , 0xe3, 0x80 , 0x1e }}
-
-class nsIJavaDOM : public nsIDocumentLoaderObserver {
- public: 
-  NS_DEFINE_STATIC_IID_ACCESSOR(NS_IJAVADOM_IID)
-
-  /* nsIDocumentLoaderObserver methods */
-  NS_IMETHOD OnStartDocumentLoad(nsIDocumentLoader* loader, 
-				 nsIURI* aURL, 
-				 const char* aCommand) = 0;
-
-  NS_IMETHOD OnEndDocumentLoad(nsIDocumentLoader* loader, 
-			       nsIChannel* channel, 
-			       nsresult aStatus,
-			       nsIDocumentLoaderObserver* aObserver) = 0;
-
-  NS_IMETHOD OnStartURLLoad(nsIDocumentLoader* loader, 
-			    nsIChannel* channel, 
-                            nsIContentViewer* aViewer) = 0;  
-
-  NS_IMETHOD OnProgressURLLoad(nsIDocumentLoader* loader,
-			       nsIChannel* channel, 
-			       PRUint32 aProgress, 
-                               PRUint32 aProgressMax) = 0;
-
-  NS_IMETHOD OnStatusURLLoad(nsIDocumentLoader* loader, 
-			     nsIChannel* channel, 
-			     nsString& aMsg) = 0;
-
-  NS_IMETHOD OnEndURLLoad(nsIDocumentLoader* loader, 
-			  nsIChannel* channel, 
-			  nsresult aStatus) = 0;
-
-  NS_IMETHOD HandleUnknownContentType(nsIDocumentLoader* loader,
-				      nsIChannel* channel, 
-				      const char *aContentType,
-				      const char *aCommand) = 0;
-};
-extern nsresult
-NS_NewJavaDOM(nsIJavaDOM** aJavaDOM);
-
-#endif /* __nsIJavaDOM_h__ */

java/dom/nsJavaDOMImpl.cpp

@@ -317,8 +317,7 @@ NS_IMETHODIMP nsJavaDOMImpl::OnStartDocumentLoad(nsIDocumentLoader* loader,
 
 NS_IMETHODIMP nsJavaDOMImpl::OnEndDocumentLoad(nsIDocumentLoader* loader,
 					       nsIChannel* channel, 
-					       nsresult aStatus,
-					       nsIDocumentLoaderObserver* aObserver)
+					       nsresult aStatus)
 {
   char* urlSpec = (char*) "";
   nsIURI* url = nsnull;
@@ -343,8 +342,7 @@ NS_IMETHODIMP nsJavaDOMImpl::OnEndDocumentLoad(nsIDocumentLoader* loader,
 }
 
 NS_IMETHODIMP nsJavaDOMImpl::OnStartURLLoad(nsIDocumentLoader* loader,
-					    nsIChannel* channel, 
-					    nsIContentViewer* aViewer)
+					    nsIChannel* channel)
 {
   char* urlSpec = (char*) "";
   nsIURI* url = nsnull;

java/dom/nsJavaDOMImpl.h

@@ -22,12 +22,10 @@ class nsJavaDOMImpl : public nsIJavaDOM {
 
   NS_IMETHOD OnEndDocumentLoad(nsIDocumentLoader* loader, 
 			       nsIChannel* channel, 
-			       nsresult aStatus,
-			       nsIDocumentLoaderObserver* aObserver);
+			       nsresult aStatus);
 
   NS_IMETHOD OnStartURLLoad(nsIDocumentLoader* loader, 
-			    nsIChannel* channel, 
-                            nsIContentViewer* aViewer);
+			    nsIChannel* channel); 
 
   NS_IMETHOD OnProgressURLLoad(nsIDocumentLoader* loader,
 			       nsIChannel* channel,