diff options
| author | bors-servo <lbergstrom+bors@mozilla.com> | 2016-08-14 21:25:20 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-08-14 21:25:20 -0500 |
| commit | a617ea353a059486a117e1c04a60e3d13fc5f9cc (patch) | |
| tree | a4c999d6ce71422892b197ac071a36a934a4fa54 | |
| parent | 27472ffa5950efb8fd895460b13f83f5ce712f10 (diff) | |
| parent | c40a658e9c2d23af4ac6ab70eb64b9ebca8eff3d (diff) | |
| download | servo-a617ea353a059486a117e1c04a60e3d13fc5f9cc.tar.gz servo-a617ea353a059486a117e1c04a60e3d13fc5f9cc.zip | |
Auto merge of #12867 - paulrouget:noMS, r=emilio
Revert "Enable multiprocess and sandbox"
Multiprocess and sandboxing still have some issues:
* https://github.com/servo/servo/issues/12791
* https://github.com/servo/servo/issues/12807
Let's disable these features for now and reenable them later: https://github.com/servo/servo/issues/12868.
<!-- Reviewable:start -->
---
This change is [<img src="https://reviewable.io/review_button.svg" height="34" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/servo/servo/12867)
<!-- Reviewable:end -->
| -rw-r--r-- | python/servo/package_commands.py | 4 | ||||
| -rw-r--r-- | python/servo/post_build_commands.py | 4 |
2 files changed, 2 insertions, 6 deletions
diff --git a/python/servo/package_commands.py b/python/servo/package_commands.py index c5f55264ad1..314d1ceaf34 100644 --- a/python/servo/package_commands.py +++ b/python/servo/package_commands.py @@ -177,7 +177,7 @@ class PackageCommands(CommandBase): 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") @@ -278,7 +278,7 @@ class PackageCommands(CommandBase): 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', diff --git a/python/servo/post_build_commands.py b/python/servo/post_build_commands.py index 0ce67a972cf..733ec665cd6 100644 --- a/python/servo/post_build_commands.py +++ b/python/servo/post_build_commands.py @@ -111,10 +111,6 @@ class PostBuildCommands(CommandBase): # 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', |