Bug 649558 - Move modules/plugin/base to dom/plugins/base, r=josh
authorBenjamin Smedberg <benjamin@smedbergs.us>
Tue, 26 Apr 2011 17:38:43 -0400
changeset 68772 324c2304522043f3bcd58207c57fa3b63f5e1a39
parent 68771 7d40685986cc7e3e38f6acc304325aef29639ce7
child 68773 f8b47b19a1e418b12ee181b3db0b6797392e73a4
push idunknown
push userunknown
push dateunknown
reviewersjosh
bugs649558
milestone6.0a1
Bug 649558 - Move modules/plugin/base to dom/plugins/base, r=josh
dom/Makefile.in
dom/plugins/base/Makefile.in
dom/plugins/base/PluginPRLibrary.cpp
dom/plugins/base/PluginPRLibrary.h
dom/plugins/base/npapi.h
dom/plugins/base/npfunctions.h
dom/plugins/base/npruntime.h
dom/plugins/base/nptypes.h
dom/plugins/base/nsIHTTPHeaderListener.idl
dom/plugins/base/nsIPlugin.idl
dom/plugins/base/nsIPluginDocument.idl
dom/plugins/base/nsIPluginHost.idl
dom/plugins/base/nsIPluginInputStream.idl
dom/plugins/base/nsIPluginInstance.idl
dom/plugins/base/nsIPluginInstanceOwner.idl
dom/plugins/base/nsIPluginStreamInfo.idl
dom/plugins/base/nsIPluginStreamListener.idl
dom/plugins/base/nsIPluginTag.idl
dom/plugins/base/nsIPluginTagInfo.idl
dom/plugins/base/nsJSNPRuntime.cpp
dom/plugins/base/nsJSNPRuntime.h
dom/plugins/base/nsNPAPIPlugin.cpp
dom/plugins/base/nsNPAPIPlugin.h
dom/plugins/base/nsNPAPIPluginInstance.cpp
dom/plugins/base/nsNPAPIPluginInstance.h
dom/plugins/base/nsNPAPIPluginStreamListener.cpp
dom/plugins/base/nsNPAPIPluginStreamListener.h
dom/plugins/base/nsPluginDirServiceProvider.cpp
dom/plugins/base/nsPluginDirServiceProvider.h
dom/plugins/base/nsPluginError.h
dom/plugins/base/nsPluginHost.cpp
dom/plugins/base/nsPluginHost.h
dom/plugins/base/nsPluginLogging.h
dom/plugins/base/nsPluginManifestLineReader.h
dom/plugins/base/nsPluginModule.cpp
dom/plugins/base/nsPluginNativeWindow.cpp
dom/plugins/base/nsPluginNativeWindow.h
dom/plugins/base/nsPluginNativeWindowGtk2.cpp
dom/plugins/base/nsPluginNativeWindowOS2.cpp
dom/plugins/base/nsPluginNativeWindowQt.cpp
dom/plugins/base/nsPluginNativeWindowWin.cpp
dom/plugins/base/nsPluginSafety.h
dom/plugins/base/nsPluginStreamListenerPeer.cpp
dom/plugins/base/nsPluginStreamListenerPeer.h
dom/plugins/base/nsPluginTags.cpp
dom/plugins/base/nsPluginTags.h
dom/plugins/base/nsPluginsCID.h
dom/plugins/base/nsPluginsDir.h
dom/plugins/base/nsPluginsDirDarwin.cpp
dom/plugins/base/nsPluginsDirOS2.cpp
dom/plugins/base/nsPluginsDirUnix.cpp
dom/plugins/base/nsPluginsDirUtils.h
dom/plugins/base/nsPluginsDirWin.cpp
dom/plugins/base/nspluginroot.idl
dom/plugins/ipc/Makefile.in
layout/generic/Makefile.in
modules/plugin/Makefile.in
modules/plugin/base/public/Makefile.in
modules/plugin/base/public/npapi.h
modules/plugin/base/public/npfunctions.h
modules/plugin/base/public/npruntime.h
modules/plugin/base/public/nptypes.h
modules/plugin/base/public/nsIHTTPHeaderListener.idl
modules/plugin/base/public/nsIPlugin.idl
modules/plugin/base/public/nsIPluginDocument.idl
modules/plugin/base/public/nsIPluginHost.idl
modules/plugin/base/public/nsIPluginInputStream.idl
modules/plugin/base/public/nsIPluginInstance.idl
modules/plugin/base/public/nsIPluginInstanceOwner.idl
modules/plugin/base/public/nsIPluginStreamInfo.idl
modules/plugin/base/public/nsIPluginStreamListener.idl
modules/plugin/base/public/nsIPluginTag.idl
modules/plugin/base/public/nsIPluginTagInfo.idl
modules/plugin/base/public/nsPluginError.h
modules/plugin/base/public/nsPluginLogging.h
modules/plugin/base/public/nsPluginNativeWindow.h
modules/plugin/base/public/nsPluginsCID.h
modules/plugin/base/public/nspluginroot.idl
modules/plugin/base/src/Makefile.in
modules/plugin/base/src/PluginPRLibrary.cpp
modules/plugin/base/src/PluginPRLibrary.h
modules/plugin/base/src/nsJSNPRuntime.cpp
modules/plugin/base/src/nsJSNPRuntime.h
modules/plugin/base/src/nsNPAPIPlugin.cpp
modules/plugin/base/src/nsNPAPIPlugin.h
modules/plugin/base/src/nsNPAPIPluginInstance.cpp
modules/plugin/base/src/nsNPAPIPluginInstance.h
modules/plugin/base/src/nsNPAPIPluginStreamListener.cpp
modules/plugin/base/src/nsNPAPIPluginStreamListener.h
modules/plugin/base/src/nsPluginDirServiceProvider.cpp
modules/plugin/base/src/nsPluginDirServiceProvider.h
modules/plugin/base/src/nsPluginHost.cpp
modules/plugin/base/src/nsPluginHost.h
modules/plugin/base/src/nsPluginManifestLineReader.h
modules/plugin/base/src/nsPluginModule.cpp
modules/plugin/base/src/nsPluginNativeWindow.cpp
modules/plugin/base/src/nsPluginNativeWindowGtk2.cpp
modules/plugin/base/src/nsPluginNativeWindowOS2.cpp
modules/plugin/base/src/nsPluginNativeWindowQt.cpp
modules/plugin/base/src/nsPluginNativeWindowWin.cpp
modules/plugin/base/src/nsPluginSafety.h
modules/plugin/base/src/nsPluginStreamListenerPeer.cpp
modules/plugin/base/src/nsPluginStreamListenerPeer.h
modules/plugin/base/src/nsPluginTags.cpp
modules/plugin/base/src/nsPluginTags.h
modules/plugin/base/src/nsPluginsDir.h
modules/plugin/base/src/nsPluginsDirDarwin.cpp
modules/plugin/base/src/nsPluginsDirOS2.cpp
modules/plugin/base/src/nsPluginsDirUnix.cpp
modules/plugin/base/src/nsPluginsDirUtils.h
modules/plugin/base/src/nsPluginsDirWin.cpp
toolkit/toolkit-makefiles.sh
--- a/dom/Makefile.in
+++ b/dom/Makefile.in
@@ -75,16 +75,17 @@ ifdef MOZ_SMIL
 DIRS += interfaces/smil
 endif
 
 DIRS += \
   public/coreEvents \
   base \
   src \
   locales \
