Bug 649488: Move contents of dom/plugins to dom/plugins/ipc. r=bsmedberg
authorJosh Aas <joshmoz@gmail.com>
Tue, 12 Apr 2011 16:26:11 -0700
changeset 68389 93a5d77f3e9ed0085d6486038267d1120f2d9a77
parent 68388 f6aa347c426c7595150432d7aa99f0b6390a628e
child 68390 4a94c229c1a94a9a297fbe0e15f88714d10818c2
child 69521 abf39d39f0f4d35dc12f392358907cf199b5e3ec
push id11
push userffxbld
push dateThu, 11 Aug 2011 21:43:38 +0000
treeherdermozilla-release@cf0a29826586 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersbsmedberg
bugs649488
milestone6.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 649488: Move contents of dom/plugins to dom/plugins/ipc. r=bsmedberg
dom/Makefile.in
dom/plugins/AStream.h
dom/plugins/BrowserStreamChild.cpp
dom/plugins/BrowserStreamChild.h
dom/plugins/BrowserStreamParent.cpp
dom/plugins/BrowserStreamParent.h
dom/plugins/COMMessageFilter.cpp
dom/plugins/COMMessageFilter.h
dom/plugins/ChildAsyncCall.cpp
dom/plugins/ChildAsyncCall.h
dom/plugins/ChildTimer.cpp
dom/plugins/ChildTimer.h
dom/plugins/Makefile.in
dom/plugins/NPEventAndroid.h
dom/plugins/NPEventOSX.h
dom/plugins/NPEventWindows.h
dom/plugins/NPEventX11.h
dom/plugins/NestedLoopTimer.cpp
dom/plugins/NestedLoopTimer.h
dom/plugins/PBrowserStream.ipdl
dom/plugins/PPluginBackgroundDestroyer.ipdl
dom/plugins/PPluginIdentifier.ipdl
dom/plugins/PPluginInstance.ipdl
dom/plugins/PPluginModule.ipdl
dom/plugins/PPluginScriptableObject.ipdl
dom/plugins/PPluginStream.ipdl
dom/plugins/PPluginSurface.ipdl
dom/plugins/PStreamNotify.ipdl
dom/plugins/PluginBackgroundDestroyer.h
dom/plugins/PluginIdentifierChild.h
dom/plugins/PluginIdentifierParent.h
dom/plugins/PluginInstanceChild.cpp
dom/plugins/PluginInstanceChild.h
dom/plugins/PluginInstanceParent.cpp
dom/plugins/PluginInstanceParent.h
dom/plugins/PluginInterposeOSX.h
dom/plugins/PluginInterposeOSX.mm
dom/plugins/PluginLibrary.h
dom/plugins/PluginMessageUtils.cpp
dom/plugins/PluginMessageUtils.h
dom/plugins/PluginModuleChild.cpp
dom/plugins/PluginModuleChild.h
dom/plugins/PluginModuleParent.cpp
dom/plugins/PluginModuleParent.h
dom/plugins/PluginProcessChild.cpp
dom/plugins/PluginProcessChild.h
dom/plugins/PluginProcessParent.cpp
dom/plugins/PluginProcessParent.h
dom/plugins/PluginScriptableObjectChild.cpp
dom/plugins/PluginScriptableObjectChild.h
dom/plugins/PluginScriptableObjectParent.cpp
dom/plugins/PluginScriptableObjectParent.h
dom/plugins/PluginScriptableObjectUtils-inl.h
dom/plugins/PluginScriptableObjectUtils.h
dom/plugins/PluginStreamChild.cpp
dom/plugins/PluginStreamChild.h
dom/plugins/PluginStreamParent.cpp
dom/plugins/PluginStreamParent.h
dom/plugins/PluginSurfaceParent.cpp
dom/plugins/PluginSurfaceParent.h
dom/plugins/PluginUtilsOSX.h
dom/plugins/PluginUtilsOSX.mm
dom/plugins/StreamNotifyChild.h
dom/plugins/StreamNotifyParent.h
dom/plugins/ipc/AStream.h
dom/plugins/ipc/BrowserStreamChild.cpp
dom/plugins/ipc/BrowserStreamChild.h
dom/plugins/ipc/BrowserStreamParent.cpp
dom/plugins/ipc/BrowserStreamParent.h
dom/plugins/ipc/COMMessageFilter.cpp
dom/plugins/ipc/COMMessageFilter.h
dom/plugins/ipc/ChildAsyncCall.cpp
dom/plugins/ipc/ChildAsyncCall.h
dom/plugins/ipc/ChildTimer.cpp
dom/plugins/ipc/ChildTimer.h
dom/plugins/ipc/Makefile.in
dom/plugins/ipc/NPEventAndroid.h
dom/plugins/ipc/NPEventOSX.h
dom/plugins/ipc/NPEventWindows.h
dom/plugins/ipc/NPEventX11.h
dom/plugins/ipc/NestedLoopTimer.cpp
dom/plugins/ipc/NestedLoopTimer.h
dom/plugins/ipc/PBrowserStream.ipdl
dom/plugins/ipc/PPluginBackgroundDestroyer.ipdl
dom/plugins/ipc/PPluginIdentifier.ipdl
dom/plugins/ipc/PPluginInstance.ipdl
dom/plugins/ipc/PPluginModule.ipdl
dom/plugins/ipc/PPluginScriptableObject.ipdl
dom/plugins/ipc/PPluginStream.ipdl
dom/plugins/ipc/PPluginSurface.ipdl
dom/plugins/ipc/PStreamNotify.ipdl
dom/plugins/ipc/PluginBackgroundDestroyer.h
dom/plugins/ipc/PluginIdentifierChild.h
dom/plugins/ipc/PluginIdentifierParent.h
dom/plugins/ipc/PluginInstanceChild.cpp
dom/plugins/ipc/PluginInstanceChild.h
dom/plugins/ipc/PluginInstanceParent.cpp
dom/plugins/ipc/PluginInstanceParent.h
dom/plugins/ipc/PluginInterposeOSX.h
dom/plugins/ipc/PluginInterposeOSX.mm
dom/plugins/ipc/PluginLibrary.h
dom/plugins/ipc/PluginMessageUtils.cpp
dom/plugins/ipc/PluginMessageUtils.h
dom/plugins/ipc/PluginModuleChild.cpp
dom/plugins/ipc/PluginModuleChild.h
dom/plugins/ipc/PluginModuleParent.cpp
dom/plugins/ipc/PluginModuleParent.h
dom/plugins/ipc/PluginProcessChild.cpp
dom/plugins/ipc/PluginProcessChild.h
dom/plugins/ipc/PluginProcessParent.cpp
dom/plugins/ipc/PluginProcessParent.h
dom/plugins/ipc/PluginScriptableObjectChild.cpp
dom/plugins/ipc/PluginScriptableObjectChild.h
dom/plugins/ipc/PluginScriptableObjectParent.cpp
dom/plugins/ipc/PluginScriptableObjectParent.h
dom/plugins/ipc/PluginScriptableObjectUtils-inl.h
dom/plugins/ipc/PluginScriptableObjectUtils.h
dom/plugins/ipc/PluginStreamChild.cpp
dom/plugins/ipc/PluginStreamChild.h
dom/plugins/ipc/PluginStreamParent.cpp
dom/plugins/ipc/PluginStreamParent.h
dom/plugins/ipc/PluginSurfaceParent.cpp
dom/plugins/ipc/PluginSurfaceParent.h
dom/plugins/ipc/PluginUtilsOSX.h
dom/plugins/ipc/PluginUtilsOSX.mm
dom/plugins/ipc/StreamNotifyChild.h
dom/plugins/ipc/StreamNotifyParent.h
dom/plugins/ipc/ipdl.mk
dom/plugins/ipdl.mk
ipc/ipdl/Makefile.in
toolkit/toolkit-makefiles.sh
--- a/dom/Makefile.in
+++ b/dom/Makefile.in
@@ -75,17 +75,17 @@ ifdef MOZ_SMIL
 DIRS += interfaces/smil
 endif
 
 DIRS += \
   public/coreEvents \
   base \
   src \
   locales \
