Eliminating browser, editor, and iframe content objects.

layout/build/nsLayoutFactory.cpp

@@ -452,7 +452,6 @@ nsLayoutFactory::CreateInstance(nsISupports *aOuter,
       return res;
     }
   }
-  /*
   else if (mClassID.Equals(kBrowserBoxObjectCID)) {
     res = NS_NewBrowserBoxObject((nsIBoxObject**) &inst);
     if (NS_FAILED(res)) {
@@ -473,7 +472,7 @@ nsLayoutFactory::CreateInstance(nsISupports *aOuter,
       LOG_NEW_FAILURE("NS_NewIFrameBoxObject", res);
       return res;
     }
-  }*/
+  }
   else if (mClassID.Equals(kNodeInfoManagerCID)) {
     res = NS_NewNodeInfoManager((nsINodeInfoManager**) &inst);
     if (NS_FAILED(res)) {

layout/xul/base/src/Makefile.in

@@ -30,6 +30,9 @@ MODULE		= layout
 LIBRARY_NAME	= raptorxulbase_s
 
 CPPSRCS		= \
+       nsBrowserBoxObject.cpp \
+       nsIFrameBoxObject.cpp \
+       nsEditorBoxObject.cpp \
        nsMenuBoxObject.cpp \
        nsTreeBoxObject.cpp \
        nsPopupSetBoxObject.cpp \

layout/xul/base/src/makefile.win

@@ -28,6 +28,9 @@ REQUIRES=xpcom raptor pref
 DEFINES=-D_IMPL_NS_HTML -DWIN32_LEAN_AND_MEAN
 
 CPPSRCS=					\
+        nsEditorBoxObject.cpp \
+        nsIFrameBoxObject.cpp \
+        nsBrowserBoxObject.cpp \
         nsTreeBoxObject.cpp \
         nsPopupSetBoxObject.cpp \
         nsMenuBoxObject.cpp \
@@ -92,6 +95,9 @@ CPPSRCS=					\
 	$(NULL)
 
 CPP_OBJS=					\
+  .\$(OBJDIR)\nsEditorBoxObject.obj \
+  .\$(OBJDIR)\nsIFrameBoxObject.obj \
+  .\$(OBJDIR)\nsBrowserBoxObject.obj \
   .\$(OBJDIR)\nsTreeBoxObject.obj \
   .\$(OBJDIR)\nsPopupSetBoxObject.obj \
   .\$(OBJDIR)\nsMenuBoxObject.obj \

layout/xul/base/src/nsBoxObject.cpp

@@ -40,6 +40,7 @@ NS_IMPL_ISUPPORTS2(nsBoxObject, nsIBoxObject, nsPIBoxObject)
 
 // Constructors/Destructors
 nsBoxObject::nsBoxObject(void)
+:mContent(nsnull), mPresShell(nsnull)
 {
   NS_INIT_ISUPPORTS();
 }

layout/xul/base/src/nsBrowserBoxObject.cpp

@@ -0,0 +1,98 @@
+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
+ *
+ * The contents of this file are subject to the Netscape 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/NPL/
+ *
+ * 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 Communicator client code.
+ *
+ * The Initial Developer of the Original Code is Netscape Communications
+ * Corporation.  Portions created by Netscape are
+ * Copyright (C) 1998 Netscape Communications Corporation. All
+ * Rights Reserved.
+ *
+ * Original Author: David W. Hyatt (hyatt@netscape.com)
+ *
+ * Contributor(s): 
+ */
+#include "nsCOMPtr.h"
+#include "nsIBrowserBoxObject.h"
+#include "nsBoxObject.h"
+#include "nsIPresShell.h"
+#include "nsIFrame.h"
+#include "nsIWebBrowser.h"
+
+class nsBrowserBoxObject : public nsIBrowserBoxObject, public nsBoxObject
+{
+public:
+  NS_DECL_ISUPPORTS
+  NS_DECL_NSIBROWSERBOXOBJECT
+
+  nsBrowserBoxObject();
+  virtual ~nsBrowserBoxObject();
+  
+protected:
+};
+
+/* Implementation file */
+NS_IMPL_ADDREF(nsBrowserBoxObject)
+NS_IMPL_RELEASE(nsBrowserBoxObject)
+
+NS_IMETHODIMP 
+nsBrowserBoxObject::QueryInterface(REFNSIID iid, void** aResult)
+{
+  if (!aResult)
+    return NS_ERROR_NULL_POINTER;
+  
+  if (iid.Equals(NS_GET_IID(nsIBrowserBoxObject))) {
+    *aResult = (nsIBrowserBoxObject*)this;
+    NS_ADDREF(this);
+    return NS_OK;
+  }
+
+  return nsBoxObject::QueryInterface(iid, aResult);
+}
+  
+nsBrowserBoxObject::nsBrowserBoxObject()
+{
+  NS_INIT_ISUPPORTS();
+}
+
+nsBrowserBoxObject::~nsBrowserBoxObject()
+{
+  /* destructor code */
+}
+
+/* void openBrowser (in boolean openFlag); */
+NS_IMETHODIMP nsBrowserBoxObject::GetWebBrowser(nsIWebBrowser** aResult)
+{
+  *aResult = nsnull;
+  if (!mPresShell)
+    return NS_OK;
+
+  nsCOMPtr<nsISupports> subShell;
+  mPresShell->GetSubShellFor(mContent, getter_AddRefs(subShell));
+  if(!subShell)
+    return NS_OK;
+
+  return CallQueryInterface(subShell, aResult); //Addref happens here.
+}
+
+// Creation Routine ///////////////////////////////////////////////////////////////////////
+
+nsresult
+NS_NewBrowserBoxObject(nsIBoxObject** aResult)
+{
+  *aResult = new nsBrowserBoxObject;
+  if (!*aResult)
+    return NS_ERROR_OUT_OF_MEMORY;
+  NS_ADDREF(*aResult);
+  return NS_OK;
+}
+

layout/xul/base/src/nsEditorBoxObject.cpp

@@ -0,0 +1,96 @@
+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
+ *
+ * The contents of this file are subject to the Netscape 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/NPL/
+ *
+ * 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 Communicator client code.
+ *
+ * The Initial Developer of the Original Code is Netscape Communications
+ * Corporation.  Portions created by Netscape are
+ * Copyright (C) 1998 Netscape Communications Corporation. All
+ * Rights Reserved.
+ *
+ * Original Author: David W. Hyatt (hyatt@netscape.com)
+ *
+ * Contributor(s): 
+ */
+#include "nsCOMPtr.h"
+#include "nsIEditorBoxObject.h"
+#include "nsBoxObject.h"
+#include "nsIPresShell.h"
+#include "nsIFrame.h"
+#include "nsIEditorShell.h"
+
+class nsEditorBoxObject : public nsIEditorBoxObject, public nsBoxObject
+{
+public:
+  NS_DECL_ISUPPORTS
+  NS_DECL_NSIEDITORBOXOBJECT
+
+  nsEditorBoxObject();
+  virtual ~nsEditorBoxObject();
+  
+protected:
+  nsCOMPtr<nsIEditorShell> mEditorShell;
+};
+
+/* Implementation file */
+NS_IMPL_ADDREF(nsEditorBoxObject)
+NS_IMPL_RELEASE(nsEditorBoxObject)
+
+NS_IMETHODIMP 
+nsEditorBoxObject::QueryInterface(REFNSIID iid, void** aResult)
+{
+  if (!aResult)
+    return NS_ERROR_NULL_POINTER;
+  
+  if (iid.Equals(NS_GET_IID(nsIEditorBoxObject))) {
+    *aResult = (nsIEditorBoxObject*)this;
+    NS_ADDREF(this);
+    return NS_OK;
+  }
+
+  return nsBoxObject::QueryInterface(iid, aResult);
+}
+  
+nsEditorBoxObject::nsEditorBoxObject()
+{
+  NS_INIT_ISUPPORTS();
+}
+
+nsEditorBoxObject::~nsEditorBoxObject()
+{
+  /* destructor code */
+}
+
+/* void openEditor (in boolean openFlag); */
+NS_IMETHODIMP nsEditorBoxObject::GetEditorShell(nsIEditorShell** aResult)
+{
+  if (!mEditorShell) {
+    mEditorShell = do_CreateInstance("component://netscape/editor/editorshell");
+  }
+
+  *aResult = mEditorShell;
+  NS_IF_ADDREF(*aResult);
+  return NS_OK;
+}
+
+// Creation Routine ///////////////////////////////////////////////////////////////////////
+
+nsresult
+NS_NewEditorBoxObject(nsIBoxObject** aResult)
+{
+  *aResult = new nsEditorBoxObject;
+  if (!*aResult)
+    return NS_ERROR_OUT_OF_MEMORY;
+  NS_ADDREF(*aResult);
+  return NS_OK;
+}
+

layout/xul/base/src/nsIFrameBoxObject.cpp

@@ -0,0 +1,98 @@
+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
+ *
+ * The contents of this file are subject to the Netscape 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/NPL/
+ *
+ * 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 Communicator client code.
+ *
+ * The Initial Developer of the Original Code is Netscape Communications
+ * Corporation.  Portions created by Netscape are
+ * Copyright (C) 1998 Netscape Communications Corporation. All
+ * Rights Reserved.
+ *
+ * Original Author: David W. Hyatt (hyatt@netscape.com)
+ *
+ * Contributor(s): 
+ */
+#include "nsCOMPtr.h"
+#include "nsIIFrameBoxObject.h"
+#include "nsBoxObject.h"
+#include "nsIPresShell.h"
+#include "nsIFrame.h"
+#include "nsIDocShell.h"
+
+class nsIFrameBoxObject : public nsIIFrameBoxObject, public nsBoxObject
+{
+public:
+  NS_DECL_ISUPPORTS
+  NS_DECL_NSIIFRAMEBOXOBJECT
+
+  nsIFrameBoxObject();
+  virtual ~nsIFrameBoxObject();
+  
+protected:
+};
+
+/* Implementation file */
+NS_IMPL_ADDREF(nsIFrameBoxObject)
+NS_IMPL_RELEASE(nsIFrameBoxObject)
+
+NS_IMETHODIMP 
+nsIFrameBoxObject::QueryInterface(REFNSIID iid, void** aResult)
+{
+  if (!aResult)
+    return NS_ERROR_NULL_POINTER;
+  
+  if (iid.Equals(NS_GET_IID(nsIIFrameBoxObject))) {
+    *aResult = (nsIIFrameBoxObject*)this;
+    NS_ADDREF(this);
+    return NS_OK;
+  }
+
+  return nsBoxObject::QueryInterface(iid, aResult);
+}
+  
+nsIFrameBoxObject::nsIFrameBoxObject()
+{
+  NS_INIT_ISUPPORTS();
+}
+
+nsIFrameBoxObject::~nsIFrameBoxObject()
+{
+  /* destructor code */
+}
+
+/* void openIFrame (in boolean openFlag); */
+NS_IMETHODIMP nsIFrameBoxObject::GetDocShell(nsIDocShell** aResult)
+{
+  *aResult = nsnull;
+  if (!mPresShell)
+    return NS_OK;
+
+  nsCOMPtr<nsISupports> subShell;
+  mPresShell->GetSubShellFor(mContent, getter_AddRefs(subShell));
+  if(!subShell)
+    return NS_OK;
+
+  return CallQueryInterface(subShell, aResult); //Addref happens here.
+}
+
+// Creation Routine ///////////////////////////////////////////////////////////////////////
+
+nsresult
+NS_NewIFrameBoxObject(nsIBoxObject** aResult)
+{
+  *aResult = new nsIFrameBoxObject;
+  if (!*aResult)
+    return NS_ERROR_OUT_OF_MEMORY;
+  NS_ADDREF(*aResult);
+  return NS_OK;
+}
+