+  plugins/base \
   plugins/ipc \
   indexedDB \
   system \
   ipc \
   $(NULL)
 
 ifdef ENABLE_TESTS
 DIRS += tests
rename from modules/plugin/base/src/Makefile.in
rename to dom/plugins/base/Makefile.in
--- a/modules/plugin/base/src/Makefile.in
+++ b/dom/plugins/base/Makefile.in
@@ -30,34 +30,59 @@
 # 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		= ../../../..
+DEPTH		= ../../..
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
 MODULE		= plugin
-XPIDL_MODULE	= layout
 LIBRARY_NAME	= gkplugin
 EXPORT_LIBRARY = 1
 IS_COMPONENT    = 1
 MODULE_NAME	= nsPluginModule
 GRE_MODULE	= 1
 LIBXUL_LIBRARY = 1
 
 EXPORTS_NAMESPACES = mozilla
 
+XPIDLSRCS = \
+  nsIHTTPHeaderListener.idl \
+  nsIPlugin.idl \
+  nsIPluginDocument.idl \
+  nsIPluginHost.idl \
+  nsIPluginInputStream.idl \
+  nsIPluginInstance.idl \
+  nsIPluginInstanceOwner.idl \
+  nsIPluginStreamInfo.idl \
+  nsIPluginStreamListener.idl \
+  nsIPluginTag.idl \
+  nsIPluginTagInfo.idl \
+  nspluginroot.idl \
+  $(NULL)
+
+EXPORTS = \
+  npapi.h \
+  npfunctions.h \
+  nptypes.h \
+  npruntime.h \
+  nsPluginLogging.h \
+  nsPluginError.h \
+  nsPluginNativeWindow.h \
+  nsPluginsCID.h \
+  $(NULL)
+
 EXPORTS_mozilla = \
   PluginPRLibrary.h \
   $(NULL)
 
 CPPSRCS		= \
 		nsNPAPIPlugin.cpp \
 		nsNPAPIPluginInstance.cpp \
 		nsNPAPIPluginStreamListener.cpp \