-  plugins \
+  plugins/ipc \
   indexedDB \
   system \
   ipc \
   $(NULL)
 
 ifdef ENABLE_TESTS
 DIRS += tests
 endif
rename from dom/plugins/AStream.h
rename to dom/plugins/ipc/AStream.h
rename from dom/plugins/BrowserStreamChild.cpp
rename to dom/plugins/ipc/BrowserStreamChild.cpp
rename from dom/plugins/BrowserStreamChild.h
rename to dom/plugins/ipc/BrowserStreamChild.h
rename from dom/plugins/BrowserStreamParent.cpp
rename to dom/plugins/ipc/BrowserStreamParent.cpp
rename from dom/plugins/BrowserStreamParent.h
rename to dom/plugins/ipc/BrowserStreamParent.h
rename from dom/plugins/COMMessageFilter.cpp
rename to dom/plugins/ipc/COMMessageFilter.cpp
rename from dom/plugins/COMMessageFilter.h
rename to dom/plugins/ipc/COMMessageFilter.h
rename from dom/plugins/ChildAsyncCall.cpp
rename to dom/plugins/ipc/ChildAsyncCall.cpp
rename from dom/plugins/ChildAsyncCall.h
rename to dom/plugins/ipc/ChildAsyncCall.h
rename from dom/plugins/ChildTimer.cpp
rename to dom/plugins/ipc/ChildTimer.cpp
rename from dom/plugins/ChildTimer.h
rename to dom/plugins/ipc/ChildTimer.h
rename from dom/plugins/Makefile.in
rename to dom/plugins/ipc/Makefile.in
--- a/dom/plugins/Makefile.in
+++ b/dom/plugins/ipc/Makefile.in
@@ -30,17 +30,17 @@
 # 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 = dom
 
