Parts of bug 205425 - turn the embedding widget into a GRE client - patch by marco@gnome.org r=me sr=blizzard

dom/public/base/nsPIDOMWindow.h

@@ -40,10 +40,8 @@
 #define nsPIDOMWindow_h__
 
 #include "nsISupports.h"
-#include "nsString.h"
 #include "nsIDOMLocation.h"
 #include "nsIDOMXULCommandDispatcher.h"
-#include "nsIDocument.h"
 #include "nsIDOMElement.h"
 #include "nsIDOMWindowInternal.h"
 #include "nsIChromeEventHandler.h"

dom/src/base/nsDOMScriptObjectFactory.cpp

@@ -58,6 +58,7 @@
 #include "nsGlobalWindow.h"
 #include "nsIJSContextStack.h"
 #include "nsDOMException.h"
+#include "nsCRT.h"
 #ifdef MOZ_XUL
 #include "nsIXULPrototypeCache.h"
 #endif

embedding/browser/webBrowser/Makefile.in

@@ -91,6 +91,7 @@ SDK_XPIDLSRCS   = \
                 $(NULL)
 
 XPIDLSRCS	= \
+		nsIWebBrowserStream.idl			\
 		nsCWebBrowser.idl			\
 		nsICommandHandler.idl			\
 		nsIEmbeddingSiteWindow2.idl \
@@ -105,6 +106,7 @@ CPPSRCS		= \
 		nsCommandHandler.cpp		\
                 nsWebBrowserContentPolicy.cpp   \
 		nsContextMenuInfo.cpp		\
+		nsEmbedStream.cpp		\
 		$(NULL)
 
 # we don't want the shared lib, but we want to force the creation of a

embedding/browser/webBrowser/nsDocShellTreeOwner.cpp

@@ -58,6 +58,7 @@
 #include "nsISimpleEnumerator.h"
 
 // Interfaces needed to be included
+#include "nsIPresContext.h"
 #include "nsIContextMenuListener.h"
 #include "nsIContextMenuListener2.h"
 #include "nsITooltipListener.h"

embedding/browser/webBrowser/nsEmbedStream.cpp

