From d3a66ed55ad32b11586c57f1677103e685c8c537 Mon Sep 17 00:00:00 2001 From: Benjamin Smedberg Date: Tue, 26 Apr 2011 17:38:43 -0400 Subject: [PATCH] Bug 649558 - Move modules/plugin/base to dom/plugins/base, r=josh --HG-- rename : modules/plugin/base/src/Makefile.in => dom/plugins/base/Makefile.in rename : modules/plugin/base/src/PluginPRLibrary.cpp => dom/plugins/base/PluginPRLibrary.cpp rename : modules/plugin/base/src/PluginPRLibrary.h => dom/plugins/base/PluginPRLibrary.h rename : modules/plugin/base/public/npapi.h => dom/plugins/base/npapi.h rename : modules/plugin/base/public/npfunctions.h => dom/plugins/base/npfunctions.h rename : modules/plugin/base/public/npruntime.h => dom/plugins/base/npruntime.h rename : modules/plugin/base/public/nptypes.h => dom/plugins/base/nptypes.h rename : modules/plugin/base/public/nsIHTTPHeaderListener.idl => dom/plugins/base/nsIHTTPHeaderListener.idl rename : modules/plugin/base/public/nsIPlugin.idl => dom/plugins/base/nsIPlugin.idl rename : modules/plugin/base/public/nsIPluginDocument.idl => dom/plugins/base/nsIPluginDocument.idl rename : modules/plugin/base/public/nsIPluginHost.idl => dom/plugins/base/nsIPluginHost.idl rename : modules/plugin/base/public/nsIPluginInputStream.idl => dom/plugins/base/nsIPluginInputStream.idl rename : modules/plugin/base/public/nsIPluginInstance.idl => dom/plugins/base/nsIPluginInstance.idl rename : modules/plugin/base/public/nsIPluginInstanceOwner.idl => dom/plugins/base/nsIPluginInstanceOwner.idl rename : modules/plugin/base/public/nsIPluginStreamInfo.idl => dom/plugins/base/nsIPluginStreamInfo.idl rename : modules/plugin/base/public/nsIPluginStreamListener.idl => dom/plugins/base/nsIPluginStreamListener.idl rename : modules/plugin/base/public/nsIPluginTag.idl => dom/plugins/base/nsIPluginTag.idl rename : modules/plugin/base/public/nsIPluginTagInfo.idl => dom/plugins/base/nsIPluginTagInfo.idl rename : modules/plugin/base/src/nsJSNPRuntime.cpp => dom/plugins/base/nsJSNPRuntime.cpp rename : modules/plugin/base/src/nsJSNPRuntime.h => dom/plugins/base/nsJSNPRuntime.h rename : modules/plugin/base/src/nsNPAPIPlugin.cpp => dom/plugins/base/nsNPAPIPlugin.cpp rename : modules/plugin/base/src/nsNPAPIPlugin.h => dom/plugins/base/nsNPAPIPlugin.h rename : modules/plugin/base/src/nsNPAPIPluginInstance.cpp => dom/plugins/base/nsNPAPIPluginInstance.cpp rename : modules/plugin/base/src/nsNPAPIPluginInstance.h => dom/plugins/base/nsNPAPIPluginInstance.h rename : modules/plugin/base/src/nsNPAPIPluginStreamListener.cpp => dom/plugins/base/nsNPAPIPluginStreamListener.cpp rename : modules/plugin/base/src/nsNPAPIPluginStreamListener.h => dom/plugins/base/nsNPAPIPluginStreamListener.h rename : modules/plugin/base/src/nsPluginDirServiceProvider.cpp => dom/plugins/base/nsPluginDirServiceProvider.cpp rename : modules/plugin/base/src/nsPluginDirServiceProvider.h => dom/plugins/base/nsPluginDirServiceProvider.h rename : modules/plugin/base/public/nsPluginError.h => dom/plugins/base/nsPluginError.h rename : modules/plugin/base/src/nsPluginHost.cpp => dom/plugins/base/nsPluginHost.cpp rename : modules/plugin/base/src/nsPluginHost.h => dom/plugins/base/nsPluginHost.h rename : modules/plugin/base/public/nsPluginLogging.h => dom/plugins/base/nsPluginLogging.h rename : modules/plugin/base/src/nsPluginManifestLineReader.h => dom/plugins/base/nsPluginManifestLineReader.h rename : modules/plugin/base/src/nsPluginModule.cpp => dom/plugins/base/nsPluginModule.cpp rename : modules/plugin/base/src/nsPluginNativeWindow.cpp => dom/plugins/base/nsPluginNativeWindow.cpp rename : modules/plugin/base/public/nsPluginNativeWindow.h => dom/plugins/base/nsPluginNativeWindow.h rename : modules/plugin/base/src/nsPluginNativeWindowGtk2.cpp => dom/plugins/base/nsPluginNativeWindowGtk2.cpp rename : modules/plugin/base/src/nsPluginNativeWindowOS2.cpp => dom/plugins/base/nsPluginNativeWindowOS2.cpp rename : modules/plugin/base/src/nsPluginNativeWindowQt.cpp => dom/plugins/base/nsPluginNativeWindowQt.cpp rename : modules/plugin/base/src/nsPluginNativeWindowWin.cpp => dom/plugins/base/nsPluginNativeWindowWin.cpp rename : modules/plugin/base/src/nsPluginSafety.h => dom/plugins/base/nsPluginSafety.h rename : modules/plugin/base/src/nsPluginStreamListenerPeer.cpp => dom/plugins/base/nsPluginStreamListenerPeer.cpp rename : modules/plugin/base/src/nsPluginStreamListenerPeer.h => dom/plugins/base/nsPluginStreamListenerPeer.h rename : modules/plugin/base/src/nsPluginTags.cpp => dom/plugins/base/nsPluginTags.cpp rename : modules/plugin/base/src/nsPluginTags.h => dom/plugins/base/nsPluginTags.h rename : modules/plugin/base/public/nsPluginsCID.h => dom/plugins/base/nsPluginsCID.h rename : modules/plugin/base/src/nsPluginsDir.h => dom/plugins/base/nsPluginsDir.h rename : modules/plugin/base/src/nsPluginsDirDarwin.cpp => dom/plugins/base/nsPluginsDirDarwin.cpp rename : modules/plugin/base/src/nsPluginsDirOS2.cpp => dom/plugins/base/nsPluginsDirOS2.cpp rename : modules/plugin/base/src/nsPluginsDirUnix.cpp => dom/plugins/base/nsPluginsDirUnix.cpp rename : modules/plugin/base/src/nsPluginsDirUtils.h => dom/plugins/base/nsPluginsDirUtils.h rename : modules/plugin/base/src/nsPluginsDirWin.cpp => dom/plugins/base/nsPluginsDirWin.cpp rename : modules/plugin/base/public/nspluginroot.idl => dom/plugins/base/nspluginroot.idl --- dom/Makefile.in | 1 + .../base/src => dom/plugins/base}/Makefile.in | 29 ++++++- .../plugins/base}/PluginPRLibrary.cpp | 0 .../plugins/base}/PluginPRLibrary.h | 0 .../base/public => dom/plugins/base}/npapi.h | 0 .../public => dom/plugins/base}/npfunctions.h | 0 .../public => dom/plugins/base}/npruntime.h | 0 .../public => dom/plugins/base}/nptypes.h | 0 .../plugins/base}/nsIHTTPHeaderListener.idl | 0 .../public => dom/plugins/base}/nsIPlugin.idl | 0 .../plugins/base}/nsIPluginDocument.idl | 0 .../plugins/base}/nsIPluginHost.idl | 0 .../plugins/base}/nsIPluginInputStream.idl | 0 .../plugins/base}/nsIPluginInstance.idl | 0 .../plugins/base}/nsIPluginInstanceOwner.idl | 0 .../plugins/base}/nsIPluginStreamInfo.idl | 0 .../plugins/base}/nsIPluginStreamListener.idl | 0 .../plugins/base}/nsIPluginTag.idl | 0 .../plugins/base}/nsIPluginTagInfo.idl | 0 .../plugins/base}/nsJSNPRuntime.cpp | 0 .../src => dom/plugins/base}/nsJSNPRuntime.h | 0 .../plugins/base}/nsNPAPIPlugin.cpp | 0 .../src => dom/plugins/base}/nsNPAPIPlugin.h | 0 .../plugins/base}/nsNPAPIPluginInstance.cpp | 0 .../plugins/base}/nsNPAPIPluginInstance.h | 0 .../base}/nsNPAPIPluginStreamListener.cpp | 0 .../base}/nsNPAPIPluginStreamListener.h | 0 .../base}/nsPluginDirServiceProvider.cpp | 0 .../base}/nsPluginDirServiceProvider.h | 0 .../plugins/base}/nsPluginError.h | 0 .../src => dom/plugins/base}/nsPluginHost.cpp | 0 .../src => dom/plugins/base}/nsPluginHost.h | 0 .../plugins/base}/nsPluginLogging.h | 0 .../base}/nsPluginManifestLineReader.h | 0 .../plugins/base}/nsPluginModule.cpp | 0 .../plugins/base}/nsPluginNativeWindow.cpp | 0 .../plugins/base}/nsPluginNativeWindow.h | 0 .../base}/nsPluginNativeWindowGtk2.cpp | 0 .../plugins/base}/nsPluginNativeWindowOS2.cpp | 0 .../plugins/base}/nsPluginNativeWindowQt.cpp | 0 .../plugins/base}/nsPluginNativeWindowWin.cpp | 0 .../src => dom/plugins/base}/nsPluginSafety.h | 0 .../base}/nsPluginStreamListenerPeer.cpp | 0 .../base}/nsPluginStreamListenerPeer.h | 0 .../src => dom/plugins/base}/nsPluginTags.cpp | 0 .../src => dom/plugins/base}/nsPluginTags.h | 0 .../plugins/base}/nsPluginsCID.h | 0 .../src => dom/plugins/base}/nsPluginsDir.h | 0 .../plugins/base}/nsPluginsDirDarwin.cpp | 0 .../plugins/base}/nsPluginsDirOS2.cpp | 0 .../plugins/base}/nsPluginsDirUnix.cpp | 0 .../plugins/base}/nsPluginsDirUtils.h | 0 .../plugins/base}/nsPluginsDirWin.cpp | 0 .../plugins/base}/nspluginroot.idl | 0 dom/plugins/ipc/Makefile.in | 3 +- layout/generic/Makefile.in | 2 +- modules/plugin/Makefile.in | 5 -- modules/plugin/base/public/Makefile.in | 77 ------------------- toolkit/toolkit-makefiles.sh | 3 +- 59 files changed, 31 insertions(+), 89 deletions(-) rename {modules/plugin/base/src => dom/plugins/base}/Makefile.in (87%) rename {modules/plugin/base/src => dom/plugins/base}/PluginPRLibrary.cpp (100%) rename {modules/plugin/base/src => dom/plugins/base}/PluginPRLibrary.h (100%) rename {modules/plugin/base/public => dom/plugins/base}/npapi.h (100%) rename {modules/plugin/base/public => dom/plugins/base}/npfunctions.h (100%) rename {modules/plugin/base/public => dom/plugins/base}/npruntime.h (100%) rename {modules/plugin/base/public => dom/plugins/base}/nptypes.h (100%) rename {modules/plugin/base/public => dom/plugins/base}/nsIHTTPHeaderListener.idl (100%) rename {modules/plugin/base/public => dom/plugins/base}/nsIPlugin.idl (100%) rename {modules/plugin/base/public => dom/plugins/base}/nsIPluginDocument.idl (100%) rename {modules/plugin/base/public => dom/plugins/base}/nsIPluginHost.idl (100%) rename {modules/plugin/base/public => dom/plugins/base}/nsIPluginInputStream.idl (100%) rename {modules/plugin/base/public => dom/plugins/base}/nsIPluginInstance.idl (100%) rename {modules/plugin/base/public => dom/plugins/base}/nsIPluginInstanceOwner.idl (100%) rename {modules/plugin/base/public => dom/plugins/base}/nsIPluginStreamInfo.idl (100%) rename {modules/plugin/base/public => dom/plugins/base}/nsIPluginStreamListener.idl (100%) rename {modules/plugin/base/public => dom/plugins/base}/nsIPluginTag.idl (100%) rename {modules/plugin/base/public => dom/plugins/base}/nsIPluginTagInfo.idl (100%) rename {modules/plugin/base/src => dom/plugins/base}/nsJSNPRuntime.cpp (100%) rename {modules/plugin/base/src => dom/plugins/base}/nsJSNPRuntime.h (100%) rename {modules/plugin/base/src => dom/plugins/base}/nsNPAPIPlugin.cpp (100%) rename {modules/plugin/base/src => dom/plugins/base}/nsNPAPIPlugin.h (100%) rename {modules/plugin/base/src => dom/plugins/base}/nsNPAPIPluginInstance.cpp (100%) rename {modules/plugin/base/src => dom/plugins/base}/nsNPAPIPluginInstance.h (100%) rename {modules/plugin/base/src => dom/plugins/base}/nsNPAPIPluginStreamListener.cpp (100%) rename {modules/plugin/base/src => dom/plugins/base}/nsNPAPIPluginStreamListener.h (100%) rename {modules/plugin/base/src => dom/plugins/base}/nsPluginDirServiceProvider.cpp (100%) rename {modules/plugin/base/src => dom/plugins/base}/nsPluginDirServiceProvider.h (100%) rename {modules/plugin/base/public => dom/plugins/base}/nsPluginError.h (100%) rename {modules/plugin/base/src => dom/plugins/base}/nsPluginHost.cpp (100%) rename {modules/plugin/base/src => dom/plugins/base}/nsPluginHost.h (100%) rename {modules/plugin/base/public => dom/plugins/base}/nsPluginLogging.h (100%) rename {modules/plugin/base/src => dom/plugins/base}/nsPluginManifestLineReader.h (100%) rename {modules/plugin/base/src => dom/plugins/base}/nsPluginModule.cpp (100%) rename {modules/plugin/base/src => dom/plugins/base}/nsPluginNativeWindow.cpp (100%) rename {modules/plugin/base/public => dom/plugins/base}/nsPluginNativeWindow.h (100%) rename {modules/plugin/base/src => dom/plugins/base}/nsPluginNativeWindowGtk2.cpp (100%) rename {modules/plugin/base/src => dom/plugins/base}/nsPluginNativeWindowOS2.cpp (100%) rename {modules/plugin/base/src => dom/plugins/base}/nsPluginNativeWindowQt.cpp (100%) rename {modules/plugin/base/src => dom/plugins/base}/nsPluginNativeWindowWin.cpp (100%) rename {modules/plugin/base/src => dom/plugins/base}/nsPluginSafety.h (100%) rename {modules/plugin/base/src => dom/plugins/base}/nsPluginStreamListenerPeer.cpp (100%) rename {modules/plugin/base/src => dom/plugins/base}/nsPluginStreamListenerPeer.h (100%) rename {modules/plugin/base/src => dom/plugins/base}/nsPluginTags.cpp (100%) rename {modules/plugin/base/src => dom/plugins/base}/nsPluginTags.h (100%) rename {modules/plugin/base/public => dom/plugins/base}/nsPluginsCID.h (100%) rename {modules/plugin/base/src => dom/plugins/base}/nsPluginsDir.h (100%) rename {modules/plugin/base/src => dom/plugins/base}/nsPluginsDirDarwin.cpp (100%) rename {modules/plugin/base/src => dom/plugins/base}/nsPluginsDirOS2.cpp (100%) rename {modules/plugin/base/src => dom/plugins/base}/nsPluginsDirUnix.cpp (100%) rename {modules/plugin/base/src => dom/plugins/base}/nsPluginsDirUtils.h (100%) rename {modules/plugin/base/src => dom/plugins/base}/nsPluginsDirWin.cpp (100%) rename {modules/plugin/base/public => dom/plugins/base}/nspluginroot.idl (100%) delete mode 100644 modules/plugin/base/public/Makefile.in diff --git a/dom/Makefile.in b/dom/Makefile.in index cb57d182cb4..78893d2c07d 100644 --- a/dom/Makefile.in +++ b/dom/Makefile.in @@ -80,6 +80,7 @@ DIRS += \ base \ src \ locales \ + plugins/base \ plugins/ipc \ indexedDB \ system \ diff --git a/modules/plugin/base/src/Makefile.in b/dom/plugins/base/Makefile.in similarity index 87% rename from modules/plugin/base/src/Makefile.in rename to dom/plugins/base/Makefile.in index ce32f82033a..7fff658ae2b 100644 --- a/modules/plugin/base/src/Makefile.in +++ b/dom/plugins/base/Makefile.in @@ -35,7 +35,7 @@ # # ***** END LICENSE BLOCK ***** -DEPTH = ../../../.. +DEPTH = ../../.. topsrcdir = @top_srcdir@ srcdir = @srcdir@ VPATH = @srcdir@ @@ -43,7 +43,6 @@ VPATH = @srcdir@ include $(DEPTH)/config/autoconf.mk MODULE = plugin -XPIDL_MODULE = layout LIBRARY_NAME = gkplugin EXPORT_LIBRARY = 1 IS_COMPONENT = 1 @@ -53,6 +52,32 @@ 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) diff --git a/modules/plugin/base/src/PluginPRLibrary.cpp b/dom/plugins/base/PluginPRLibrary.cpp similarity index 100% rename from modules/plugin/base/src/PluginPRLibrary.cpp rename to dom/plugins/base/PluginPRLibrary.cpp diff --git a/modules/plugin/base/src/PluginPRLibrary.h b/dom/plugins/base/PluginPRLibrary.h similarity index 100% rename from modules/plugin/base/src/PluginPRLibrary.h rename to dom/plugins/base/PluginPRLibrary.h diff --git a/modules/plugin/base/public/npapi.h b/dom/plugins/base/npapi.h similarity index 100% rename from modules/plugin/base/public/npapi.h rename to dom/plugins/base/npapi.h diff --git a/modules/plugin/base/public/npfunctions.h b/dom/plugins/base/npfunctions.h similarity index 100% rename from modules/plugin/base/public/npfunctions.h rename to dom/plugins/base/npfunctions.h diff --git a/modules/plugin/base/public/npruntime.h b/dom/plugins/base/npruntime.h similarity index 100% rename from modules/plugin/base/public/npruntime.h rename to dom/plugins/base/npruntime.h diff --git a/modules/plugin/base/public/nptypes.h b/dom/plugins/base/nptypes.h similarity index 100% rename from modules/plugin/base/public/nptypes.h rename to dom/plugins/base/nptypes.h diff --git a/modules/plugin/base/public/nsIHTTPHeaderListener.idl b/dom/plugins/base/nsIHTTPHeaderListener.idl similarity index 100% rename from modules/plugin/base/public/nsIHTTPHeaderListener.idl rename to dom/plugins/base/nsIHTTPHeaderListener.idl diff --git a/modules/plugin/base/public/nsIPlugin.idl b/dom/plugins/base/nsIPlugin.idl similarity index 100% rename from modules/plugin/base/public/nsIPlugin.idl rename to dom/plugins/base/nsIPlugin.idl diff --git a/modules/plugin/base/public/nsIPluginDocument.idl b/dom/plugins/base/nsIPluginDocument.idl similarity index 100% rename from modules/plugin/base/public/nsIPluginDocument.idl rename to dom/plugins/base/nsIPluginDocument.idl diff --git a/modules/plugin/base/public/nsIPluginHost.idl b/dom/plugins/base/nsIPluginHost.idl similarity index 100% rename from modules/plugin/base/public/nsIPluginHost.idl rename to dom/plugins/base/nsIPluginHost.idl diff --git a/modules/plugin/base/public/nsIPluginInputStream.idl b/dom/plugins/base/nsIPluginInputStream.idl similarity index 100% rename from modules/plugin/base/public/nsIPluginInputStream.idl rename to dom/plugins/base/nsIPluginInputStream.idl diff --git a/modules/plugin/base/public/nsIPluginInstance.idl b/dom/plugins/base/nsIPluginInstance.idl similarity index 100% rename from modules/plugin/base/public/nsIPluginInstance.idl rename to dom/plugins/base/nsIPluginInstance.idl diff --git a/modules/plugin/base/public/nsIPluginInstanceOwner.idl b/dom/plugins/base/nsIPluginInstanceOwner.idl similarity index 100% rename from modules/plugin/base/public/nsIPluginInstanceOwner.idl rename to dom/plugins/base/nsIPluginInstanceOwner.idl diff --git a/modules/plugin/base/public/nsIPluginStreamInfo.idl b/dom/plugins/base/nsIPluginStreamInfo.idl similarity index 100% rename from modules/plugin/base/public/nsIPluginStreamInfo.idl rename to dom/plugins/base/nsIPluginStreamInfo.idl diff --git a/modules/plugin/base/public/nsIPluginStreamListener.idl b/dom/plugins/base/nsIPluginStreamListener.idl similarity index 100% rename from modules/plugin/base/public/nsIPluginStreamListener.idl rename to dom/plugins/base/nsIPluginStreamListener.idl diff --git a/modules/plugin/base/public/nsIPluginTag.idl b/dom/plugins/base/nsIPluginTag.idl similarity index 100% rename from modules/plugin/base/public/nsIPluginTag.idl rename to dom/plugins/base/nsIPluginTag.idl diff --git a/modules/plugin/base/public/nsIPluginTagInfo.idl b/dom/plugins/base/nsIPluginTagInfo.idl similarity index 100% rename from modules/plugin/base/public/nsIPluginTagInfo.idl rename to dom/plugins/base/nsIPluginTagInfo.idl diff --git a/modules/plugin/base/src/nsJSNPRuntime.cpp b/dom/plugins/base/nsJSNPRuntime.cpp similarity index 100% rename from modules/plugin/base/src/nsJSNPRuntime.cpp rename to dom/plugins/base/nsJSNPRuntime.cpp diff --git a/modules/plugin/base/src/nsJSNPRuntime.h b/dom/plugins/base/nsJSNPRuntime.h similarity index 100% rename from modules/plugin/base/src/nsJSNPRuntime.h rename to dom/plugins/base/nsJSNPRuntime.h diff --git a/modules/plugin/base/src/nsNPAPIPlugin.cpp b/dom/plugins/base/nsNPAPIPlugin.cpp similarity index 100% rename from modules/plugin/base/src/nsNPAPIPlugin.cpp rename to dom/plugins/base/nsNPAPIPlugin.cpp diff --git a/modules/plugin/base/src/nsNPAPIPlugin.h b/dom/plugins/base/nsNPAPIPlugin.h similarity index 100% rename from modules/plugin/base/src/nsNPAPIPlugin.h rename to dom/plugins/base/nsNPAPIPlugin.h diff --git a/modules/plugin/base/src/nsNPAPIPluginInstance.cpp b/dom/plugins/base/nsNPAPIPluginInstance.cpp similarity index 100% rename from modules/plugin/base/src/nsNPAPIPluginInstance.cpp rename to dom/plugins/base/nsNPAPIPluginInstance.cpp diff --git a/modules/plugin/base/src/nsNPAPIPluginInstance.h b/dom/plugins/base/nsNPAPIPluginInstance.h similarity index 100% rename from modules/plugin/base/src/nsNPAPIPluginInstance.h rename to dom/plugins/base/nsNPAPIPluginInstance.h diff --git a/modules/plugin/base/src/nsNPAPIPluginStreamListener.cpp b/dom/plugins/base/nsNPAPIPluginStreamListener.cpp similarity index 100% rename from modules/plugin/base/src/nsNPAPIPluginStreamListener.cpp rename to dom/plugins/base/nsNPAPIPluginStreamListener.cpp diff --git a/modules/plugin/base/src/nsNPAPIPluginStreamListener.h b/dom/plugins/base/nsNPAPIPluginStreamListener.h similarity index 100% rename from modules/plugin/base/src/nsNPAPIPluginStreamListener.h rename to dom/plugins/base/nsNPAPIPluginStreamListener.h diff --git a/modules/plugin/base/src/nsPluginDirServiceProvider.cpp b/dom/plugins/base/nsPluginDirServiceProvider.cpp similarity index 100% rename from modules/plugin/base/src/nsPluginDirServiceProvider.cpp rename to dom/plugins/base/nsPluginDirServiceProvider.cpp diff --git a/modules/plugin/base/src/nsPluginDirServiceProvider.h b/dom/plugins/base/nsPluginDirServiceProvider.h similarity index 100% rename from modules/plugin/base/src/nsPluginDirServiceProvider.h rename to dom/plugins/base/nsPluginDirServiceProvider.h diff --git a/modules/plugin/base/public/nsPluginError.h b/dom/plugins/base/nsPluginError.h similarity index 100% rename from modules/plugin/base/public/nsPluginError.h rename to dom/plugins/base/nsPluginError.h diff --git a/modules/plugin/base/src/nsPluginHost.cpp b/dom/plugins/base/nsPluginHost.cpp similarity index 100% rename from modules/plugin/base/src/nsPluginHost.cpp rename to dom/plugins/base/nsPluginHost.cpp diff --git a/modules/plugin/base/src/nsPluginHost.h b/dom/plugins/base/nsPluginHost.h similarity index 100% rename from modules/plugin/base/src/nsPluginHost.h rename to dom/plugins/base/nsPluginHost.h diff --git a/modules/plugin/base/public/nsPluginLogging.h b/dom/plugins/base/nsPluginLogging.h similarity index 100% rename from modules/plugin/base/public/nsPluginLogging.h rename to dom/plugins/base/nsPluginLogging.h diff --git a/modules/plugin/base/src/nsPluginManifestLineReader.h b/dom/plugins/base/nsPluginManifestLineReader.h similarity index 100% rename from modules/plugin/base/src/nsPluginManifestLineReader.h rename to dom/plugins/base/nsPluginManifestLineReader.h diff --git a/modules/plugin/base/src/nsPluginModule.cpp b/dom/plugins/base/nsPluginModule.cpp similarity index 100% rename from modules/plugin/base/src/nsPluginModule.cpp rename to dom/plugins/base/nsPluginModule.cpp diff --git a/modules/plugin/base/src/nsPluginNativeWindow.cpp b/dom/plugins/base/nsPluginNativeWindow.cpp similarity index 100% rename from modules/plugin/base/src/nsPluginNativeWindow.cpp rename to dom/plugins/base/nsPluginNativeWindow.cpp diff --git a/modules/plugin/base/public/nsPluginNativeWindow.h b/dom/plugins/base/nsPluginNativeWindow.h similarity index 100% rename from modules/plugin/base/public/nsPluginNativeWindow.h rename to dom/plugins/base/nsPluginNativeWindow.h diff --git a/modules/plugin/base/src/nsPluginNativeWindowGtk2.cpp b/dom/plugins/base/nsPluginNativeWindowGtk2.cpp similarity index 100% rename from modules/plugin/base/src/nsPluginNativeWindowGtk2.cpp rename to dom/plugins/base/nsPluginNativeWindowGtk2.cpp diff --git a/modules/plugin/base/src/nsPluginNativeWindowOS2.cpp b/dom/plugins/base/nsPluginNativeWindowOS2.cpp similarity index 100% rename from modules/plugin/base/src/nsPluginNativeWindowOS2.cpp rename to dom/plugins/base/nsPluginNativeWindowOS2.cpp diff --git a/modules/plugin/base/src/nsPluginNativeWindowQt.cpp b/dom/plugins/base/nsPluginNativeWindowQt.cpp similarity index 100% rename from modules/plugin/base/src/nsPluginNativeWindowQt.cpp rename to dom/plugins/base/nsPluginNativeWindowQt.cpp diff --git a/modules/plugin/base/src/nsPluginNativeWindowWin.cpp b/dom/plugins/base/nsPluginNativeWindowWin.cpp similarity index 100% rename from modules/plugin/base/src/nsPluginNativeWindowWin.cpp rename to dom/plugins/base/nsPluginNativeWindowWin.cpp diff --git a/modules/plugin/base/src/nsPluginSafety.h b/dom/plugins/base/nsPluginSafety.h similarity index 100% rename from modules/plugin/base/src/nsPluginSafety.h rename to dom/plugins/base/nsPluginSafety.h diff --git a/modules/plugin/base/src/nsPluginStreamListenerPeer.cpp b/dom/plugins/base/nsPluginStreamListenerPeer.cpp similarity index 100% rename from modules/plugin/base/src/nsPluginStreamListenerPeer.cpp rename to dom/plugins/base/nsPluginStreamListenerPeer.cpp diff --git a/modules/plugin/base/src/nsPluginStreamListenerPeer.h b/dom/plugins/base/nsPluginStreamListenerPeer.h similarity index 100% rename from modules/plugin/base/src/nsPluginStreamListenerPeer.h rename to dom/plugins/base/nsPluginStreamListenerPeer.h diff --git a/modules/plugin/base/src/nsPluginTags.cpp b/dom/plugins/base/nsPluginTags.cpp similarity index 100% rename from modules/plugin/base/src/nsPluginTags.cpp rename to dom/plugins/base/nsPluginTags.cpp diff --git a/modules/plugin/base/src/nsPluginTags.h b/dom/plugins/base/nsPluginTags.h similarity index 100% rename from modules/plugin/base/src/nsPluginTags.h rename to dom/plugins/base/nsPluginTags.h diff --git a/modules/plugin/base/public/nsPluginsCID.h b/dom/plugins/base/nsPluginsCID.h similarity index 100% rename from modules/plugin/base/public/nsPluginsCID.h rename to dom/plugins/base/nsPluginsCID.h diff --git a/modules/plugin/base/src/nsPluginsDir.h b/dom/plugins/base/nsPluginsDir.h similarity index 100% rename from modules/plugin/base/src/nsPluginsDir.h rename to dom/plugins/base/nsPluginsDir.h diff --git a/modules/plugin/base/src/nsPluginsDirDarwin.cpp b/dom/plugins/base/nsPluginsDirDarwin.cpp similarity index 100% rename from modules/plugin/base/src/nsPluginsDirDarwin.cpp rename to dom/plugins/base/nsPluginsDirDarwin.cpp diff --git a/modules/plugin/base/src/nsPluginsDirOS2.cpp b/dom/plugins/base/nsPluginsDirOS2.cpp similarity index 100% rename from modules/plugin/base/src/nsPluginsDirOS2.cpp rename to dom/plugins/base/nsPluginsDirOS2.cpp diff --git a/modules/plugin/base/src/nsPluginsDirUnix.cpp b/dom/plugins/base/nsPluginsDirUnix.cpp similarity index 100% rename from modules/plugin/base/src/nsPluginsDirUnix.cpp rename to dom/plugins/base/nsPluginsDirUnix.cpp diff --git a/modules/plugin/base/src/nsPluginsDirUtils.h b/dom/plugins/base/nsPluginsDirUtils.h similarity index 100% rename from modules/plugin/base/src/nsPluginsDirUtils.h rename to dom/plugins/base/nsPluginsDirUtils.h diff --git a/modules/plugin/base/src/nsPluginsDirWin.cpp b/dom/plugins/base/nsPluginsDirWin.cpp similarity index 100% rename from modules/plugin/base/src/nsPluginsDirWin.cpp rename to dom/plugins/base/nsPluginsDirWin.cpp diff --git a/modules/plugin/base/public/nspluginroot.idl b/dom/plugins/base/nspluginroot.idl similarity index 100% rename from modules/plugin/base/public/nspluginroot.idl rename to dom/plugins/base/nspluginroot.idl diff --git a/dom/plugins/ipc/Makefile.in b/dom/plugins/ipc/Makefile.in index 0747c90c743..0f31cbd6b0a 100644 --- a/dom/plugins/ipc/Makefile.in +++ b/dom/plugins/ipc/Makefile.in @@ -142,8 +142,7 @@ CMMSRCS += \ endif LOCAL_INCLUDES = \ - -I$(topsrcdir)/modules/plugin/base/public/ \ - -I$(topsrcdir)/modules/plugin/base/src/ \ + -I$(srcdir)/../base \ -I$(topsrcdir)/xpcom/base/ \ $(NULL) diff --git a/layout/generic/Makefile.in b/layout/generic/Makefile.in index ac625df1df9..630ad5d316d 100644 --- a/layout/generic/Makefile.in +++ b/layout/generic/Makefile.in @@ -159,7 +159,7 @@ LOCAL_INCLUDES += \ -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) diff --git a/modules/plugin/Makefile.in b/modules/plugin/Makefile.in index 0522c49b0d5..f5afdf3a467 100644 --- a/modules/plugin/Makefile.in +++ b/modules/plugin/Makefile.in @@ -44,11 +44,6 @@ 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 diff --git a/modules/plugin/base/public/Makefile.in b/modules/plugin/base/public/Makefile.in deleted file mode 100644 index 9fa897452f7..00000000000 --- 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 diff --git a/toolkit/toolkit-makefiles.sh b/toolkit/toolkit-makefiles.sh index 5e058bd5722..2ec206d46de 100644 --- a/toolkit/toolkit-makefiles.sh +++ b/toolkit/toolkit-makefiles.sh @@ -84,6 +84,7 @@ MAKEFILES_dom=" dom/src/storage/Makefile dom/src/threads/Makefile dom/locales/Makefile + dom/plugins/base/Makefile dom/plugins/ipc/Makefile js/jetpack/Makefile " @@ -355,8 +356,6 @@ MAKEFILES_libnestegg=" MAKEFILES_plugin=" modules/plugin/Makefile - modules/plugin/base/src/Makefile - modules/plugin/base/public/Makefile " MAKEFILES_netwerk="