Skip to content

Commit

Permalink
Revert "Enable multiprocess and sandbox"
Browse files Browse the repository at this point in the history
This reverts commit 663f853.
  • Loading branch information
paulrouget committed Aug 15, 2016
1 parent 27472ff commit c40a658
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 6 deletions.
4 changes: 2 additions & 2 deletions python/servo/package_commands.py
Expand Up @@ -177,7 +177,7 @@ def package(self, release=False, dev=False, android=None, debug=False, debugger=
print("Writing run-servo")
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))
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)

print("Creating dmg")
Expand Down Expand Up @@ -278,7 +278,7 @@ def package(self, release=False, dev=False, android=None, debug=False, debugger=
delete(dir_to_package + '/build/' + f)
print("Writing runservo.sh")
# 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.forcetouch.enabled',
'--pref', 'shell.builtin-key-shortcuts.enabled=false',
Expand Down
4 changes: 0 additions & 4 deletions python/servo/post_build_commands.py
Expand Up @@ -111,10 +111,6 @@ def run(self, params, release=False, dev=False, android=None, debug=False, debug
# Convert to a relative path to avoid mingw -> Windows path conversions
browserhtml_path = path.relpath(browserhtml_path, os.getcwd())

if not is_windows():
# multiprocess + sandbox
args = args + ['-M', '-S']

args = args + ['-w',
'--pref', 'dom.mozbrowser.enabled',
'--pref', 'dom.forcetouch.enabled',
Expand Down

0 comments on commit c40a658

Please sign in to comment.