@@ -0,0 +1,290 @@
+/*
+ * 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 Christopher Blizzard.
+ * Portions created by Christopher Blizzard are Copyright (C)
+ * Christopher Blizzard.  All Rights Reserved.
+ * 
+ * Contributor(s):
+ *   Christopher Blizzard <blizzard@mozilla.org>
+ */
+
+#include <nsIPipe.h>
+#include <nsIInputStream.h>
+#include <nsIOutputStream.h>
+#include <nsIContentViewerContainer.h>
+#include <nsIDocumentLoaderFactory.h>
+#include <nsNetUtil.h>
+#include <prmem.h>
+
+#include "nsXPCOMCID.h"
+#include "nsICategoryManager.h"
+
+#include "nsIContentViewer.h"
+
+#include "nsEmbedStream.h"
+#include "nsReadableUtils.h"
+
+// nsIInputStream interface
+
+NS_IMPL_ISUPPORTS1(nsEmbedStream, nsIInputStream)
+
+nsEmbedStream::nsEmbedStream()
+{
+  mOwner       = nsnull;
+  mOffset      = 0;
+  mDoingStream = PR_FALSE;
+}
+
+nsEmbedStream::~nsEmbedStream()
+{
+}
+
+void
+nsEmbedStream::InitOwner(nsIWebBrowser *aOwner)
+{
+  mOwner = aOwner;
+}
+
+NS_METHOD
+nsEmbedStream::Init(void)
+{
+  nsresult rv = NS_OK;
+
+  nsCOMPtr<nsIInputStream> bufInStream;
+  nsCOMPtr<nsIOutputStream> bufOutStream;
+
+  rv = NS_NewPipe(getter_AddRefs(bufInStream),
+                  getter_AddRefs(bufOutStream));
+
+  if (NS_FAILED(rv)) return rv;
+ 
+  mInputStream  = bufInStream;
+  mOutputStream = bufOutStream;
+
+  return NS_OK;
+}
+
+NS_METHOD
+nsEmbedStream::OpenStream(const char *aBaseURI, const char *aContentType)
+{
+  NS_ENSURE_ARG_POINTER(aBaseURI);
+  NS_ENSURE_ARG_POINTER(aContentType);
+
+  nsresult rv = NS_OK;
+
+  // if we're already doing a stream then close the current one
+  if (mDoingStream)
+    CloseStream();
+
+  // set our state
+  mDoingStream = PR_TRUE;
+
+  // initialize our streams
+  rv = Init();
+  if (NS_FAILED(rv))
+    return rv;
+
+  // get the viewer container
+  nsCOMPtr<nsIContentViewerContainer> viewerContainer;
+  viewerContainer = do_GetInterface(mOwner);
+
+  // create a new uri object
+  nsCOMPtr<nsIURI> uri;
+  nsCAutoString spec(aBaseURI);
+  rv = NS_NewURI(getter_AddRefs(uri), spec.get());
+  
+  if (NS_FAILED(rv))
+    return rv;
+
+  // create a new load group
+  rv = NS_NewLoadGroup(getter_AddRefs(mLoadGroup), nsnull);
+  if (NS_FAILED(rv))
+    return rv;
+
+  // create a new input stream channel
+  rv = NS_NewInputStreamChannel(getter_AddRefs(mChannel), uri,
+				NS_STATIC_CAST(nsIInputStream *, this),
+				nsDependentCString(aContentType),
+				EmptyCString());
+  if (NS_FAILED(rv))
+    return rv;
+
+  // set the channel's load group
+  rv = mChannel->SetLoadGroup(mLoadGroup);
+  if (NS_FAILED(rv))
+    return rv;
+
+  // find a document loader for this content type
+
+  nsXPIDLCString docLoaderContractID;
+  nsCOMPtr<nsICategoryManager> catMan(do_GetService(NS_CATEGORYMANAGER_CONTRACTID, &rv));
+  if (NS_FAILED(rv))
+    return rv;
+  rv = catMan->GetCategoryEntry("Gecko-Content-Viewers", aContentType,
+                                getter_Copies(docLoaderContractID));
+  if (NS_FAILED(rv))
+    return rv;
+
+  nsCOMPtr<nsIDocumentLoaderFactory> docLoaderFactory;  
+  docLoaderFactory = do_GetService(docLoaderContractID.get(), &rv);
+  if (NS_FAILED(rv))
+    return rv;
+
+  // ok, create an instance of the content viewer for that command and
+  // mime type
+  nsCOMPtr<nsIContentViewer> contentViewer;
+  rv = docLoaderFactory->CreateInstance("view", mChannel, mLoadGroup,
+					aContentType, viewerContainer,
+					nsnull,
+					getter_AddRefs(mStreamListener),
+					getter_AddRefs(contentViewer));
+  if (NS_FAILED(rv))
+    return rv;
+
+  // set the container viewer container for this content view
+  rv = contentViewer->SetContainer(viewerContainer);
+  if (NS_FAILED(rv))
+    return rv;
+
+  // embed this sucker
+  rv = viewerContainer->Embed(contentViewer, "view", nsnull);
+  if (NS_FAILED(rv))
+    return rv;
+
+  // start our request
+  nsCOMPtr<nsIRequest> request = do_QueryInterface(mChannel); 
+  rv = mStreamListener->OnStartRequest(request, NULL);
+  if (NS_FAILED(rv))
+    return rv;
+  
+  return NS_OK;
+}
+
+NS_METHOD
+nsEmbedStream::AppendToStream(const char *aData, PRInt32 aLen)
+{
+  nsresult rv;
+
+  // append the data
+  rv = Append(aData, aLen);
+  if (NS_FAILED(rv))
+    return rv;
+
+  // notify our listeners
+  nsCOMPtr<nsIRequest> request = do_QueryInterface(mChannel); 
+  rv = mStreamListener->OnDataAvailable(request,
+					NULL,
+					NS_STATIC_CAST(nsIInputStream *, this),
+					mOffset, /* offset */
+					aLen); /* len */
+  // move our counter
+  mOffset += aLen;
+  if (NS_FAILED(rv))
+    return rv;
+
+  return NS_OK;
+}
+
+NS_METHOD
+nsEmbedStream::CloseStream(void)
+{
+  nsresult rv = NS_OK;
+
+  NS_ENSURE_STATE(mDoingStream);
+  mDoingStream = PR_FALSE;
+
+  nsCOMPtr<nsIRequest> request = do_QueryInterface(mChannel, &rv); 
+  if (NS_FAILED(rv))
+    goto loser;
+  
+  rv = mStreamListener->OnStopRequest(request, NULL, NS_OK);
+  if (NS_FAILED(rv))
+    return rv;
+
+ loser:
+  mLoadGroup = nsnull;
+  mChannel = nsnull;
+  mStreamListener = nsnull;
+  mOffset = 0;
+
+  return rv;
+}
+
+NS_METHOD
+nsEmbedStream::Append(const char *aData, PRUint32 aLen)
+{
+  nsresult rv = NS_OK;
+  PRUint32 bytesWritten = 0;
+  rv = mOutputStream->Write(aData, aLen, &bytesWritten);
+  if (NS_FAILED(rv))
+    return rv;
+  
+  NS_ASSERTION(bytesWritten == aLen,
+	       "underlying byffer couldn't handle the write");
+  return rv;
+}
+
+NS_IMETHODIMP
+nsEmbedStream::Available(PRUint32 *_retval)
+{
+  return mInputStream->Available(_retval);
+}
+
+NS_IMETHODIMP
+nsEmbedStream::Read(char * aBuf, PRUint32 aCount, PRUint32 *_retval)
+{
+  return mInputStream->Read(aBuf, aCount, _retval);
+}
+
+NS_IMETHODIMP nsEmbedStream::Close(void)
+{
+  return mInputStream->Close();
+}
+
+NS_IMETHODIMP
+nsEmbedStream::ReadSegments(nsWriteSegmentFun aWriter, void * aClosure,
+			    PRUint32 aCount, PRUint32 *_retval)
+{
+  char *readBuf = (char *)malloc(aCount);
+  PRUint32 nBytes;
+
+  if (!readBuf)
+    return NS_ERROR_OUT_OF_MEMORY;
+  
+  nsresult rv = mInputStream->Read(readBuf, aCount, &nBytes);
+
+  *_retval = 0;
+
+  if (NS_SUCCEEDED(rv)) {
+    PRUint32 writeCount = 0;
+    rv = aWriter(this, aClosure, readBuf, 0, nBytes, &writeCount);
+
+    // XXX writeCount may be less than nBytes!!  This is the wrong
+    // way to synthesize ReadSegments.
+    NS_ASSERTION(writeCount == nBytes, "data loss");
+
+    // errors returned from the writer end here!
+    rv = NS_OK;
+  }
+
+  free(readBuf);
+
+  return rv;
+}
+
+NS_IMETHODIMP
+nsEmbedStream::IsNonBlocking(PRBool *aNonBlocking)
+{
+    return mInputStream->IsNonBlocking(aNonBlocking);
+}

