Bug 571685 - Move remainders of webshell into /docshell/base; r=bzbarsky
authorMs2ger <ms2ger@gmail.com>
Tue, 29 Mar 2011 22:24:53 -0400
changeset 64430 9267d80c7c638a8fc8e6aed851eec17e0b80234b
parent 64132 021f973484346c8f750361d385dcfd1f4c21e4c4
child 64431 0e831a3686fb9c4a16ea3232d0d88fc08f8e8dd7
push idunknown
push userunknown
push dateunknown
reviewersbzbarsky
bugs571685
milestone2.2a1pre
Bug 571685 - Move remainders of webshell into /docshell/base; r=bzbarsky
docshell/base/Makefile.in
docshell/base/nsIClipboardCommands.idl
docshell/base/nsIContentViewerContainer.idl
docshell/base/nsIDocumentLoaderFactory.idl
docshell/base/nsILinkHandler.h
docshell/base/nsIRefreshURI.idl
docshell/base/nsIWebShellServices.h
toolkit/toolkit-makefiles.sh
toolkit/toolkit-tiers.mk
webshell/Makefile.in
webshell/public/Makefile.in
webshell/public/nsIClipboardCommands.idl
webshell/public/nsIContentViewerContainer.idl
webshell/public/nsIDocumentLoaderFactory.idl
webshell/public/nsILinkHandler.h
webshell/public/nsIRefreshURI.idl
webshell/public/nsIWebShellServices.h
--- a/docshell/base/Makefile.in
+++ b/docshell/base/Makefile.in
@@ -1,9 +1,9 @@
-# 
+#
 # ***** 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/
 #
@@ -31,83 +31,92 @@
 # 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 *****
 
-DEPTH		= ../..
-topsrcdir	= @top_srcdir@
-srcdir		= @srcdir@
-VPATH		= @srcdir@
+DEPTH = ../..
+topsrcdir = @top_srcdir@
+srcdir = @srcdir@
+VPATH = @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
-MODULE		= docshell
-LIBRARY_NAME	= basedocshell_s
-GRE_MODULE	= 1
-LIBXUL_LIBRARY	= 1
+MODULE         = docshell
+LIBRARY_NAME   = basedocshell_s
+GRE_MODULE     = 1
+LIBXUL_LIBRARY = 1
 
 ifdef MOZ_TOOLKIT_SEARCH
 DEFINES += -DMOZ_TOOLKIT_SEARCH
 endif
 
 SDK_XPIDLSRCS = \
-		nsIGlobalHistory.idl \
-		$(NULL)
+  nsIGlobalHistory.idl \
+  nsIClipboardCommands.idl \
+  $(NULL)
 
-XPIDLSRCS	= \
-		nsCDefaultURIFixup.idl		\
-		nsIDocShell.idl			\
-		nsIDocShellLoadInfo.idl	\
-		nsIDocShellTreeItem.idl	\
-		nsIDocShellTreeNode.idl	\
-		nsIDocShellTreeOwner.idl	\
-		nsIDocShellHistory.idl \
-		nsIGlobalHistory2.idl \
-		nsIGlobalHistory3.idl \
-		nsIMarkupDocumentViewer.idl	\
-		nsIScrollable.idl		\
-		nsITextScroll.idl		\
-		nsIWebNavigation.idl		\
-		nsIWebNavigationInfo.idl        \
-		nsIContentViewer.idl		\
-		nsIContentViewerEdit.idl	\
-		nsIContentViewerFile.idl	\
-		nsIURIFixup.idl			\
-		nsIEditorDocShell.idl		\
-		nsIWebPageDescriptor.idl	\
-		nsIDownloadHistory.idl          \
-		nsILoadContext.idl              \
-		$(NULL)
+XPIDLSRCS = \
+  nsCDefaultURIFixup.idl \
+  nsIDocShell.idl \
+  nsIDocShellLoadInfo.idl \
+  nsIDocShellTreeItem.idl \
+  nsIDocShellTreeNode.idl \
+  nsIDocShellTreeOwner.idl \
+  nsIDocShellHistory.idl \
+  nsIGlobalHistory2.idl \
+  nsIGlobalHistory3.idl \
+  nsIMarkupDocumentViewer.idl \
+  nsIScrollable.idl \
+  nsITextScroll.idl \
+  nsIWebNavigation.idl \
+  nsIWebNavigationInfo.idl \
+  nsIContentViewer.idl \
+  nsIContentViewerEdit.idl \
+  nsIContentViewerFile.idl \
+  nsIURIFixup.idl \
+  nsIEditorDocShell.idl \
+  nsIWebPageDescriptor.idl \
+  nsIDownloadHistory.idl \
+  nsILoadContext.idl \
+  nsIRefreshURI.idl \
+  nsIContentViewerContainer.idl \
+  nsIDocumentLoaderFactory.idl \
+  $(NULL)
 
-EXPORTS		= nsDocShellLoadTypes.h
+EXPORTS = \
+  nsDocShellLoadTypes.h \
+  nsILinkHandler.h \
+  nsIWebShellServices.h \
+  $(NULL)
 
 EXPORTS_NAMESPACES = mozilla
 
 EXPORTS_mozilla = \
   IHistory.h \
   $(NULL)
 
