mirror of
https://github.com/mozilla/gecko-dev.git
synced 2025-02-05 05:30:29 +00:00
Revert "Bug 1114647 - Rename "plugin-container" to "firefox-webcontent" and create a new executable target for Win32 called "firefox-plugin-container" r=ted,jhamer" because of widespread breakage due to whitelisted executable names in third parties
This reverts commit a94b5f861bd0d25043a3bb7a0c3128acf8c0b93a. --HG-- rename : ipc/contentproc/firefox-webcontent.cpp => ipc/contentproc/plugin-container.cpp
This commit is contained in:
George Wright
parent
2f920d9592
commit
e75c590407
2
CLOBBER
2
CLOBBER
@ -22,4 +22,4 @@
|
||||
# changes to stick? As of bug 928195, this shouldn't be necessary! Please
|
||||
# don't change CLOBBER for WebIDL changes any more.
|
||||
|
||||
Bug 1114647 - Renamed the content process
|
||||
Bug 1186060 - Switch Windows compiler from VS2013 to VS2015
|
||||
|
||||
@ -56,7 +56,6 @@ endif
|
||||
endif
|
||||
|
||||
DEFINES += -DMOZ_CHILD_PROCESS_NAME=$(MOZ_CHILD_PROCESS_NAME)
|
||||
DEFINES += -DMOZ_PLUGIN_PROCESS_NAME=$(MOZ_PLUGIN_PROCESS_NAME)
|
||||
|
||||
# Set MSVC dlls version to package, if any.
|
||||
ifdef MOZ_NO_DEBUG_RTL
|
||||
|
||||
@ -88,7 +88,6 @@
|
||||
#endif
|
||||
#ifdef XP_WIN32
|
||||
@BINPATH@/plugin-hang-ui@BIN_SUFFIX@
|
||||
@BINPATH@/@MOZ_PLUGIN_PROCESS_NAME@
|
||||
#if MOZ_PACKAGE_MSVC_DLLS
|
||||
@BINPATH@/@MSVC_C_RUNTIME_DLL@
|
||||
@BINPATH@/@MSVC_CXX_RUNTIME_DLL@
|
||||
|
||||
@ -476,9 +476,7 @@ Section "-Application" APP_IDX
|
||||
|
||||
StrCpy $0 "Software\Microsoft\MediaPlayer\ShimInclusionList\$R9"
|
||||
${CreateRegKey} "$TmpVal" "$0" 0
|
||||
StrCpy $0 "Software\Microsoft\MediaPlayer\ShimInclusionList\firefox-webcontent.exe"
|
||||
${CreateRegKey} "$TmpVal" "$0" 0
|
||||
StrCpy $0 "Software\Microsoft\MediaPlayer\ShimInclusionList\firefox-plugin-container.exe"
|
||||
StrCpy $0 "Software\Microsoft\MediaPlayer\ShimInclusionList\plugin-container.exe"
|
||||
${CreateRegKey} "$TmpVal" "$0" 0
|
||||
|
||||
${If} $TmpVal == "HKLM"
|
||||
|
||||
@ -355,10 +355,7 @@ Section "Uninstall"
|
||||
StrCpy $0 "Software\Microsoft\MediaPlayer\ShimInclusionList\${FileMainEXE}"
|
||||
DeleteRegKey HKLM "$0"
|
||||
DeleteRegKey HKCU "$0"
|
||||
StrCpy $0 "Software\Microsoft\MediaPlayer\ShimInclusionList\firefox-webcontent.exe"
|
||||
DeleteRegKey HKLM "$0"
|
||||
DeleteRegKey HKCU "$0"
|
||||
StrCpy $0 "Software\Microsoft\MediaPlayer\ShimInclusionList\firefox-plugin-container.exe"
|
||||
StrCpy $0 "Software\Microsoft\MediaPlayer\ShimInclusionList\plugin-container.exe"
|
||||
DeleteRegKey HKLM "$0"
|
||||
DeleteRegKey HKCU "$0"
|
||||
StrCpy $0 "Software\Classes\MIME\Database\Content Type\application/x-xpinstall;app=firefox"
|
||||
|
||||
@ -31,6 +31,5 @@ endif
|
||||
ifndef CLANG_CL
|
||||
check::
|
||||
$(PYTHON) $(srcdir)/autobinscope.py $(DIST)/bin/$(MOZ_APP_NAME)$(BIN_SUFFIX) $(DIST)/crashreporter-symbols/
|
||||
$(PYTHON) $(srcdir)/autobinscope.py $(DIST)/bin/firefox-webcontent.exe $(DIST)/crashreporter-symbols/
|
||||
$(PYTHON) $(srcdir)/autobinscope.py $(DIST)/bin/firefox-plugin-container.exe $(DIST)/crashreporter-symbols/
|
||||
$(PYTHON) $(srcdir)/autobinscope.py $(DIST)/bin/plugin-container.exe $(DIST)/crashreporter-symbols/
|
||||
endif
|
||||
|
||||
@ -32,18 +32,15 @@ public:
|
||||
// Encapsulates generating the device-bound node id, activating the sandbox,
|
||||
// loading the GMP, and passing the node id to the GMP (in that order).
|
||||
//
|
||||
// In Desktop Gecko, the implementation of this lives in the content process
|
||||
// host binary, and is passed into XUL code from on startup. The GMP IPC child
|
||||
// protocol actor uses this interface to load and retrieve interfaces from the
|
||||
// GMPs.
|
||||
// In Desktop Gecko, the implementation of this lives in plugin-container,
|
||||
// and is passed into XUL code from on startup. The GMP IPC child protocol actor
|
||||
// uses this interface to load and retrieve interfaces from the GMPs.
|
||||
//
|
||||
// In Desktop Gecko the implementation lives in the firefox-plugin-container
|
||||
// (Windows) or firefox-webcontent (other platforms) so that it can be covered
|
||||
// by DRM vendor's voucher. The reason for the extra executable on Windows is
|
||||
// because we can't programmatically change the executable name at runtime.
|
||||
// In Desktop Gecko the implementation lives in the plugin-container so that
|
||||
// it can be covered by DRM vendor's voucher.
|
||||
//
|
||||
// On Android the GMPLoader implementation lives in libxul (because for the time
|
||||
// being GMPLoader relies upon NSPR, which we can't use in firefox-webcontent
|
||||
// being GMPLoader relies upon NSPR, which we can't use in plugin-container
|
||||
// on Android).
|
||||
//
|
||||
// There is exactly one GMPLoader per GMP child process, and only one GMP
|
||||
@ -76,9 +73,7 @@ public:
|
||||
#endif
|
||||
};
|
||||
|
||||
// On Desktop, this function resides in firefox-plugin-container on Windows, firefox-webcontent
|
||||
// for all other platforms.
|
||||
//
|
||||
// On Desktop, this function resides in plugin-container.
|
||||
// On Mobile, this function resides in XUL.
|
||||
GMPLoader* CreateGMPLoader(SandboxStarter* aStarter);
|
||||
|
||||
|
||||
@ -25,8 +25,7 @@ endif
|
||||
ifeq ($(OS_ARCH),WINNT) #{
|
||||
# Note the manifest file exists in the tree, so we use the explicit filename
|
||||
# here.
|
||||
EXTRA_DEPS += firefox-webcontent.exe.manifest
|
||||
EXTRA_DEPS += plugin-container/firefox-plugin-container.exe.manifest
|
||||
EXTRA_DEPS += plugin-container.exe.manifest
|
||||
endif #}
|
||||
|
||||
ifeq (cocoa,$(MOZ_WIDGET_TOOLKIT)) #{
|
||||
|
||||
@ -4,7 +4,7 @@
|
||||
* License, v. 2.0. If a copy of the MPL was not distributed with this
|
||||
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
|
||||
|
||||
#include "../contentproc/firefox-webcontent.cpp"
|
||||
#include "../contentproc/plugin-container.cpp"
|
||||
|
||||
int
|
||||
main(int argc, char *argv[]) {
|
||||
|
||||
@ -1,130 +0,0 @@
|
||||
# -*- Mode: python; c-basic-offset: 4; indent-tabs-mode: nil; tab-width: 40 -*-
|
||||
# vim: set filetype=python:
|
||||
# This Source Code Form is subject to the terms of the Mozilla Public
|
||||
# License, v. 2.0. If a copy of the MPL was not distributed with this
|
||||
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
|
||||
|
||||
# Any changes that affect Android need to be made in pie/moz.build as well.
|
||||
|
||||
if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'android':
|
||||
SOURCES += [
|
||||
'MozillaRuntimeMainAndroid.cpp',
|
||||
]
|
||||
|
||||
DIRS += ['pie']
|
||||
else:
|
||||
kwargs = {
|
||||
'linkage': None,
|
||||
}
|
||||
if CONFIG['MOZ_SANDBOX'] and CONFIG['OS_ARCH'] == 'WINNT' and not CONFIG['MOZ_ASAN']:
|
||||
kwargs['msvcrt'] = 'static'
|
||||
if not CONFIG['GNU_CC']:
|
||||
USE_LIBS += [
|
||||
'mozalloc_staticruntime',
|
||||
]
|
||||
|
||||
SOURCES += [
|
||||
'MozillaRuntimeMain.cpp',
|
||||
]
|
||||
USE_LIBS += [
|
||||
'nspr',
|
||||
'xul',
|
||||
]
|
||||
|
||||
include('/ipc/chromium/chromium-config.mozbuild')
|
||||
|
||||
LOCAL_INCLUDES += [
|
||||
'/ipc/app',
|
||||
'/toolkit/xre',
|
||||
'/xpcom/base',
|
||||
]
|
||||
|
||||
# We link GMPLoader into plugin-container on desktop so that its code is
|
||||
# covered by the desktop DRM vendor's voucher.
|
||||
if CONFIG['OS_TARGET'] != 'Android':
|
||||
SOURCES += [
|
||||
'../../dom/media/gmp/GMPLoader.cpp',
|
||||
]
|
||||
|
||||
if CONFIG['MOZ_SANDBOX'] and CONFIG['OS_ARCH'] == 'WINNT':
|
||||
# For sandbox includes and the include dependencies those have
|
||||
LOCAL_INCLUDES += [
|
||||
'/security/sandbox/chromium',
|
||||
'/security/sandbox/chromium-shim',
|
||||
]
|
||||
USE_LIBS += [
|
||||
'rlz',
|
||||
]
|
||||
|
||||
if CONFIG['MOZ_ASAN']:
|
||||
USE_LIBS += [
|
||||
'sandbox_s',
|
||||
]
|
||||
else:
|
||||
USE_LIBS += [
|
||||
'sandbox_staticruntime_s',
|
||||
]
|
||||
|
||||
DELAYLOAD_DLLS += [
|
||||
'nss3.dll',
|
||||
'xul.dll'
|
||||
]
|
||||
DEFINES['HASH_NODE_ID_WITH_DEVICE_ID'] = 1;
|
||||
SOURCES += [
|
||||
'sha256.c',
|
||||
]
|
||||
|
||||
if CONFIG['MOZ_SANDBOX'] and CONFIG['OS_TARGET'] in ('Linux', 'Android'):
|
||||
USE_LIBS += [
|
||||
'mozsandbox',
|
||||
]
|
||||
|
||||
# gcc lto likes to put the top level asm in syscall.cc in a different partition
|
||||
# from the function using it which breaks the build. Work around that by
|
||||
# forcing there to be only one partition.
|
||||
if '-flto' in CONFIG['OS_CXXFLAGS'] and not CONFIG['CLANG_CXX']:
|
||||
LDFLAGS += ['--param lto-partitions=1']
|
||||
|
||||
if CONFIG['MOZ_SANDBOX'] and CONFIG['OS_TARGET'] == 'Darwin':
|
||||
# For sandbox includes and the include dependencies those have
|
||||
LOCAL_INCLUDES += [
|
||||
'/security/sandbox/chromium',
|
||||
'/security/sandbox/chromium-shim',
|
||||
]
|
||||
USE_LIBS += [
|
||||
'mozsandbox',
|
||||
'rlz',
|
||||
]
|
||||
|
||||
DEFINES['HASH_NODE_ID_WITH_DEVICE_ID'] = 1;
|
||||
SOURCES += [
|
||||
'sha256.c',
|
||||
]
|
||||
|
||||
if CONFIG['_MSC_VER']:
|
||||
# Always enter a Windows program through wmain, whether or not we're
|
||||
# a console application.
|
||||
WIN32_EXE_LDFLAGS += ['-ENTRY:wmainCRTStartup']
|
||||
|
||||
LDFLAGS += CONFIG['MOZ_ALLOW_HEAP_EXECUTE_FLAGS']
|
||||
|
||||
# Control the default heap size.
|
||||
# This is the heap returned by GetProcessHeap().
|
||||
# As we use the CRT heap, the default size is too large and wastes VM.
|
||||
#
|
||||
# The default heap size is 1MB on Win32.
|
||||
# The heap will grow if need be.
|
||||
#
|
||||
# Set it to 256k. See bug 127069.
|
||||
if CONFIG['OS_ARCH'] == 'WINNT' and not CONFIG['GNU_CC']:
|
||||
LDFLAGS += ['/HEAP:0x40000']
|
||||
|
||||
if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'gonk':
|
||||
OS_LIBS += [
|
||||
'binder',
|
||||
'utils',
|
||||
]
|
||||
|
||||
if CONFIG['GNU_CXX']:
|
||||
CXXFLAGS += ['-Wshadow']
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
WIN32_MODULE_COMPANYNAME=Mozilla Corporation
|
||||
WIN32_MODULE_PRODUCTVERSION=@MOZ_APP_WINVERSION@
|
||||
WIN32_MODULE_PRODUCTVERSION_STRING=@MOZ_APP_VERSION@
|
||||
WIN32_MODULE_DESCRIPTION=@MOZ_APP_DISPLAYNAME@ Web Content
|
||||
WIN32_MODULE_DESCRIPTION=Plugin Container for @MOZ_APP_DISPLAYNAME@
|
||||
WIN32_MODULE_PRODUCTNAME=@MOZ_APP_DISPLAYNAME@
|
||||
WIN32_MODULE_NAME=@MOZ_APP_DISPLAYNAME@
|
||||
|
||||
@ -4,12 +4,128 @@
|
||||
# License, v. 2.0. If a copy of the MPL was not distributed with this
|
||||
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
|
||||
|
||||
include('app-common.mozbuild')
|
||||
# Any changes that affect Android need to be made in pie/moz.build as well.
|
||||
|
||||
if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'android':
|
||||
Program(CONFIG['MOZ_CHILD_PROCESS_NAME'])
|
||||
SOURCES += [
|
||||
'MozillaRuntimeMainAndroid.cpp',
|
||||
]
|
||||
|
||||
DIRS += ['pie']
|
||||
else:
|
||||
kwargs = {
|
||||
'linkage': None,
|
||||
}
|
||||
if CONFIG['MOZ_SANDBOX'] and CONFIG['OS_ARCH'] == 'WINNT' and not CONFIG['MOZ_ASAN']:
|
||||
kwargs['msvcrt'] = 'static'
|
||||
if not CONFIG['GNU_CC']:
|
||||
USE_LIBS += [
|
||||
'mozalloc_staticruntime',
|
||||
]
|
||||
GeckoProgram(CONFIG['MOZ_CHILD_PROCESS_NAME'], **kwargs)
|
||||
|
||||
if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'windows':
|
||||
DIRS += ['plugin-container']
|
||||
SOURCES += [
|
||||
'MozillaRuntimeMain.cpp',
|
||||
]
|
||||
USE_LIBS += [
|
||||
'nspr',
|
||||
'xul',
|
||||
]
|
||||
|
||||
include('/ipc/chromium/chromium-config.mozbuild')
|
||||
|
||||
LOCAL_INCLUDES += [
|
||||
'/toolkit/xre',
|
||||
'/xpcom/base',
|
||||
]
|
||||
|
||||
# We link GMPLoader into plugin-container on desktop so that its code is
|
||||
# covered by the desktop DRM vendor's voucher.
|
||||
if CONFIG['OS_TARGET'] != 'Android':
|
||||
SOURCES += [
|
||||
'../../dom/media/gmp/GMPLoader.cpp',
|
||||
]
|
||||
|
||||
if CONFIG['MOZ_SANDBOX'] and CONFIG['OS_ARCH'] == 'WINNT':
|
||||
# For sandbox includes and the include dependencies those have
|
||||
LOCAL_INCLUDES += [
|
||||
'/security/sandbox/chromium',
|
||||
'/security/sandbox/chromium-shim',
|
||||
]
|
||||
USE_LIBS += [
|
||||
'rlz',
|
||||
]
|
||||
|
||||
if CONFIG['MOZ_ASAN']:
|
||||
USE_LIBS += [
|
||||
'sandbox_s',
|
||||
]
|
||||
else:
|
||||
USE_LIBS += [
|
||||
'sandbox_staticruntime_s',
|
||||
]
|
||||
|
||||
DELAYLOAD_DLLS += [
|
||||
'nss3.dll',
|
||||
'xul.dll'
|
||||
]
|
||||
|
||||
DEFINES['HASH_NODE_ID_WITH_DEVICE_ID'] = 1;
|
||||
SOURCES += [
|
||||
'sha256.c',
|
||||
]
|
||||
|
||||
if CONFIG['MOZ_SANDBOX'] and CONFIG['OS_TARGET'] in ('Linux', 'Android'):
|
||||
USE_LIBS += [
|
||||
'mozsandbox',
|
||||
]
|
||||
|
||||
# gcc lto likes to put the top level asm in syscall.cc in a different partition
|
||||
# from the function using it which breaks the build. Work around that by
|
||||
# forcing there to be only one partition.
|
||||
if '-flto' in CONFIG['OS_CXXFLAGS'] and not CONFIG['CLANG_CXX']:
|
||||
LDFLAGS += ['--param lto-partitions=1']
|
||||
|
||||
if CONFIG['MOZ_SANDBOX'] and CONFIG['OS_TARGET'] == 'Darwin':
|
||||
# For sandbox includes and the include dependencies those have
|
||||
LOCAL_INCLUDES += [
|
||||
'/security/sandbox/chromium',
|
||||
'/security/sandbox/chromium-shim',
|
||||
]
|
||||
USE_LIBS += [
|
||||
'mozsandbox',
|
||||
'rlz',
|
||||
]
|
||||
|
||||
DEFINES['HASH_NODE_ID_WITH_DEVICE_ID'] = 1;
|
||||
SOURCES += [
|
||||
'sha256.c',
|
||||
]
|
||||
|
||||
if CONFIG['_MSC_VER']:
|
||||
# Always enter a Windows program through wmain, whether or not we're
|
||||
# a console application.
|
||||
WIN32_EXE_LDFLAGS += ['-ENTRY:wmainCRTStartup']
|
||||
|
||||
LDFLAGS += CONFIG['MOZ_ALLOW_HEAP_EXECUTE_FLAGS']
|
||||
|
||||
# Control the default heap size.
|
||||
# This is the heap returned by GetProcessHeap().
|
||||
# As we use the CRT heap, the default size is too large and wastes VM.
|
||||
#
|
||||
# The default heap size is 1MB on Win32.
|
||||
# The heap will grow if need be.
|
||||
#
|
||||
# Set it to 256k. See bug 127069.
|
||||
if CONFIG['OS_ARCH'] == 'WINNT' and not CONFIG['GNU_CC']:
|
||||
LDFLAGS += ['/HEAP:0x40000']
|
||||
|
||||
if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'gonk':
|
||||
OS_LIBS += [
|
||||
'binder',
|
||||
'utils',
|
||||
]
|
||||
|
||||
if CONFIG['GNU_CXX']:
|
||||
CXXFLAGS += ['-Wshadow']
|
||||
|
||||
@ -3,7 +3,7 @@
|
||||
<assemblyIdentity
|
||||
version="1.0.0.0"
|
||||
processorArchitecture="*"
|
||||
name="firefox-webcontent"
|
||||
name="plugin-container"
|
||||
type="win32"
|
||||
/>
|
||||
<description>Firefox Runtime</description>
|
||||
@ -1,29 +0,0 @@
|
||||
# This Source Code Form is subject to the terms of the Mozilla Public
|
||||
# License, v. 2.0. If a copy of the MPL was not distributed with this
|
||||
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
|
||||
|
||||
# This switches $(INSTALL) to copy mode, like $(SYSINSTALL), so things that
|
||||
# # shouldn't get 755 perms need $(IFLAGS1) for either way of calling nsinstall.
|
||||
NSDISTMODE = copy
|
||||
|
||||
include $(topsrcdir)/config/config.mk
|
||||
|
||||
include $(topsrcdir)/config/rules.mk
|
||||
|
||||
ifeq ($(OS_ARCH),WINNT) #{
|
||||
# Note the manifest file exists in the tree, so we use the explicit filename
|
||||
# here.
|
||||
EXTRA_DEPS += firefox-plugin-container.exe.manifest
|
||||
endif #}
|
||||
|
||||
ifeq (cocoa,$(MOZ_WIDGET_TOOLKIT)) #{
|
||||
|
||||
libs::
|
||||
$(NSINSTALL) -D $(DIST)/bin/$(PROGRAM).app
|
||||
rsync -a -C --exclude '*.in' $(srcdir)/macbuild/Contents $(DIST)/bin/$(MOZ_PLUGIN_PROCESS_NAME).app
|
||||
sed -e 's/%PROGRAM%/$(MOZ_PLUGIN_PROCESS_NAME)/' $(srcdir)/macbuild/Contents/Info.plist.in > $(DIST)/bin/$(MOZ_PLUGIN_PROCESS_NAME).app/Contents/Info.plist
|
||||
sed -e 's/%APP_NAME%/$(MOZ_APP_DISPLAYNAME)/' $(srcdir)/macbuild/Contents/Resources/English.lproj/InfoPlist.strings.in | \
|
||||
iconv -f UTF-8 -t UTF-16 > $(DIST)/bin/$(MOZ_PLUGIN_PROCESS_NAME).app/Contents/Resources/English.lproj/InfoPlist.strings
|
||||
$(NSINSTALL) -D $(DIST)/bin/$(MOZ_PLUGIN_PROCESS_NAME).app/Contents/MacOS
|
||||
$(NSINSTALL) $(DIST)/bin/$(MOZ_PLUGIN_PROCESS_NAME) $(DIST)/bin/$(MOZ_PLUGIN_PROCESS_NAME).app/Contents/MacOS
|
||||
endif #}
|
||||
@ -1,43 +0,0 @@
|
||||
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
|
||||
<assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0">
|
||||
<assemblyIdentity
|
||||
version="1.0.0.0"
|
||||
processorArchitecture="*"
|
||||
name="firefox-plugin-container"
|
||||
type="win32"
|
||||
/>
|
||||
<description>Firefox Runtime</description>
|
||||
<dependency>
|
||||
<dependentAssembly>
|
||||
<assemblyIdentity
|
||||
type="win32"
|
||||
name="Microsoft.Windows.Common-Controls"
|
||||
version="6.0.0.0"
|
||||
processorArchitecture="*"
|
||||
publicKeyToken="6595b64144ccf1df"
|
||||
language="*"
|
||||
/>
|
||||
</dependentAssembly>
|
||||
</dependency>
|
||||
<ms_asmv3:trustInfo xmlns:ms_asmv3="urn:schemas-microsoft-com:asm.v3">
|
||||
<ms_asmv3:security>
|
||||
<ms_asmv3:requestedPrivileges>
|
||||
<ms_asmv3:requestedExecutionLevel level="asInvoker" uiAccess="false" />
|
||||
</ms_asmv3:requestedPrivileges>
|
||||
</ms_asmv3:security>
|
||||
</ms_asmv3:trustInfo>
|
||||
<ms_asmv3:application xmlns:ms_asmv3="urn:schemas-microsoft-com:asm.v3">
|
||||
<ms_asmv3:windowsSettings xmlns="http://schemas.microsoft.com/SMI/2005/WindowsSettings">
|
||||
<dpiAware>True/PM</dpiAware>
|
||||
</ms_asmv3:windowsSettings>
|
||||
</ms_asmv3:application>
|
||||
<compatibility xmlns="urn:schemas-microsoft-com:compatibility.v1">
|
||||
<application>
|
||||
<supportedOS Id="{8e0f7a12-bfb3-4fe8-b9a5-48fd50a15a9a}"/>
|
||||
<supportedOS Id="{1f676c76-80e1-4239-95bb-83d0f6d0da78}"/>
|
||||
<supportedOS Id="{4a2f28e3-53b9-4441-ba9c-d69d4a4a6e38}"/>
|
||||
<supportedOS Id="{35138b9a-5d96-4fbd-8e2d-a2440225f93a}"/>
|
||||
<supportedOS Id="{e2011457-1546-43c5-a5fe-008deee3d3f0}"/>
|
||||
</application>
|
||||
</compatibility>
|
||||
</assembly>
|
||||
@ -1,6 +0,0 @@
|
||||
WIN32_MODULE_COMPANYNAME=Mozilla Corporation
|
||||
WIN32_MODULE_PRODUCTVERSION=@MOZ_APP_WINVERSION@
|
||||
WIN32_MODULE_PRODUCTVERSION_STRING=@MOZ_APP_VERSION@
|
||||
WIN32_MODULE_DESCRIPTION=Plugin Container for @MOZ_APP_DISPLAYNAME@
|
||||
WIN32_MODULE_PRODUCTNAME=@MOZ_APP_DISPLAYNAME@
|
||||
WIN32_MODULE_NAME=@MOZ_APP_DISPLAYNAME@
|
||||
@ -1,10 +0,0 @@
|
||||
# -*- Mode: python; c-basic-offset: 4; indent-tabs-mode: nil; tab-width: 40 -*-
|
||||
# vim: set filetype=python:
|
||||
# This Source Code Form is subject to the terms of the Mozilla Public
|
||||
# License, v. 2.0. If a copy of the MPL was not distributed with this
|
||||
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
|
||||
|
||||
include('../app-common.mozbuild')
|
||||
|
||||
GeckoProgram(CONFIG['MOZ_PLUGIN_PROCESS_NAME'], **kwargs)
|
||||
|
||||
@ -4,12 +4,12 @@
|
||||
# License, v. 2.0. If a copy of the MPL was not distributed with this
|
||||
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
|
||||
|
||||
Library('firefox-webcontent')
|
||||
Library('plugin-container')
|
||||
if CONFIG['MOZ_B2G_LOADER']:
|
||||
FINAL_LIBRARY = 'xul'
|
||||
|
||||
SOURCES += [
|
||||
'firefox-webcontent.cpp',
|
||||
'plugin-container.cpp',
|
||||
]
|
||||
|
||||
include('/ipc/chromium/chromium-config.mozbuild')
|
||||
|
||||
@ -155,7 +155,7 @@ GeckoChildProcessHost::GetPathToBinary(FilePath& exePath)
|
||||
getter_AddRefs(childProcPath));
|
||||
// We need to use an App Bundle on OS X so that we can hide
|
||||
// the dock icon. See Bug 557225.
|
||||
childProcPath->AppendNative(NS_LITERAL_CSTRING("firefox-webcontent.app"));
|
||||
childProcPath->AppendNative(NS_LITERAL_CSTRING("plugin-container.app"));
|
||||
childProcPath->AppendNative(NS_LITERAL_CSTRING("Contents"));
|
||||
childProcPath->AppendNative(NS_LITERAL_CSTRING("MacOS"));
|
||||
nsCString tempCPath;
|
||||
@ -186,13 +186,7 @@ GeckoChildProcessHost::GetPathToBinary(FilePath& exePath)
|
||||
|
||||
exePath = exePath.AppendASCII(processName);
|
||||
#else
|
||||
#ifdef OS_WIN
|
||||
if (XRE_GetProcessType() == GeckoProcessType_Plugin ||
|
||||
XRE_GetProcessType() == GeckoProcessType_GMPlugin) {
|
||||
exePath = exePath.AppendASCII(MOZ_PLUGIN_PROCESS_NAME);
|
||||
} else
|
||||
#endif
|
||||
exePath = exePath.AppendASCII(MOZ_CHILD_PROCESS_NAME);
|
||||
exePath = exePath.AppendASCII(MOZ_CHILD_PROCESS_NAME);
|
||||
#endif
|
||||
}
|
||||
|
||||
|
||||
@ -173,8 +173,7 @@ include('/ipc/chromium/chromium-config.mozbuild')
|
||||
FINAL_LIBRARY = 'xul'
|
||||
|
||||
for var in ('MOZ_CHILD_PROCESS_NAME', 'MOZ_CHILD_PROCESS_NAME_PIE',
|
||||
'MOZ_CHILD_PROCESS_BUNDLE', 'MOZ_PLUGIN_PROCESS_NAME',
|
||||
'DLL_PREFIX', 'DLL_SUFFIX'):
|
||||
'MOZ_CHILD_PROCESS_BUNDLE', 'DLL_PREFIX', 'DLL_SUFFIX'):
|
||||
DEFINES[var] = '"%s"' % CONFIG[var]
|
||||
|
||||
LOCAL_INCLUDES += [
|
||||
|
||||
@ -7090,14 +7090,13 @@ dnl ========================================================
|
||||
dnl = Child Process Name for IPC
|
||||
dnl ========================================================
|
||||
if test "$MOZ_WIDGET_TOOLKIT" != "android"; then
|
||||
MOZ_CHILD_PROCESS_NAME="firefox-webcontent${BIN_SUFFIX}"
|
||||
MOZ_PLUGIN_PROCESS_NAME="firefox-plugin-container${BIN_SUFFIX}"
|
||||
MOZ_CHILD_PROCESS_NAME="plugin-container${BIN_SUFFIX}"
|
||||
else
|
||||
# We want to let Android unpack the file at install time, but it only does
|
||||
# so if the file is named libsomething.so. The lib/ path is also required
|
||||
# because the unpacked file will be under the lib/ subdirectory and will
|
||||
# need to be executed from that path.
|
||||
MOZ_CHILD_PROCESS_NAME="libfirefox-webcontent.so"
|
||||
MOZ_CHILD_PROCESS_NAME="libplugin-container.so"
|
||||
MOZ_CHILD_PROCESS_NAME_PIE="libplugin-container-pie.so"
|
||||
AC_SUBST(MOZ_CHILD_PROCESS_NAME_PIE)
|
||||
fi
|
||||
@ -7105,7 +7104,6 @@ MOZ_CHILD_PROCESS_BUNDLE="plugin-container.app/Contents/MacOS/"
|
||||
|
||||
AC_SUBST(MOZ_CHILD_PROCESS_NAME)
|
||||
AC_SUBST(MOZ_CHILD_PROCESS_BUNDLE)
|
||||
AC_SUBST(MOZ_PLUGIN_PROCESS_NAME)
|
||||
|
||||
# The following variables are available to branding and application
|
||||
# configuration ($BRANDING/configure.sh and $APPLICATION/confvars.sh):
|
||||
|
||||
@ -212,7 +212,7 @@ class LinuxArtifactJob(ArtifactJob):
|
||||
'firefox/firefox',
|
||||
'firefox/firefox-bin',
|
||||
'firefox/platform.ini',
|
||||
'firefox/firefox-webcontent',
|
||||
'firefox/plugin-container',
|
||||
'firefox/updater',
|
||||
'firefox/**/*.so',
|
||||
mozpath.join('firefox', buildconfig.substs.get('ICU_DATA_FILE')),
|
||||
@ -293,7 +293,7 @@ class MacArtifactJob(ArtifactJob):
|
||||
# 'libreplace_jemalloc.dylib',
|
||||
# 'libreplace_malloc.dylib',
|
||||
'libsoftokn3.dylib',
|
||||
'firefox-webcontent.app/Contents/MacOS/firefox-webcontent',
|
||||
'plugin-container.app/Contents/MacOS/plugin-container',
|
||||
'updater.app/Contents/MacOS/updater',
|
||||
# 'xpcshell',
|
||||
'XUL',
|
||||
|
||||
@ -84,11 +84,9 @@ _PDH_FMT_LONG = 0x00000100
|
||||
class WinCounterManager(CounterManager):
|
||||
|
||||
def __init__(self, process_name, process, counters,
|
||||
childProcess="firefox-webcontent",
|
||||
pluginProcess="firefox-plugin-container"):
|
||||
childProcess="plugin-container"):
|
||||
CounterManager.__init__(self)
|
||||
self.childProcess = childProcess
|
||||
self.pluginProcess = pluginProcess
|
||||
self.registeredCounters = {}
|
||||
self.registerCounters(counters)
|
||||
# PDH might need to be "refreshed" if it has been queried while the
|
||||
@ -181,8 +179,6 @@ class WinCounterManager(CounterManager):
|
||||
pdh.PdhEnumObjectsA(None, None, 0, 1, 0, True)
|
||||
|
||||
expandedPaths = _getExpandedCounterPaths(self.childProcess, counter)
|
||||
expandedPaths.append(_getExpandedCounterPaths(self.pluginProcess,
|
||||
counter))
|
||||
if not expandedPaths:
|
||||
return
|
||||
for expandedPath in expandedPaths:
|
||||
|
||||
@ -414,7 +414,7 @@ def get_browser_config(config):
|
||||
'extra_args', 'buildid', 'env', 'init_url', 'webserver')
|
||||
optional = {'bcontroller_config': '${talos}/bcontroller.json',
|
||||
'branch_name': '',
|
||||
'child_process': 'firefox-webcontent',
|
||||
'child_process': 'plugin-container',
|
||||
'develop': False,
|
||||
'e10s': False,
|
||||
'process': '',
|
||||
|
||||
@ -7,7 +7,7 @@ import json
|
||||
#globals
|
||||
ffox_path = 'test/path/to/firefox'
|
||||
command_args = [ffox_path, '-profile', 'pathtoprofile', '-tp', 'pathtotpmanifest', '-tpchrome', '-tpmozafterpaint', '-tpnoisy', '-rss', '-tpcycles', '1', '-tppagecycles', '1']
|
||||
browser_config = {'deviceroot': '', 'dirs': {}, 'test_name_extension': '_paint', 'repository': 'http://hg.mozilla.org/releases/mozilla-release', 'buildid': '20131205075310', 'results_log': 'pathtoresults_log', 'symbols_path': None, 'bcontroller_config': 'pathtobcontroller', 'host': '', 'browser_name': 'Firefox', 'sourcestamp': '39faf812aaec', 'remote': False, 'child_process': 'firefox-webcontent', 'branch_name': '', 'browser_version': '26.0', 'extra_args': '', 'develop': True, 'preferences': {'browser.display.overlaynavbuttons': False, 'extensions.getAddons.get.url': 'http://127.0.0.1/extensions-dummy/repositoryGetURL', 'dom.max_chrome_script_run_time': 0, 'network.proxy.type': 1, 'extensions.update.background.url': 'http://127.0.0.1/extensions-dummy/updateBackgroundURL', 'network.proxy.http': 'localhost', 'plugins.update.url': 'http://127.0.0.1/plugins-dummy/updateCheckURL', 'dom.max_script_run_time': 0, 'extensions.update.enabled': False, 'browser.safebrowsing.keyURL': 'http://127.0.0.1/safebrowsing-dummy/newkey', 'media.navigator.permission.disabled': True, 'app.update.enabled': False, 'extensions.blocklist.url': 'http://127.0.0.1/extensions-dummy/blocklistURL', 'browser.EULA.override': True, 'extensions.checkCompatibility': False, 'talos.logfile': 'pathtofile', 'browser.safebrowsing.gethashURL': 'http://127.0.0.1/safebrowsing-dummy/gethash', 'extensions.hotfix.url': 'http://127.0.0.1/extensions-dummy/hotfixURL', 'dom.disable_window_move_resize': True, 'network.proxy.http_port': 80, 'browser.dom.window.dump.enabled': True, 'extensions.update.url': 'http://127.0.0.1/extensions-dummy/updateURL', 'browser.chrome.dynamictoolbar': False, 'browser.link.open_newwindow': 2, 'extensions.getAddons.search.url': 'http://127.0.0.1/extensions-dummy/repositorySearchURL', 'browser.cache.disk.smart_size.first_run': False, 'security.turn_off_all_security_so_that_viruses_can_take_over_this_computer': True, 'dom.disable_open_during_load': False, 'extensions.getAddons.search.browseURL': 'http://127.0.0.1/extensions-dummy/repositoryBrowseURL', 'browser.cache.disk.smart_size.enabled': False, 'extensions.getAddons.getWithPerformance.url': 'http://127.0.0.1/extensions-dummy/repositoryGetWithPerformanceURL', 'hangmonitor.timeout': 0, 'extensions.getAddons.maxResults': 0, 'dom.send_after_paint_to_content': True, 'security.fileuri.strict_origin_policy': False, 'media.capturestream_hints.enabled': True, 'extensions.update.notifyUser': False, 'extensions.blocklist.enabled': False, 'browser.bookmarks.max_backups': 0, 'browser.shell.checkDefaultBrowser': False, 'media.peerconnection.enabled': True, 'dom.disable_window_flip': True, 'security.enable_java': False, 'browser.warnOnQuit': False, 'media.navigator.enabled': True, 'browser.safebrowsing.updateURL': 'http://127.0.0.1/safebrowsing-dummy/update', 'dom.allow_scripts_to_close_windows': True, 'extensions.webservice.discoverURL': 'http://127.0.0.1/extensions-dummy/discoveryURL'}, 'test_timeout': 1200, 'title': 'qm-pxp01', 'error_filename': 'pathtoerrorfile', 'webserver': 'localhost:15707', 'browser_path':ffox_path, 'port': 20701, 'browser_log': 'browser_output.txt', 'process': 'firefox.exe', 'xperf_path': 'C:/Program Files/Microsoft Windows Performance Toolkit/xperf.exe', 'extensions': ['pathtopageloader'], 'fennecIDs': '', 'env': {'NO_EM_RESTART': '1'}, 'init_url': 'http://localhost:15707/getInfo.html', 'browser_wait': 5}
|
||||
browser_config = {'deviceroot': '', 'dirs': {}, 'test_name_extension': '_paint', 'repository': 'http://hg.mozilla.org/releases/mozilla-release', 'buildid': '20131205075310', 'results_log': 'pathtoresults_log', 'symbols_path': None, 'bcontroller_config': 'pathtobcontroller', 'host': '', 'browser_name': 'Firefox', 'sourcestamp': '39faf812aaec', 'remote': False, 'child_process': 'plugin-container', 'branch_name': '', 'browser_version': '26.0', 'extra_args': '', 'develop': True, 'preferences': {'browser.display.overlaynavbuttons': False, 'extensions.getAddons.get.url': 'http://127.0.0.1/extensions-dummy/repositoryGetURL', 'dom.max_chrome_script_run_time': 0, 'network.proxy.type': 1, 'extensions.update.background.url': 'http://127.0.0.1/extensions-dummy/updateBackgroundURL', 'network.proxy.http': 'localhost', 'plugins.update.url': 'http://127.0.0.1/plugins-dummy/updateCheckURL', 'dom.max_script_run_time': 0, 'extensions.update.enabled': False, 'browser.safebrowsing.keyURL': 'http://127.0.0.1/safebrowsing-dummy/newkey', 'media.navigator.permission.disabled': True, 'app.update.enabled': False, 'extensions.blocklist.url': 'http://127.0.0.1/extensions-dummy/blocklistURL', 'browser.EULA.override': True, 'extensions.checkCompatibility': False, 'talos.logfile': 'pathtofile', 'browser.safebrowsing.gethashURL': 'http://127.0.0.1/safebrowsing-dummy/gethash', 'extensions.hotfix.url': 'http://127.0.0.1/extensions-dummy/hotfixURL', 'dom.disable_window_move_resize': True, 'network.proxy.http_port': 80, 'browser.dom.window.dump.enabled': True, 'extensions.update.url': 'http://127.0.0.1/extensions-dummy/updateURL', 'browser.chrome.dynamictoolbar': False, 'browser.link.open_newwindow': 2, 'extensions.getAddons.search.url': 'http://127.0.0.1/extensions-dummy/repositorySearchURL', 'browser.cache.disk.smart_size.first_run': False, 'security.turn_off_all_security_so_that_viruses_can_take_over_this_computer': True, 'dom.disable_open_during_load': False, 'extensions.getAddons.search.browseURL': 'http://127.0.0.1/extensions-dummy/repositoryBrowseURL', 'browser.cache.disk.smart_size.enabled': False, 'extensions.getAddons.getWithPerformance.url': 'http://127.0.0.1/extensions-dummy/repositoryGetWithPerformanceURL', 'hangmonitor.timeout': 0, 'extensions.getAddons.maxResults': 0, 'dom.send_after_paint_to_content': True, 'security.fileuri.strict_origin_policy': False, 'media.capturestream_hints.enabled': True, 'extensions.update.notifyUser': False, 'extensions.blocklist.enabled': False, 'browser.bookmarks.max_backups': 0, 'browser.shell.checkDefaultBrowser': False, 'media.peerconnection.enabled': True, 'dom.disable_window_flip': True, 'security.enable_java': False, 'browser.warnOnQuit': False, 'media.navigator.enabled': True, 'browser.safebrowsing.updateURL': 'http://127.0.0.1/safebrowsing-dummy/update', 'dom.allow_scripts_to_close_windows': True, 'extensions.webservice.discoverURL': 'http://127.0.0.1/extensions-dummy/discoveryURL'}, 'test_timeout': 1200, 'title': 'qm-pxp01', 'error_filename': 'pathtoerrorfile', 'webserver': 'localhost:15707', 'browser_path':ffox_path, 'port': 20701, 'browser_log': 'browser_output.txt', 'process': 'firefox.exe', 'xperf_path': 'C:/Program Files/Microsoft Windows Performance Toolkit/xperf.exe', 'extensions': ['pathtopageloader'], 'fennecIDs': '', 'env': {'NO_EM_RESTART': '1'}, 'init_url': 'http://localhost:15707/getInfo.html', 'browser_wait': 5}
|
||||
test_config = {'remote_counters': [], 'filters': [['ignore_first', [5]], ['median', []]], 'xperf_user_providers': ['Mozilla Generic Provider', 'Microsoft-Windows-TCPIP'], 'tpcycles': 1, 'browser_log': 'browser_output.txt', 'shutdown': False, 'fennecIDs': False, 'responsiveness': False, 'tpmozafterpaint': True, 'cleanup': 'pathtofile', 'tprender': False, 'xperf_counters': ['main_startup_fileio', 'main_startup_netio', 'main_normal_fileio', 'main_normal_netio', 'nonmain_startup_fileio', 'nonmain_normal_fileio', 'nonmain_normal_netio', 'mainthread_readcount', 'mainthread_readbytes', 'mainthread_writecount', 'mainthread_writebytes'], 'mac_counters': [], 'tpnoisy': True, 'tppagecycles': 1, 'tploadaboutblank': False, 'xperf_providers': ['PROC_THREAD', 'LOADER', 'HARD_FAULTS', 'FILENAME', 'FILE_IO', 'FILE_IO_INIT'], 'rss': True, 'profile_path': 'path', 'name': 'tp5n', 'url': '-tp pathtotp5n.manifest -tpchrome -tpmozafterpaint -tpnoisy -rss -tpcycles 1 -tppagecycles 1', 'setup': 'pathtosetup', 'linux_counters': [], 'tpmanifest': 'pathtotp5n.manifest', 'w7_counters': [], 'timeout': 1800, 'xperf_stackwalk': ['FileCreate', 'FileRead', 'FileWrite', 'FileFlush', 'FileClose'], 'win_counters': [], 'cycles': 1, 'resolution': 20, 'tpchrome': True}
|
||||
|
||||
|
||||
@ -50,7 +50,7 @@ class TalosConfigUnitTest(unittest.TestCase):
|
||||
yaml = YAML()
|
||||
content = yaml.read(browser_config['bcontroller_config'])
|
||||
self.validate(content['command'],"test/path/to/firefox -profile pathtoprofile -tp pathtotpmanifest -tpchrome -tpmozafterpaint -tpnoisy -rss -tpcycles 1 -tppagecycles 1")
|
||||
self.validate(content['child_process'],"firefox-webcontent")
|
||||
self.validate(content['child_process'],"plugin-container")
|
||||
self.validate(content['process'],"firefox.exe")
|
||||
self.validate(content['browser_wait'],5)
|
||||
self.validate(content['test_timeout'],1200)
|
||||
|
||||
@ -6,9 +6,9 @@ include $(MOZILLA_DIR)/toolkit/mozapps/installer/signing.mk
|
||||
|
||||
ifdef MOZ_SIGN_CMD
|
||||
ifeq ($(OS_ARCH),WINNT)
|
||||
# The argument to this macro is the directory where firefox-plugin-container.exe
|
||||
# The argument to this macro is the directory where plugin-container.exe
|
||||
# exists, and where voucher.bin will be generated.
|
||||
MAKE_SIGN_EME_VOUCHER = $(PYTHON) $(MOZILLA_DIR)/python/eme/gen-eme-voucher.py -input $(1)/firefox-plugin-container.exe -output $(1)/voucher.bin && \
|
||||
MAKE_SIGN_EME_VOUCHER = $(PYTHON) $(MOZILLA_DIR)/python/eme/gen-eme-voucher.py -input $(1)/plugin-container.exe -output $(1)/voucher.bin && \
|
||||
$(MOZ_SIGN_CMD) -f emevoucher "$(1)/voucher.bin"
|
||||
endif
|
||||
endif
|
||||
|
||||
@ -77,7 +77,7 @@ class MachCommands(MachCommandBase):
|
||||
#
|
||||
# org.mozilla.firefox
|
||||
# firefox
|
||||
# firefox-webcontent
|
||||
# plugin-container
|
||||
#
|
||||
# When Safari runs from the dock:
|
||||
#
|
||||
@ -102,7 +102,7 @@ class MachCommands(MachCommandBase):
|
||||
#
|
||||
# com.apple.Terminal
|
||||
# firefox
|
||||
# firefox-webcontent
|
||||
# plugin-container
|
||||
# <and possibly other, non-browser processes>
|
||||
#
|
||||
# Also, the WindowServer and kernel coalitions and processes are often
|
||||
@ -120,7 +120,7 @@ class MachCommands(MachCommandBase):
|
||||
#
|
||||
# - '^Name' is for the columns headings line.
|
||||
#
|
||||
# - 'firefox' and 'firefox-webcontent' are for Firefox
|
||||
# - 'firefox' and 'plugin-container' are for Firefox
|
||||
#
|
||||
# - 'Safari\b' and 'WebKit' are for Safari. The '\b' excludes
|
||||
# SafariCloudHistoryPush, which is a process that always
|
||||
@ -136,7 +136,7 @@ class MachCommands(MachCommandBase):
|
||||
#
|
||||
# - 'kernel' is for the kernel.
|
||||
#
|
||||
if re.search(r'(^Name|firefox|firefox-plugin-container|firefox-webcontent|Safari\b|WebKit|Chrome|Terminal|WindowServer|kernel)', line):
|
||||
if re.search(r'(^Name|firefox|plugin-container|Safari\b|WebKit|Chrome|Terminal|WindowServer|kernel)', line):
|
||||
print(line)
|
||||
|
||||
return 0
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user