rename from modules/plugin/base/src/PluginPRLibrary.cpp
rename to dom/plugins/base/PluginPRLibrary.cpp
rename from modules/plugin/base/src/PluginPRLibrary.h
rename to dom/plugins/base/PluginPRLibrary.h
rename from modules/plugin/base/public/npapi.h
rename to dom/plugins/base/npapi.h
rename from modules/plugin/base/public/npfunctions.h
rename to dom/plugins/base/npfunctions.h
rename from modules/plugin/base/public/npruntime.h
rename to dom/plugins/base/npruntime.h
rename from modules/plugin/base/public/nptypes.h
rename to dom/plugins/base/nptypes.h
rename from modules/plugin/base/public/nsIHTTPHeaderListener.idl
rename to dom/plugins/base/nsIHTTPHeaderListener.idl
rename from modules/plugin/base/public/nsIPlugin.idl
rename to dom/plugins/base/nsIPlugin.idl
rename from modules/plugin/base/public/nsIPluginDocument.idl
rename to dom/plugins/base/nsIPluginDocument.idl
rename from modules/plugin/base/public/nsIPluginHost.idl
rename to dom/plugins/base/nsIPluginHost.idl
rename from modules/plugin/base/public/nsIPluginInputStream.idl
rename to dom/plugins/base/nsIPluginInputStream.idl
rename from modules/plugin/base/public/nsIPluginInstance.idl
rename to dom/plugins/base/nsIPluginInstance.idl
rename from modules/plugin/base/public/nsIPluginInstanceOwner.idl
rename to dom/plugins/base/nsIPluginInstanceOwner.idl
rename from modules/plugin/base/public/nsIPluginStreamInfo.idl
rename to dom/plugins/base/nsIPluginStreamInfo.idl
rename from modules/plugin/base/public/nsIPluginStreamListener.idl
rename to dom/plugins/base/nsIPluginStreamListener.idl
rename from modules/plugin/base/public/nsIPluginTag.idl
rename to dom/plugins/base/nsIPluginTag.idl
rename from modules/plugin/base/public/nsIPluginTagInfo.idl
rename to dom/plugins/base/nsIPluginTagInfo.idl
rename from modules/plugin/base/src/nsJSNPRuntime.cpp
rename to dom/plugins/base/nsJSNPRuntime.cpp
rename from modules/plugin/base/src/nsJSNPRuntime.h
rename to dom/plugins/base/nsJSNPRuntime.h
rename from modules/plugin/base/src/nsNPAPIPlugin.cpp
rename to dom/plugins/base/nsNPAPIPlugin.cpp
rename from modules/plugin/base/src/nsNPAPIPlugin.h
rename to dom/plugins/base/nsNPAPIPlugin.h
rename from modules/plugin/base/src/nsNPAPIPluginInstance.cpp
rename to dom/plugins/base/nsNPAPIPluginInstance.cpp
rename from modules/plugin/base/src/nsNPAPIPluginInstance.h
rename to dom/plugins/base/nsNPAPIPluginInstance.h
rename from modules/plugin/base/src/nsNPAPIPluginStreamListener.cpp
rename to dom/plugins/base/nsNPAPIPluginStreamListener.cpp
rename from modules/plugin/base/src/nsNPAPIPluginStreamListener.h
rename to dom/plugins/base/nsNPAPIPluginStreamListener.h
rename from modules/plugin/base/src/nsPluginDirServiceProvider.cpp
rename to dom/plugins/base/nsPluginDirServiceProvider.cpp
rename from modules/plugin/base/src/nsPluginDirServiceProvider.h
rename to dom/plugins/base/nsPluginDirServiceProvider.h
rename from modules/plugin/base/public/nsPluginError.h
rename to dom/plugins/base/nsPluginError.h
rename from modules/plugin/base/src/nsPluginHost.cpp
rename to dom/plugins/base/nsPluginHost.cpp
rename from modules/plugin/base/src/nsPluginHost.h
rename to dom/plugins/base/nsPluginHost.h
rename from modules/plugin/base/public/nsPluginLogging.h
rename to dom/plugins/base/nsPluginLogging.h
rename from modules/plugin/base/src/nsPluginManifestLineReader.h
rename to dom/plugins/base/nsPluginManifestLineReader.h
rename from modules/plugin/base/src/nsPluginModule.cpp
rename to dom/plugins/base/nsPluginModule.cpp
rename from modules/plugin/base/src/nsPluginNativeWindow.cpp
rename to dom/plugins/base/nsPluginNativeWindow.cpp
rename from modules/plugin/base/public/nsPluginNativeWindow.h
rename to dom/plugins/base/nsPluginNativeWindow.h
rename from modules/plugin/base/src/nsPluginNativeWindowGtk2.cpp
rename to dom/plugins/base/nsPluginNativeWindowGtk2.cpp
rename from modules/plugin/base/src/nsPluginNativeWindowOS2.cpp
rename to dom/plugins/base/nsPluginNativeWindowOS2.cpp
rename from modules/plugin/base/src/nsPluginNativeWindowQt.cpp
rename to dom/plugins/base/nsPluginNativeWindowQt.cpp
rename from modules/plugin/base/src/nsPluginNativeWindowWin.cpp
rename to dom/plugins/base/nsPluginNativeWindowWin.cpp
rename from modules/plugin/base/src/nsPluginSafety.h
rename to dom/plugins/base/nsPluginSafety.h
rename from modules/plugin/base/src/nsPluginStreamListenerPeer.cpp
rename to dom/plugins/base/nsPluginStreamListenerPeer.cpp
rename from modules/plugin/base/src/nsPluginStreamListenerPeer.h
rename to dom/plugins/base/nsPluginStreamListenerPeer.h
rename from modules/plugin/base/src/nsPluginTags.cpp
rename to dom/plugins/base/nsPluginTags.cpp
rename from modules/plugin/base/src/nsPluginTags.h
rename to dom/plugins/base/nsPluginTags.h
rename from modules/plugin/base/public/nsPluginsCID.h
rename to dom/plugins/base/nsPluginsCID.h
rename from modules/plugin/base/src/nsPluginsDir.h
rename to dom/plugins/base/nsPluginsDir.h
rename from modules/plugin/base/src/nsPluginsDirDarwin.cpp
rename to dom/plugins/base/nsPluginsDirDarwin.cpp
rename from modules/plugin/base/src/nsPluginsDirOS2.cpp
rename to dom/plugins/base/nsPluginsDirOS2.cpp
rename from modules/plugin/base/src/nsPluginsDirUnix.cpp
rename to dom/plugins/base/nsPluginsDirUnix.cpp
rename from modules/plugin/base/src/nsPluginsDirUtils.h
rename to dom/plugins/base/nsPluginsDirUtils.h
rename from modules/plugin/base/src/nsPluginsDirWin.cpp
rename to dom/plugins/base/nsPluginsDirWin.cpp
rename from modules/plugin/base/public/nspluginroot.idl
rename to dom/plugins/base/nspluginroot.idl
--- a/dom/plugins/ipc/Makefile.in
+++ b/dom/plugins/ipc/Makefile.in
@@ -137,18 +137,17 @@ endif
 ifeq (cocoa,$(MOZ_WIDGET_TOOLKIT))
 CMMSRCS   += \
     PluginUtilsOSX.mm \
     PluginInterposeOSX.mm \
     $(NULL)
 endif
 
 LOCAL_INCLUDES = \