-CPPSRCS		= \
-		nsDocShell.cpp		\
-		nsDocShellLoadInfo.cpp		\
-		nsDocShellEditorData.cpp	\
-		nsDocShellTransferableHooks.cpp \
-		nsDocShellEnumerator.cpp  \
-		nsDSURIContentListener.cpp		\
-		nsDefaultURIFixup.cpp		\
-		nsWebNavigationInfo.cpp \
-		nsAboutRedirector.cpp \
-		nsDownloadHistory.cpp \
-		$(NULL)
+CPPSRCS = \
+  nsDocShell.cpp \
+  nsDocShellLoadInfo.cpp \
+  nsDocShellEditorData.cpp \
+  nsDocShellTransferableHooks.cpp \
+  nsDocShellEnumerator.cpp \
+  nsDSURIContentListener.cpp \
+  nsDefaultURIFixup.cpp \
+  nsWebNavigationInfo.cpp \
+  nsAboutRedirector.cpp \
+  nsDownloadHistory.cpp \
+  $(NULL)
 
 # we don't want the shared lib, but we want to force the creation of a
 # static lib.
 FORCE_STATIC_LIB = 1
 
 include $(topsrcdir)/config/rules.mk
 
-LOCAL_INCLUDES += -I$(srcdir)/../shistory/src \
-		-I$(srcdir)/../../layout/base \
-		$(NULL)
+LOCAL_INCLUDES += \
+  -I$(srcdir)/../shistory/src \
+  -I$(topsrcdir)/layout/base \
+  $(NULL)
rename from webshell/public/nsIClipboardCommands.idl
rename to docshell/base/nsIClipboardCommands.idl
rename from webshell/public/nsIContentViewerContainer.idl
rename to docshell/base/nsIContentViewerContainer.idl
rename from webshell/public/nsIDocumentLoaderFactory.idl
rename to docshell/base/nsIDocumentLoaderFactory.idl
rename from webshell/public/nsILinkHandler.h
rename to docshell/base/nsILinkHandler.h
rename from webshell/public/nsIRefreshURI.idl
rename to docshell/base/nsIRefreshURI.idl
rename from webshell/public/nsIWebShellServices.h
rename to docshell/base/nsIWebShellServices.h
--- a/toolkit/toolkit-makefiles.sh
+++ b/toolkit/toolkit-makefiles.sh
@@ -454,21 +454,16 @@ MAKEFILES_docshell="
   docshell/resources/Makefile
   docshell/resources/content/Makefile
   docshell/shistory/Makefile
   docshell/shistory/public/Makefile
   docshell/shistory/src/Makefile
   docshell/build/Makefile
 "
 
-MAKEFILES_webshell="
-  webshell/Makefile
-  webshell/public/Makefile
-"
-
 MAKEFILES_widget="
   widget/Makefile
   widget/public/Makefile
   widget/src/Makefile
   widget/src/build/Makefile
   widget/src/gtk2/Makefile
   widget/src/gtkxtbin/Makefile
   widget/src/cocoa/Makefile
@@ -764,17 +759,16 @@ add_makefiles "
   $MAKEFILES_uriloader
   $MAKEFILES_profile
   $MAKEFILES_rdf
   $MAKEFILES_sun_java
   $MAKEFILES_caps
   $MAKEFILES_chrome
   $MAKEFILES_view
   $MAKEFILES_docshell
-  $MAKEFILES_webshell
   $MAKEFILES_widget
   $MAKEFILES_xpcom
   $MAKEFILES_xpcom_tests
   $MAKEFILES_xpfe
   $MAKEFILES_embedding
   $MAKEFILES_xulapp
   $MAKEFILES_libpr0n
   $MAKEFILES_accessible
--- a/toolkit/toolkit-tiers.mk
+++ b/toolkit/toolkit-tiers.mk
@@ -184,17 +184,16 @@ tier_platform_dirs	+= \
 		modules/plugin \
 		dom \
 		view \
 		widget \
 		content \
 		editor \
 		layout \
 		docshell \
-		webshell \
 		embedding \
 		xpfe/appshell \
 		$(NULL)
 
 ifdef MOZ_UNIVERSALCHARDET
 tier_platform_dirs += extensions/universalchardet
 endif
 
deleted file mode 100644
--- a/webshell/Makefile.in
+++ /dev/null
@@ -1,47 +0,0 @@
-#
-# ***** 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) 1998
-# the Initial Developer. All Rights Reserved.
-#
-# Contributor(s):
-#
-# Alternatively, the contents of this file may be used under the terms of
-# either of 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 *****
-
-DEPTH		= ..
-topsrcdir	= @top_srcdir@
-srcdir		= @srcdir@
-VPATH		= @srcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
-DIRS		= public
-
-include $(topsrcdir)/config/rules.mk
deleted file mode 100644
--- a/webshell/public/Makefile.in
+++ /dev/null
@@ -1,64 +0,0 @@
-#
-# ***** 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) 1998
-# the Initial Developer. All Rights Reserved.
-#
-# Contributor(s):
-#
-# Alternatively, the contents of this file may be used under the terms of
-# either of 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 *****
-
-DEPTH		= ../..
-topsrcdir	= @top_srcdir@
-srcdir		= @srcdir@
-VPATH		= @srcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
-MODULE		= webshell
-XPIDL_MODULE = webshell_idls
-
-SDK_XPIDLSRCS = \
-        nsIClipboardCommands.idl \
-        $(NULL)
-
-XPIDLSRCS = \
-        nsIRefreshURI.idl \
-        nsIContentViewerContainer.idl \
-        nsIDocumentLoaderFactory.idl \
-        $(NULL)
-
-EXPORTS		= \
-		nsILinkHandler.h \
-		nsIWebShellServices.h \
-		$(NULL)
-
-include $(topsrcdir)/config/rules.mk
-