rename from dom/plugins/NPEventAndroid.h
rename to dom/plugins/ipc/NPEventAndroid.h
rename from dom/plugins/NPEventOSX.h
rename to dom/plugins/ipc/NPEventOSX.h
rename from dom/plugins/NPEventWindows.h
rename to dom/plugins/ipc/NPEventWindows.h
rename from dom/plugins/NPEventX11.h
rename to dom/plugins/ipc/NPEventX11.h
rename from dom/plugins/NestedLoopTimer.cpp
rename to dom/plugins/ipc/NestedLoopTimer.cpp
rename from dom/plugins/NestedLoopTimer.h
rename to dom/plugins/ipc/NestedLoopTimer.h
rename from dom/plugins/PBrowserStream.ipdl
rename to dom/plugins/ipc/PBrowserStream.ipdl
rename from dom/plugins/PPluginBackgroundDestroyer.ipdl
rename to dom/plugins/ipc/PPluginBackgroundDestroyer.ipdl
rename from dom/plugins/PPluginIdentifier.ipdl
rename to dom/plugins/ipc/PPluginIdentifier.ipdl
rename from dom/plugins/PPluginInstance.ipdl
rename to dom/plugins/ipc/PPluginInstance.ipdl
rename from dom/plugins/PPluginModule.ipdl
rename to dom/plugins/ipc/PPluginModule.ipdl
rename from dom/plugins/PPluginScriptableObject.ipdl
rename to dom/plugins/ipc/PPluginScriptableObject.ipdl
rename from dom/plugins/PPluginStream.ipdl
rename to dom/plugins/ipc/PPluginStream.ipdl
rename from dom/plugins/PPluginSurface.ipdl
rename to dom/plugins/ipc/PPluginSurface.ipdl
rename from dom/plugins/PStreamNotify.ipdl
rename to dom/plugins/ipc/PStreamNotify.ipdl
rename from dom/plugins/PluginBackgroundDestroyer.h
rename to dom/plugins/ipc/PluginBackgroundDestroyer.h
rename from dom/plugins/PluginIdentifierChild.h
rename to dom/plugins/ipc/PluginIdentifierChild.h
rename from dom/plugins/PluginIdentifierParent.h
rename to dom/plugins/ipc/PluginIdentifierParent.h
rename from dom/plugins/PluginInstanceChild.cpp
rename to dom/plugins/ipc/PluginInstanceChild.cpp
rename from dom/plugins/PluginInstanceChild.h
rename to dom/plugins/ipc/PluginInstanceChild.h
rename from dom/plugins/PluginInstanceParent.cpp
rename to dom/plugins/ipc/PluginInstanceParent.cpp
rename from dom/plugins/PluginInstanceParent.h
rename to dom/plugins/ipc/PluginInstanceParent.h
rename from dom/plugins/PluginInterposeOSX.h
rename to dom/plugins/ipc/PluginInterposeOSX.h
rename from dom/plugins/PluginInterposeOSX.mm
rename to dom/plugins/ipc/PluginInterposeOSX.mm
rename from dom/plugins/PluginLibrary.h
rename to dom/plugins/ipc/PluginLibrary.h
rename from dom/plugins/PluginMessageUtils.cpp
rename to dom/plugins/ipc/PluginMessageUtils.cpp
rename from dom/plugins/PluginMessageUtils.h
rename to dom/plugins/ipc/PluginMessageUtils.h
rename from dom/plugins/PluginModuleChild.cpp
rename to dom/plugins/ipc/PluginModuleChild.cpp
rename from dom/plugins/PluginModuleChild.h
rename to dom/plugins/ipc/PluginModuleChild.h
rename from dom/plugins/PluginModuleParent.cpp
rename to dom/plugins/ipc/PluginModuleParent.cpp
rename from dom/plugins/PluginModuleParent.h
rename to dom/plugins/ipc/PluginModuleParent.h
rename from dom/plugins/PluginProcessChild.cpp
rename to dom/plugins/ipc/PluginProcessChild.cpp
rename from dom/plugins/PluginProcessChild.h
rename to dom/plugins/ipc/PluginProcessChild.h
rename from dom/plugins/PluginProcessParent.cpp
rename to dom/plugins/ipc/PluginProcessParent.cpp
rename from dom/plugins/PluginProcessParent.h
rename to dom/plugins/ipc/PluginProcessParent.h
rename from dom/plugins/PluginScriptableObjectChild.cpp
rename to dom/plugins/ipc/PluginScriptableObjectChild.cpp
rename from dom/plugins/PluginScriptableObjectChild.h
rename to dom/plugins/ipc/PluginScriptableObjectChild.h
rename from dom/plugins/PluginScriptableObjectParent.cpp
rename to dom/plugins/ipc/PluginScriptableObjectParent.cpp
rename from dom/plugins/PluginScriptableObjectParent.h
rename to dom/plugins/ipc/PluginScriptableObjectParent.h
rename from dom/plugins/PluginScriptableObjectUtils-inl.h
rename to dom/plugins/ipc/PluginScriptableObjectUtils-inl.h
rename from dom/plugins/PluginScriptableObjectUtils.h
rename to dom/plugins/ipc/PluginScriptableObjectUtils.h
rename from dom/plugins/PluginStreamChild.cpp
rename to dom/plugins/ipc/PluginStreamChild.cpp
rename from dom/plugins/PluginStreamChild.h
rename to dom/plugins/ipc/PluginStreamChild.h
rename from dom/plugins/PluginStreamParent.cpp
rename to dom/plugins/ipc/PluginStreamParent.cpp
rename from dom/plugins/PluginStreamParent.h
rename to dom/plugins/ipc/PluginStreamParent.h
rename from dom/plugins/PluginSurfaceParent.cpp
rename to dom/plugins/ipc/PluginSurfaceParent.cpp
rename from dom/plugins/PluginSurfaceParent.h
rename to dom/plugins/ipc/PluginSurfaceParent.h
rename from dom/plugins/PluginUtilsOSX.h
rename to dom/plugins/ipc/PluginUtilsOSX.h
rename from dom/plugins/PluginUtilsOSX.mm
rename to dom/plugins/ipc/PluginUtilsOSX.mm
rename from dom/plugins/StreamNotifyChild.h
rename to dom/plugins/ipc/StreamNotifyChild.h
rename from dom/plugins/StreamNotifyParent.h
rename to dom/plugins/ipc/StreamNotifyParent.h
rename from dom/plugins/ipdl.mk
rename to dom/plugins/ipc/ipdl.mk
--- a/ipc/ipdl/Makefile.in
+++ b/ipc/ipdl/Makefile.in
@@ -50,17 +50,17 @@ FORCE_STATIC_LIB = 1
 LIBXUL_LIBRARY = 1
 EXPORT_LIBRARY = 1
 
 ##-----------------------------------------------------------------------------
 ## When you add IPDL files to a source directory, list the directory here.
 ##
 IPDLDIRS =  \
   uriloader/exthandler \
-  dom/plugins  \
+  dom/plugins/ipc  \
   dom/ipc  \
   dom/src/storage \
   gfx/layers/ipc \
   ipc/testshell  \
   js/ipc  \
   js/jetpack \
   layout/ipc \
   netwerk/ipc  \
--- a/toolkit/toolkit-makefiles.sh
+++ b/toolkit/toolkit-makefiles.sh
@@ -79,17 +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/Makefile
+  dom/plugins/ipc/Makefile
   js/jetpack/Makefile
 "
 
 MAKEFILES_editor="
   editor/Makefile
   editor/public/Makefile
   editor/idl/Makefile
   editor/txmgr/Makefile