embedding/browser/webBrowser/nsEmbedStream.h

@@ -0,0 +1,65 @@
+/*
+ * 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 Christopher Blizzard.
+ * Portions created by Christopher Blizzard are Copyright (C)
+ * Christopher Blizzard.  All Rights Reserved.
+ * 
+ * Contributor(s):
+ *   Christopher Blizzard <blizzard@mozilla.org>
+ */
+
+#include <nsISupports.h>
+#include <nsCOMPtr.h>
+#include <nsIOutputStream.h>
+#include <nsIInputStream.h>
+#include <nsILoadGroup.h>
+#include <nsIChannel.h>
+#include <nsIStreamListener.h>
+#include <nsIWebBrowser.h>
+  
+class nsEmbedStream : public nsIInputStream 
+{
+ public:
+
+  nsEmbedStream();
+  virtual ~nsEmbedStream();
+
+  void      InitOwner      (nsIWebBrowser *aOwner);
+  NS_METHOD Init           (void);
+
+  NS_METHOD OpenStream     (const char *aBaseURI, const char *aContentType);
+  NS_METHOD AppendToStream (const char *aData, PRInt32 aLen);
+  NS_METHOD CloseStream    (void);
+
+  NS_METHOD Append         (const char *aData, PRUint32 aLen);
+
+  // nsISupports
+  NS_DECL_ISUPPORTS
+  // nsIInputStream
+  NS_DECL_NSIINPUTSTREAM
+
+ private:
+  nsCOMPtr<nsIOutputStream>   mOutputStream;
+  nsCOMPtr<nsIInputStream>    mInputStream;
+
+  nsCOMPtr<nsILoadGroup>      mLoadGroup;
+  nsCOMPtr<nsIChannel>        mChannel;
+  nsCOMPtr<nsIStreamListener> mStreamListener;
+
+  PRUint32                    mOffset;
+  PRBool                      mDoingStream;
+
+  nsIWebBrowser              *mOwner;
+
+};