-  -I$(topsrcdir)/modules/plugin/base/public/ \
-  -I$(topsrcdir)/modules/plugin/base/src/ \
+  -I$(srcdir)/../base \
   -I$(topsrcdir)/xpcom/base/ \
   $(NULL)
 
 include $(topsrcdir)/config/config.mk
 include $(topsrcdir)/ipc/chromium/chromium-config.mk
 
 include $(topsrcdir)/config/rules.mk
 
--- a/layout/generic/Makefile.in
+++ b/layout/generic/Makefile.in
@@ -154,17 +154,17 @@ LOCAL_INCLUDES += \
 		-I$(srcdir)/../forms \
 		-I$(srcdir)/../style \
 		-I$(srcdir)/../tables \
 		-I$(srcdir)/../xul/base/src \
 		-I$(srcdir)/../../content/xul/content/src \
 		-I$(srcdir)/../../content/base/src \
 		-I$(srcdir)/../../content/html/content/src \
 		-I$(srcdir)/../../dom/base \
-		-I$(srcdir)/../../modules/plugin/base/src \
+		-I$(srcdir)/../../dom/plugins/base \
 		$(MOZ_CAIRO_CFLAGS) \
 		$(NULL)
 
 ifdef MOZ_ENABLE_GTK2
 CXXFLAGS += $(MOZ_GTK2_CFLAGS)
 endif
 
 ifdef MOZ_ENABLE_QT
