45723. r=rpotts. webshell-docshell consolodation changes.

mozilla · Jul 18, 2000 · 175fa58 · 175fa58
1 parent bbe35aa
commit 175fa58
Show file tree

Hide file tree

Showing 28 changed files with 224 additions and 502 deletions.
diff --git a/content/base/public/nsIDocument.h b/content/base/public/nsIDocument.h
@@ -69,23 +69,6 @@ class nsISupportsArray;
 { 0x94c6ceb0, 0x9447, 0x11d1, \
   {0x93, 0x23, 0x00, 0x80, 0x5f, 0x8a, 0xdd, 0x32} }
 
-// specification for data to be sent via form "post"
-// IID for the nsIPostData interface -  152ab6e0-ff13-11d1-beb9-00805f8a66dc
-#define NS_IPOSTDATA_IID      \
-{ 0x152ab6e0, 0xff13, 0x11d1, \
-  {0xbe, 0xb9, 0x00, 0x80, 0x5f, 0x8a, 0x66, 0xdc} }
-
-#if 0
-class nsIPostData : public nsISupports {
-public:
-  static const nsIID& GetIID() { static nsIID iid = NS_IPOSTDATA_IID; return iid; }
-
-  virtual PRBool       IsFile()  = 0;    // is the data a file (or raw data)
-  virtual const char*  GetData() = 0;    // get the file name or raw data
-  virtual PRInt32      GetDataLength() = 0;
-};
-#endif
-
 // The base value for the content ID counter.
 // This counter is used by the document to 
 // assign a monotonically increasing ID to each content

diff --git a/docshell/base/MANIFEST_IDL b/docshell/base/MANIFEST_IDL
@@ -28,4 +28,5 @@ nsIDocShellTreeNode.idl
 nsIDocShellTreeOwner.idl
 nsIMarkupDocumentViewer.idl
 nsIScrollable.idl
-nsITextScroll.idl
+nsITextScroll.idl
+nsIContentViewerEdit.idl	
diff --git a/docshell/base/Makefile.in b/docshell/base/Makefile.in
@@ -35,15 +35,17 @@ XPIDLSRCS	= \
 		nsIDocShellTreeItem.idl	\
 		nsIDocShellTreeNode.idl	\
 		nsIDocShellTreeOwner.idl	\
-    nsIDocShellHistory.idl \
+		nsIDocShellHistory.idl \
 		nsIMarkupDocumentViewer.idl	\
 		nsIScrollable.idl		\
 		nsITextScroll.idl		\
 		nsIWebNavigation.idl		\
+		nsIContentViewerEdit.idl	\
 		$(NULL)
 
 CPPSRCS		= \
 		nsDocShell.cpp		\
+		nsWebShell.cpp		\
 		nsDocShellLoadInfo.cpp		\
 		nsDSURIContentListener.cpp		\
 #		nsDSWebProgressListener.cpp		\

diff --git a/docshell/base/makefile.win b/docshell/base/makefile.win
@@ -22,26 +22,27 @@
 DEPTH=..\..
 MODULE=docshell_base
 
+LIBRARY_NAME=basedocshell_s
+
 XPIDLSRCS=						\
 		.\nsCDocShell.idl			\
 		.\nsIDocShell.idl			\
-    .\nsIDocShellHistory.idl \
+        .\nsIDocShellHistory.idl \
 		.\nsIDocShellLoadInfo.idl			\
 		.\nsIDocShellTreeItem.idl			\
 		.\nsIDocShellTreeNode.idl			\
 		.\nsIDocShellTreeOwner.idl			\
-#		.\nsIContentViewerEdit.idl	\
+		.\nsIContentViewerEdit.idl	\
 #		.\nsIContentViewerFile.idl	\
 		.\nsIMarkupDocumentViewer.idl	\
 		.\nsIScrollable.idl		\
 		.\nsITextScroll.idl		\
 		.\nsIWebNavigation.idl		\
 		$(NULL)
 
-LIBRARY_NAME=basedocshell_s
-
 CPP_OBJS=											\
 		.\$(OBJDIR)\nsDocShell.obj			\
+        .\$(OBJDIR)\nsWebShell.obj          \
 		.\$(OBJDIR)\nsDocShellLoadInfo.obj	\
 		.\$(OBJDIR)\nsDSURIContentListener.obj	\
 #		.\$(OBJDIR)\nsDSWebProgressListener.obj	\
@@ -51,5 +52,5 @@ include <$(DEPTH)\config\rules.mak>
 include <$(DEPTH)\config\config.mak>
 
 install:: $(LIBRARY)
-	$(MAKE_INSTALL) $(LIBRARY) $(DIST)\lib
-	$(MAKE_INSTALL) appstrings.properties $(DIST)\bin\chrome\locales\en-US\global\locale
+    $(MAKE_INSTALL) $(LIBRARY) $(DIST)\lib
+    $(MAKE_INSTALL) appstrings.properties $(DIST)\bin\chrome\locales\en-US\global\locale
diff --git a/docshell/base/nsIContentViewerEdit.idl b/docshell/base/nsIContentViewerEdit.idl
@@ -22,25 +22,21 @@
 
 #include "nsISupports.idl"
 
-/**
- * The nsIDocShellFile    
- */
-
 [scriptable, uuid(42d5215c-9bc7-11d3-bccc-0060b0fc76bd)]
 interface nsIContentViewerEdit : nsISupports
 {
-	void Search();
+	void search();
 	readonly attribute boolean searchable;
 
-	void ClearSelection();
-	void SelectAll();
+	void clearSelection();
+	void selectAll();
 
-	void CopySelection();
+	void copySelection();
 	readonly attribute boolean copyable;
 
-	void CutSelection();
+	void cutSelection();
 	readonly attribute boolean cutable;
 
-	void Paste();
+	void paste();
 	readonly attribute boolean pasteable;
 };