embedding/browser/webBrowser/nsIWebBrowserStream.idl

@@ -0,0 +1,49 @@
+/* -*- Mode: C; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/* ***** BEGIN LICENSE BLOCK *****
+ * Version: MPL 1.1/GPL 2.0/LGPL 2.1
+ *
+ * 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
+ * Netscape Communications Corporation.
+ * Portions created by the Initial Developer are Copyright (C) 2001, 2002
+ * the Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s):
+ *  Marco Pesenti Gritti <marco@gnome.org>
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either the GNU General Public License Version 2 or later (the "GPL"), or
+ * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+ * in which case the provisions of the GPL or the LGPL are applicable instead
+ * of those above. If you wish to allow use of your version of this file only
+ * under the terms of either the GPL or the LGPL, and not to allow others to
+ * use your version of this file under the terms of the MPL, indicate your
+ * decision by deleting the provisions above and replace them with the notice
+ * and other provisions required by the GPL or the LGPL. If you do not delete
+ * the provisions above, a recipient may use your version of this file under
+ * the terms of any one of the MPL, the GPL or the LGPL.
+ *
+ * ***** END LICENSE BLOCK ***** */
+
+#include "nsISupports.idl"
+
+[scriptable, uuid(27108bc2-dc7c-42d9-9c64-132550c78ce4)]
+interface nsIWebBrowserStream : nsISupports
+{
+  void openStream(in string aBaseURI, in string aContentType);
+
+  void appendToStream(in string aData, in long aLen);
+
+  void closeStream();
+};

embedding/browser/webBrowser/nsWebBrowser.cpp

@@ -62,6 +62,7 @@
 #include "nsIWebProgress.h"
 #include "nsIWebProgressListener.h"
 #include "nsIWebBrowserFocus.h"
+#include "nsIWebBrowserStream.h"
 #include "nsIPresShell.h"
 #include "nsIGlobalHistory.h"
 #include "nsIDocShellHistory.h"
@@ -110,6 +111,7 @@ nsWebBrowser::nsWebBrowser() : mDocShellTreeOwner(nsnull),
    mPersistCurrentState(nsIWebBrowserPersist::PERSIST_STATE_READY),
    mPersistResult(NS_OK),
    mPersistFlags(nsIWebBrowserPersist::PERSIST_FLAGS_NONE),
