Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-06-06 16:45:39 +00:00
Code Issues Projects Releases Packages Wiki Activity

Revert "Enable multiprocess and sandbox"

Browse source 
This reverts commit 663f8530cf.
This commit is contained in:
Paul Rouget 2016-08-15 03:44:46 +02:00
parent 27472ffa59
commit c40a658e9c
2 changed files with 2 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

4
python/servo/package_commands.py
View file

@ -177,7 +177,7 @@ class PackageCommands(CommandBase):
print("Writing run-servo") print("Writing run-servo")
bhtml_path = path.join('${0%/*}/../Resources', browserhtml_path.split('/')[-1], 'out', 'index.html') bhtml_path = path.join('${0%/*}/../Resources', browserhtml_path.split('/')[-1], 'out', 'index.html')
runservo = os.open(dir_to_app + '/Contents/MacOS/run-servo', os.O_WRONLY | os.O_CREAT, int("0755", 8)) runservo = os.open(dir_to_app + '/Contents/MacOS/run-servo', os.O_WRONLY | os.O_CREAT, int("0755", 8))
os.write(runservo, '#!/bin/bash\nexec ${0%/*}/servo -M -S ' + bhtml_path) os.write(runservo, '#!/bin/bash\nexec ${0%/*}/servo ' + bhtml_path)
os.close(runservo) os.close(runservo)
print("Creating dmg") print("Creating dmg")
@ -278,7 +278,7 @@ class PackageCommands(CommandBase):
delete(dir_to_package + '/build/' + f) delete(dir_to_package + '/build/' + f)
print("Writing runservo.sh") print("Writing runservo.sh")
# TODO: deduplicate this arg list from post_build_commands # TODO: deduplicate this arg list from post_build_commands
servo_args = ['-w', '-b', '-M', '-S', servo_args = ['-w', '-b',
'--pref', 'dom.mozbrowser.enabled', '--pref', 'dom.mozbrowser.enabled',
'--pref', 'dom.forcetouch.enabled', '--pref', 'dom.forcetouch.enabled',
'--pref', 'shell.builtin-key-shortcuts.enabled=false', '--pref', 'shell.builtin-key-shortcuts.enabled=false',

4
python/servo/post_build_commands.py
View file

@ -111,10 +111,6 @@ class PostBuildCommands(CommandBase):
# Convert to a relative path to avoid mingw -> Windows path conversions # Convert to a relative path to avoid mingw -> Windows path conversions
browserhtml_path = path.relpath(browserhtml_path, os.getcwd()) browserhtml_path = path.relpath(browserhtml_path, os.getcwd())
if not is_windows():
# multiprocess + sandbox
args = args + ['-M', '-S']
args = args + ['-w', args = args + ['-w',
'--pref', 'dom.mozbrowser.enabled', '--pref', 'dom.mozbrowser.enabled',
'--pref', 'dom.forcetouch.enabled', '--pref', 'dom.forcetouch.enabled',