diff --git a/dom/Makefile.in b/dom/Makefile.in index 66b2af9130ae..cb57d182cb44 100644 --- a/dom/Makefile.in +++ b/dom/Makefile.in @@ -80,7 +80,7 @@ DIRS += \ base \ src \ locales \ - plugins \ + plugins/ipc \ indexedDB \ system \ ipc \ diff --git a/dom/plugins/AStream.h b/dom/plugins/ipc/AStream.h similarity index 100% rename from dom/plugins/AStream.h rename to dom/plugins/ipc/AStream.h diff --git a/dom/plugins/BrowserStreamChild.cpp b/dom/plugins/ipc/BrowserStreamChild.cpp similarity index 100% rename from dom/plugins/BrowserStreamChild.cpp rename to dom/plugins/ipc/BrowserStreamChild.cpp diff --git a/dom/plugins/BrowserStreamChild.h b/dom/plugins/ipc/BrowserStreamChild.h similarity index 100% rename from dom/plugins/BrowserStreamChild.h rename to dom/plugins/ipc/BrowserStreamChild.h diff --git a/dom/plugins/BrowserStreamParent.cpp b/dom/plugins/ipc/BrowserStreamParent.cpp similarity index 100% rename from dom/plugins/BrowserStreamParent.cpp rename to dom/plugins/ipc/BrowserStreamParent.cpp diff --git a/dom/plugins/BrowserStreamParent.h b/dom/plugins/ipc/BrowserStreamParent.h similarity index 100% rename from dom/plugins/BrowserStreamParent.h rename to dom/plugins/ipc/BrowserStreamParent.h diff --git a/dom/plugins/COMMessageFilter.cpp b/dom/plugins/ipc/COMMessageFilter.cpp similarity index 100% rename from dom/plugins/COMMessageFilter.cpp rename to dom/plugins/ipc/COMMessageFilter.cpp diff --git a/dom/plugins/COMMessageFilter.h b/dom/plugins/ipc/COMMessageFilter.h similarity index 100% rename from dom/plugins/COMMessageFilter.h rename to dom/plugins/ipc/COMMessageFilter.h diff --git a/dom/plugins/ChildAsyncCall.cpp b/dom/plugins/ipc/ChildAsyncCall.cpp similarity index 100% rename from dom/plugins/ChildAsyncCall.cpp rename to dom/plugins/ipc/ChildAsyncCall.cpp diff --git a/dom/plugins/ChildAsyncCall.h b/dom/plugins/ipc/ChildAsyncCall.h similarity index 100% rename from dom/plugins/ChildAsyncCall.h rename to dom/plugins/ipc/ChildAsyncCall.h diff --git a/dom/plugins/ChildTimer.cpp b/dom/plugins/ipc/ChildTimer.cpp similarity index 100% rename from dom/plugins/ChildTimer.cpp rename to dom/plugins/ipc/ChildTimer.cpp diff --git a/dom/plugins/ChildTimer.h b/dom/plugins/ipc/ChildTimer.h similarity index 100% rename from dom/plugins/ChildTimer.h rename to dom/plugins/ipc/ChildTimer.h diff --git a/dom/plugins/Makefile.in b/dom/plugins/ipc/Makefile.in similarity index 99% rename from dom/plugins/Makefile.in rename to dom/plugins/ipc/Makefile.in index b824c96cb95c..0747c90c7435 100644 --- a/dom/plugins/Makefile.in +++ b/dom/plugins/ipc/Makefile.in @@ -35,7 +35,7 @@ # # ***** END LICENSE BLOCK ***** -DEPTH = ../.. +DEPTH = ../../.. topsrcdir = @top_srcdir@ srcdir = @srcdir@ VPATH = @srcdir@ diff --git a/dom/plugins/NPEventAndroid.h b/dom/plugins/ipc/NPEventAndroid.h similarity index 100% rename from dom/plugins/NPEventAndroid.h rename to dom/plugins/ipc/NPEventAndroid.h diff --git a/dom/plugins/NPEventOSX.h b/dom/plugins/ipc/NPEventOSX.h similarity index 100% rename from dom/plugins/NPEventOSX.h rename to dom/plugins/ipc/NPEventOSX.h diff --git a/dom/plugins/NPEventWindows.h b/dom/plugins/ipc/NPEventWindows.h similarity index 100% rename from dom/plugins/NPEventWindows.h rename to dom/plugins/ipc/NPEventWindows.h diff --git a/dom/plugins/NPEventX11.h b/dom/plugins/ipc/NPEventX11.h similarity index 100% rename from dom/plugins/NPEventX11.h rename to dom/plugins/ipc/NPEventX11.h diff --git a/dom/plugins/NestedLoopTimer.cpp b/dom/plugins/ipc/NestedLoopTimer.cpp similarity index 100% rename from dom/plugins/NestedLoopTimer.cpp rename to dom/plugins/ipc/NestedLoopTimer.cpp diff --git a/dom/plugins/NestedLoopTimer.h b/dom/plugins/ipc/NestedLoopTimer.h similarity index 100% rename from dom/plugins/NestedLoopTimer.h rename to dom/plugins/ipc/NestedLoopTimer.h diff --git a/dom/plugins/PBrowserStream.ipdl b/dom/plugins/ipc/PBrowserStream.ipdl similarity index 100% rename from dom/plugins/PBrowserStream.ipdl rename to dom/plugins/ipc/PBrowserStream.ipdl diff --git a/dom/plugins/PPluginBackgroundDestroyer.ipdl b/dom/plugins/ipc/PPluginBackgroundDestroyer.ipdl similarity index 100% rename from dom/plugins/PPluginBackgroundDestroyer.ipdl rename to dom/plugins/ipc/PPluginBackgroundDestroyer.ipdl diff --git a/dom/plugins/PPluginIdentifier.ipdl b/dom/plugins/ipc/PPluginIdentifier.ipdl similarity index 100% rename from dom/plugins/PPluginIdentifier.ipdl rename to dom/plugins/ipc/PPluginIdentifier.ipdl diff --git a/dom/plugins/PPluginInstance.ipdl b/dom/plugins/ipc/PPluginInstance.ipdl similarity index 100% rename from dom/plugins/PPluginInstance.ipdl rename to dom/plugins/ipc/PPluginInstance.ipdl diff --git a/dom/plugins/PPluginModule.ipdl b/dom/plugins/ipc/PPluginModule.ipdl similarity index 100% rename from dom/plugins/PPluginModule.ipdl rename to dom/plugins/ipc/PPluginModule.ipdl diff --git a/dom/plugins/PPluginScriptableObject.ipdl b/dom/plugins/ipc/PPluginScriptableObject.ipdl similarity index 100% rename from dom/plugins/PPluginScriptableObject.ipdl rename to dom/plugins/ipc/PPluginScriptableObject.ipdl diff --git a/dom/plugins/PPluginStream.ipdl b/dom/plugins/ipc/PPluginStream.ipdl similarity index 100% rename from dom/plugins/PPluginStream.ipdl rename to dom/plugins/ipc/PPluginStream.ipdl diff --git a/dom/plugins/PPluginSurface.ipdl b/dom/plugins/ipc/PPluginSurface.ipdl similarity index 100% rename from dom/plugins/PPluginSurface.ipdl rename to dom/plugins/ipc/PPluginSurface.ipdl diff --git a/dom/plugins/PStreamNotify.ipdl b/dom/plugins/ipc/PStreamNotify.ipdl similarity index 100% rename from dom/plugins/PStreamNotify.ipdl rename to dom/plugins/ipc/PStreamNotify.ipdl diff --git a/dom/plugins/PluginBackgroundDestroyer.h b/dom/plugins/ipc/PluginBackgroundDestroyer.h similarity index 100% rename from dom/plugins/PluginBackgroundDestroyer.h rename to dom/plugins/ipc/PluginBackgroundDestroyer.h diff --git a/dom/plugins/PluginIdentifierChild.h b/dom/plugins/ipc/PluginIdentifierChild.h similarity index 100% rename from dom/plugins/PluginIdentifierChild.h rename to dom/plugins/ipc/PluginIdentifierChild.h diff --git a/dom/plugins/PluginIdentifierParent.h b/dom/plugins/ipc/PluginIdentifierParent.h similarity index 100% rename from dom/plugins/PluginIdentifierParent.h rename to dom/plugins/ipc/PluginIdentifierParent.h diff --git a/dom/plugins/PluginInstanceChild.cpp b/dom/plugins/ipc/PluginInstanceChild.cpp similarity index 100% rename from dom/plugins/PluginInstanceChild.cpp rename to dom/plugins/ipc/PluginInstanceChild.cpp diff --git a/dom/plugins/PluginInstanceChild.h b/dom/plugins/ipc/PluginInstanceChild.h similarity index 100% rename from dom/plugins/PluginInstanceChild.h rename to dom/plugins/ipc/PluginInstanceChild.h diff --git a/dom/plugins/PluginInstanceParent.cpp b/dom/plugins/ipc/PluginInstanceParent.cpp similarity index 100% rename from dom/plugins/PluginInstanceParent.cpp rename to dom/plugins/ipc/PluginInstanceParent.cpp diff --git a/dom/plugins/PluginInstanceParent.h b/dom/plugins/ipc/PluginInstanceParent.h similarity index 100% rename from dom/plugins/PluginInstanceParent.h rename to dom/plugins/ipc/PluginInstanceParent.h diff --git a/dom/plugins/PluginInterposeOSX.h b/dom/plugins/ipc/PluginInterposeOSX.h similarity index 100% rename from dom/plugins/PluginInterposeOSX.h rename to dom/plugins/ipc/PluginInterposeOSX.h diff --git a/dom/plugins/PluginInterposeOSX.mm b/dom/plugins/ipc/PluginInterposeOSX.mm similarity index 100% rename from dom/plugins/PluginInterposeOSX.mm rename to dom/plugins/ipc/PluginInterposeOSX.mm diff --git a/dom/plugins/PluginLibrary.h b/dom/plugins/ipc/PluginLibrary.h similarity index 100% rename from dom/plugins/PluginLibrary.h rename to dom/plugins/ipc/PluginLibrary.h diff --git a/dom/plugins/PluginMessageUtils.cpp b/dom/plugins/ipc/PluginMessageUtils.cpp similarity index 100% rename from dom/plugins/PluginMessageUtils.cpp rename to dom/plugins/ipc/PluginMessageUtils.cpp diff --git a/dom/plugins/PluginMessageUtils.h b/dom/plugins/ipc/PluginMessageUtils.h similarity index 100% rename from dom/plugins/PluginMessageUtils.h rename to dom/plugins/ipc/PluginMessageUtils.h diff --git a/dom/plugins/PluginModuleChild.cpp b/dom/plugins/ipc/PluginModuleChild.cpp similarity index 100% rename from dom/plugins/PluginModuleChild.cpp rename to dom/plugins/ipc/PluginModuleChild.cpp diff --git a/dom/plugins/PluginModuleChild.h b/dom/plugins/ipc/PluginModuleChild.h similarity index 100% rename from dom/plugins/PluginModuleChild.h rename to dom/plugins/ipc/PluginModuleChild.h diff --git a/dom/plugins/PluginModuleParent.cpp b/dom/plugins/ipc/PluginModuleParent.cpp similarity index 100% rename from dom/plugins/PluginModuleParent.cpp rename to dom/plugins/ipc/PluginModuleParent.cpp diff --git a/dom/plugins/PluginModuleParent.h b/dom/plugins/ipc/PluginModuleParent.h similarity index 100% rename from dom/plugins/PluginModuleParent.h rename to dom/plugins/ipc/PluginModuleParent.h diff --git a/dom/plugins/PluginProcessChild.cpp b/dom/plugins/ipc/PluginProcessChild.cpp similarity index 100% rename from dom/plugins/PluginProcessChild.cpp rename to dom/plugins/ipc/PluginProcessChild.cpp diff --git a/dom/plugins/PluginProcessChild.h b/dom/plugins/ipc/PluginProcessChild.h similarity index 100% rename from dom/plugins/PluginProcessChild.h rename to dom/plugins/ipc/PluginProcessChild.h diff --git a/dom/plugins/PluginProcessParent.cpp b/dom/plugins/ipc/PluginProcessParent.cpp similarity index 100% rename from dom/plugins/PluginProcessParent.cpp rename to dom/plugins/ipc/PluginProcessParent.cpp diff --git a/dom/plugins/PluginProcessParent.h b/dom/plugins/ipc/PluginProcessParent.h similarity index 100% rename from dom/plugins/PluginProcessParent.h rename to dom/plugins/ipc/PluginProcessParent.h diff --git a/dom/plugins/PluginScriptableObjectChild.cpp b/dom/plugins/ipc/PluginScriptableObjectChild.cpp similarity index 100% rename from dom/plugins/PluginScriptableObjectChild.cpp rename to dom/plugins/ipc/PluginScriptableObjectChild.cpp diff --git a/dom/plugins/PluginScriptableObjectChild.h b/dom/plugins/ipc/PluginScriptableObjectChild.h similarity index 100% rename from dom/plugins/PluginScriptableObjectChild.h rename to dom/plugins/ipc/PluginScriptableObjectChild.h diff --git a/dom/plugins/PluginScriptableObjectParent.cpp b/dom/plugins/ipc/PluginScriptableObjectParent.cpp similarity index 100% rename from dom/plugins/PluginScriptableObjectParent.cpp rename to dom/plugins/ipc/PluginScriptableObjectParent.cpp diff --git a/dom/plugins/PluginScriptableObjectParent.h b/dom/plugins/ipc/PluginScriptableObjectParent.h similarity index 100% rename from dom/plugins/PluginScriptableObjectParent.h rename to dom/plugins/ipc/PluginScriptableObjectParent.h diff --git a/dom/plugins/PluginScriptableObjectUtils-inl.h b/dom/plugins/ipc/PluginScriptableObjectUtils-inl.h similarity index 100% rename from dom/plugins/PluginScriptableObjectUtils-inl.h rename to dom/plugins/ipc/PluginScriptableObjectUtils-inl.h diff --git a/dom/plugins/PluginScriptableObjectUtils.h b/dom/plugins/ipc/PluginScriptableObjectUtils.h similarity index 100% rename from dom/plugins/PluginScriptableObjectUtils.h rename to dom/plugins/ipc/PluginScriptableObjectUtils.h diff --git a/dom/plugins/PluginStreamChild.cpp b/dom/plugins/ipc/PluginStreamChild.cpp similarity index 100% rename from dom/plugins/PluginStreamChild.cpp rename to dom/plugins/ipc/PluginStreamChild.cpp diff --git a/dom/plugins/PluginStreamChild.h b/dom/plugins/ipc/PluginStreamChild.h similarity index 100% rename from dom/plugins/PluginStreamChild.h rename to dom/plugins/ipc/PluginStreamChild.h diff --git a/dom/plugins/PluginStreamParent.cpp b/dom/plugins/ipc/PluginStreamParent.cpp similarity index 100% rename from dom/plugins/PluginStreamParent.cpp rename to dom/plugins/ipc/PluginStreamParent.cpp diff --git a/dom/plugins/PluginStreamParent.h b/dom/plugins/ipc/PluginStreamParent.h similarity index 100% rename from dom/plugins/PluginStreamParent.h rename to dom/plugins/ipc/PluginStreamParent.h diff --git a/dom/plugins/PluginSurfaceParent.cpp b/dom/plugins/ipc/PluginSurfaceParent.cpp similarity index 100% rename from dom/plugins/PluginSurfaceParent.cpp rename to dom/plugins/ipc/PluginSurfaceParent.cpp diff --git a/dom/plugins/PluginSurfaceParent.h b/dom/plugins/ipc/PluginSurfaceParent.h similarity index 100% rename from dom/plugins/PluginSurfaceParent.h rename to dom/plugins/ipc/PluginSurfaceParent.h diff --git a/dom/plugins/PluginUtilsOSX.h b/dom/plugins/ipc/PluginUtilsOSX.h similarity index 100% rename from dom/plugins/PluginUtilsOSX.h rename to dom/plugins/ipc/PluginUtilsOSX.h diff --git a/dom/plugins/PluginUtilsOSX.mm b/dom/plugins/ipc/PluginUtilsOSX.mm similarity index 100% rename from dom/plugins/PluginUtilsOSX.mm rename to dom/plugins/ipc/PluginUtilsOSX.mm diff --git a/dom/plugins/StreamNotifyChild.h b/dom/plugins/ipc/StreamNotifyChild.h similarity index 100% rename from dom/plugins/StreamNotifyChild.h rename to dom/plugins/ipc/StreamNotifyChild.h diff --git a/dom/plugins/StreamNotifyParent.h b/dom/plugins/ipc/StreamNotifyParent.h similarity index 100% rename from dom/plugins/StreamNotifyParent.h rename to dom/plugins/ipc/StreamNotifyParent.h diff --git a/dom/plugins/ipdl.mk b/dom/plugins/ipc/ipdl.mk similarity index 100% rename from dom/plugins/ipdl.mk rename to dom/plugins/ipc/ipdl.mk diff --git a/ipc/ipdl/Makefile.in b/ipc/ipdl/Makefile.in index be957bda99d0..7e31871ab39f 100644 --- a/ipc/ipdl/Makefile.in +++ b/ipc/ipdl/Makefile.in @@ -55,7 +55,7 @@ EXPORT_LIBRARY = 1 ## IPDLDIRS = \ uriloader/exthandler \ - dom/plugins \ + dom/plugins/ipc \ dom/ipc \ dom/src/storage \ gfx/layers/ipc \ diff --git a/toolkit/toolkit-makefiles.sh b/toolkit/toolkit-makefiles.sh index e8fff3550a6b..5e058bd5722a 100644 --- a/toolkit/toolkit-makefiles.sh +++ b/toolkit/toolkit-makefiles.sh @@ -84,7 +84,7 @@ MAKEFILES_dom=" dom/src/storage/Makefile dom/src/threads/Makefile dom/locales/Makefile - dom/plugins/Makefile + dom/plugins/ipc/Makefile js/jetpack/Makefile "