diff --git a/java/dom/nsWebShell.cpp.patch b/java/dom/nsWebShell.cpp.patch index ac6aa14c6f9a..79b2571411dd 100644 --- a/java/dom/nsWebShell.cpp.patch +++ b/java/dom/nsWebShell.cpp.patch @@ -1,38 +1,38 @@ Index: nsWebShell.cpp =================================================================== RCS file: /cvsroot/mozilla/webshell/src/nsWebShell.cpp,v -retrieving revision 1.237 -diff -r1.237 nsWebShell.cpp +retrieving revision 1.260 +diff -r1.260 nsWebShell.cpp 70a71,75 > #ifdef JAVA_DOM > #include "nsIJavaDOM.h" > #include "nsJavaDOMCID.h" > #endif // JAVA_DOM > -566a572 -> -577a584,588 +554a560,564 > #ifdef JAVA_DOM > static NS_DEFINE_IID(kJavaDOMFactoryCID, NS_JAVADOMFACTORY_CID); > static NS_DEFINE_IID(kIJavaDOMIID, NS_IJAVADOM_IID); > #endif // JAVA_DOM > -1101a1113,1130 +566a577 +> +999a1011,1028 > #ifdef JAVA_DOM -> nsISupports* javaDOM = nsnull; -> nsresult jrv = nsServiceManager::GetService(kJavaDOMFactoryCID, -> kIJavaDOMIID, -> (nsISupports**) &javaDOM); -> if (NS_FAILED(jrv) || !javaDOM) { +> nsISupports* javaDOM = nsnull; +> nsresult jrv = nsServiceManager::GetService(kJavaDOMFactoryCID, +> kIJavaDOMIID, +> (nsISupports**) &javaDOM); +> if (NS_FAILED(jrv) || !javaDOM) { +> fprintf(stderr, +> "nsWebShell::Init: GetService of JavaDOM failed (error %x)\n", +> jrv); +> } else { +> jrv = docLoaderService->AddObserver((nsIDocumentLoaderObserver*)javaDOM); +> if (NS_FAILED(jrv)) { > fprintf(stderr, -> "nsWebShell::Init: GetService of JavaDOM failed (error %x)\n", +> "nsWebShell::Init: AddObserver of JavaDOM failed (error %x)\n", > jrv); -> } else { -> jrv = docLoaderService->AddObserver((nsIDocumentLoaderObserver*)javaDOM); -> if (NS_FAILED(jrv)) { -> fprintf(stderr, -> "nsWebShell::Init: AddObserver of JavaDOM failed (error %x)\n", -> jrv); -> } > } +> } > #endif // JAVA_DOM