+   mStream(nsnull),
    mParentWidget(nsnull),
    mParent(nsnull),
    mListenerArray(nsnull)
@@ -186,6 +188,7 @@ NS_INTERFACE_MAP_BEGIN(nsWebBrowser)
     NS_INTERFACE_MAP_ENTRY(nsIWebBrowserPersist)
     NS_INTERFACE_MAP_ENTRY(nsIWebBrowserFocus)
     NS_INTERFACE_MAP_ENTRY(nsIWebProgressListener)
+    NS_INTERFACE_MAP_ENTRY(nsIWebBrowserStream)
     NS_INTERFACE_MAP_ENTRY(nsISupportsWeakReference)
 NS_INTERFACE_MAP_END
 
@@ -1892,3 +1895,48 @@ NS_IMETHODIMP nsWebBrowser::SetFocusedElement(nsIDOMElement * aFocusedElement)
   return NS_OK;
 }
 
+//*****************************************************************************
+// nsWebBrowser::nsIWebBrowserStream
+//*****************************************************************************   
+
+/* void openStream (in string aBaseURI, in string aContentType); */
+NS_IMETHODIMP nsWebBrowser::OpenStream(const char *aBaseURI, const char *aContentType)
+{
+  nsresult rv;
+
+  if (!mStream) {
+    mStream = new nsEmbedStream();
+    mStreamGuard = do_QueryInterface(mStream);
+    mStream->InitOwner(this);
+    rv = mStream->Init();
+    if (NS_FAILED(rv))
+      return rv;
+  }
+
+  return mStream->OpenStream(aBaseURI, aContentType);
+}
+
+/* void appendStream (in string aData, in long aLen); */
+NS_IMETHODIMP nsWebBrowser::AppendToStream(const char *aData, PRInt32 aLen)
+{
+  if (!mStream)
+    return NS_ERROR_FAILURE;
+
+  return mStream->AppendToStream(aData, aLen);
+}
+
+/* void closeStream (); */
+NS_IMETHODIMP nsWebBrowser::CloseStream()
+{
+  nsresult rv;
+
+  if (!mStream)
+    return NS_ERROR_FAILURE;
+  rv = mStream->CloseStream();
+
+  // release
+  mStream = 0;
+  mStreamGuard = 0;
+
+  return rv;
+}

embedding/browser/webBrowser/nsWebBrowser.h

@@ -64,8 +64,10 @@
 #include "nsIWebBrowserSetup.h"
 #include "nsIWebBrowserPersist.h"
 #include "nsIWebBrowserFocus.h"
+#include "nsIWebBrowserStream.h"
 #include "nsIWindowWatcher.h"
 #include "nsIPrintSettings.h"
+#include "nsEmbedStream.h"
 
 #include "nsVoidArray.h"
 #include "nsWeakPtr.h"
@@ -108,6 +110,7 @@ class nsWebBrowser : public nsIWebBrowser,
                      public nsIWebBrowserPersist,
                      public nsIWebBrowserFocus,
                      public nsIWebProgressListener,
+                     public nsIWebBrowserStream,
                      public nsSupportsWeakReference
 {
 friend class nsDocShellTreeOwner;
@@ -126,6 +129,7 @@ public:
     NS_DECL_NSIWEBBROWSERSETUP
     NS_DECL_NSIWEBBROWSERPERSIST
     NS_DECL_NSIWEBBROWSERFOCUS
+    NS_DECL_NSIWEBBROWSERSTREAM
     NS_DECL_NSIWEBPROGRESSLISTENER
 
 protected:
@@ -171,6 +175,10 @@ protected:
    PRUint32                       mPersistResult;
    PRUint32                       mPersistFlags;
 
+   // stream
+   nsEmbedStream                 *mStream;
+   nsCOMPtr<nsISupports>          mStreamGuard;
+
    //Weak Reference interfaces...
    nsIWidget*                 mParentWidget;
    nsIDocShellTreeItem*       mParent;