--- a/modules/plugin/Makefile.in
+++ b/modules/plugin/Makefile.in
@@ -39,21 +39,16 @@ DEPTH = ../..
 topsrcdir = @top_srcdir@
 srcdir = @srcdir@
 VPATH = @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
 MODULE = plugin
 
-DIRS = \
-  base/public \
-  base/src \
-  $(NULL)
-
 # These subdirs rely on GTK libraries and header files, it is not
 #  buildable on other non-GTK unix builds
 
 ifdef ENABLE_TESTS
 ifneq (,$(filter gtk2 cocoa windows android qt os2,$(MOZ_WIDGET_TOOLKIT)))
 DIRS += test
 endif
 endif
deleted file mode 100644
--- a/modules/plugin/base/public/Makefile.in
+++ /dev/null
@@ -1,77 +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 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 = plugin
-GRE_MODULE = 1
-
-EXPORTS = \
-  nsPluginLogging.h \
-  nsPluginError.h \
-  nsPluginNativeWindow.h \
-  nsPluginsCID.h \
-  $(NULL)
-
-SDK_HEADERS = \
-  npapi.h \
-  npfunctions.h \
-  nptypes.h \
-  npruntime.h \
-  $(NULL)
-
-XPIDLSRCS = \
-  nsIHTTPHeaderListener.idl \
-  nsIPlugin.idl \
-  nsIPluginDocument.idl \
-  nsIPluginHost.idl \
-  nsIPluginInputStream.idl \
-  nsIPluginInstance.idl \
-  nsIPluginInstanceOwner.idl \
-  nsIPluginStreamInfo.idl \
-  nsIPluginStreamListener.idl \
-  nsIPluginTag.idl \
-  nsIPluginTagInfo.idl \
-  nspluginroot.idl \
-  $(NULL)
-
-include $(topsrcdir)/config/rules.mk
--- a/toolkit/toolkit-makefiles.sh
+++ b/toolkit/toolkit-makefiles.sh
@@ -79,16 +79,17 @@ MAKEFILES_dom="
   dom/src/events/Makefile
   dom/src/jsurl/Makefile
   dom/src/geolocation/Makefile
   dom/src/json/Makefile
   dom/src/offline/Makefile
   dom/src/storage/Makefile
   dom/src/threads/Makefile
   dom/locales/Makefile
+  dom/plugins/base/Makefile
   dom/plugins/ipc/Makefile
   js/jetpack/Makefile
 "
 
 MAKEFILES_editor="
   editor/Makefile
   editor/public/Makefile
   editor/idl/Makefile
@@ -350,18 +351,16 @@ MAKEFILES_libsydneyaudio="
 MAKEFILES_libnestegg="
   media/libnestegg/Makefile
   media/libnestegg/include/Makefile
   media/libnestegg/src/Makefile
 "
 
 MAKEFILES_plugin="
   modules/plugin/Makefile
-  modules/plugin/base/src/Makefile
-  modules/plugin/base/public/Makefile
 "
 
 MAKEFILES_netwerk="
   netwerk/Makefile
   netwerk/base/Makefile
   netwerk/base/public/Makefile
   netwerk/base/src/Makefile
   netwerk/build/Makefile