aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorbors-servo <lbergstrom+bors@mozilla.com>2016-05-22 21:28:17 -0700
committerbors-servo <lbergstrom+bors@mozilla.com>2016-05-22 21:28:17 -0700
commitaa9fc4e0549c54fafef358a50f32f520c9014ba6 (patch)
treea51a0e17b676eee4a34fc7c6f8b2938a932c0a3e
parent6b039612bac3159a51d09e341c18f9a6ccc948b1 (diff)
parent3a05f387a0d71ab733ef601d791686077ec2f868 (diff)
downloadservo-aa9fc4e0549c54fafef358a50f32f520c9014ba6.tar.gz
servo-aa9fc4e0549c54fafef358a50f32f520c9014ba6.zip
Auto merge of #11332 - paulrouget:bhtmlUpdate, r=Manishearth
browserhtml update - [x] `./mach build -d` does not report any errors - [x] `./mach test-tidy --faster` does not report any errors - [ ] These changes fix #__ (github issue number if applicable). Either: - [ ] There are tests for these changes OR - [x] These changes do not require tests because it's a package update <!-- Reviewable:start --> --- This change is [<img src="https://reviewable.io/review_button.svg" height="35" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/servo/servo/11332) <!-- Reviewable:end -->
-rw-r--r--components/servo/Cargo.lock6
-rw-r--r--ports/cef/Cargo.lock6
-rw-r--r--ports/gonk/Cargo.lock6
-rw-r--r--python/servo/post_build_commands.py5
4 files changed, 13 insertions, 10 deletions
diff --git a/components/servo/Cargo.lock b/components/servo/Cargo.lock
index b28a91bc5bd..1ca99477ab0 100644
--- a/components/servo/Cargo.lock
+++ b/components/servo/Cargo.lock
@@ -3,7 +3,7 @@ name = "servo"
version = "0.0.1"
dependencies = [
"android_glue 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)",
- "browserhtml 0.1.5 (git+https://github.com/browserhtml/browserhtml?branch=gh-pages)",
+ "browserhtml 0.1.7 (git+https://github.com/browserhtml/browserhtml?branch=gh-pages)",
"canvas 0.0.1",
"canvas_traits 0.0.1",
"compiletest_helper 0.0.1",
@@ -174,8 +174,8 @@ source = "git+https://github.com/ende76/brotli-rs#d8507fd07e9fa57ed8251d5dc500dc
[[package]]
name = "browserhtml"
-version = "0.1.5"
-source = "git+https://github.com/browserhtml/browserhtml?branch=gh-pages#146e7909211792ac6d955d87339c547aeb517136"
+version = "0.1.7"
+source = "git+https://github.com/browserhtml/browserhtml?branch=gh-pages#73ecaf4b8048f10ce131d0b9b341c3146a880d74"
[[package]]
name = "byteorder"
diff --git a/ports/cef/Cargo.lock b/ports/cef/Cargo.lock
index 9c09790d9fb..cd25b630fa9 100644
--- a/ports/cef/Cargo.lock
+++ b/ports/cef/Cargo.lock
@@ -151,8 +151,8 @@ source = "git+https://github.com/ende76/brotli-rs#d8507fd07e9fa57ed8251d5dc500dc
[[package]]
name = "browserhtml"
-version = "0.1.5"
-source = "git+https://github.com/browserhtml/browserhtml?branch=gh-pages#146e7909211792ac6d955d87339c547aeb517136"
+version = "0.1.7"
+source = "git+https://github.com/browserhtml/browserhtml?branch=gh-pages#73ecaf4b8048f10ce131d0b9b341c3146a880d74"
[[package]]
name = "byteorder"
@@ -1845,7 +1845,7 @@ name = "servo"
version = "0.0.1"
dependencies = [
"android_glue 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)",
- "browserhtml 0.1.5 (git+https://github.com/browserhtml/browserhtml?branch=gh-pages)",
+ "browserhtml 0.1.7 (git+https://github.com/browserhtml/browserhtml?branch=gh-pages)",
"canvas 0.0.1",
"canvas_traits 0.0.1",
"compositing 0.0.1",
diff --git a/ports/gonk/Cargo.lock b/ports/gonk/Cargo.lock
index b009e644b0e..f164d583a34 100644
--- a/ports/gonk/Cargo.lock
+++ b/ports/gonk/Cargo.lock
@@ -153,8 +153,8 @@ source = "git+https://github.com/ende76/brotli-rs#d8507fd07e9fa57ed8251d5dc500dc
[[package]]
name = "browserhtml"
-version = "0.1.5"
-source = "git+https://github.com/browserhtml/browserhtml?branch=gh-pages#146e7909211792ac6d955d87339c547aeb517136"
+version = "0.1.7"
+source = "git+https://github.com/browserhtml/browserhtml?branch=gh-pages#73ecaf4b8048f10ce131d0b9b341c3146a880d74"
[[package]]
name = "byteorder"
@@ -1833,7 +1833,7 @@ name = "servo"
version = "0.0.1"
dependencies = [
"android_glue 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)",
- "browserhtml 0.1.5 (git+https://github.com/browserhtml/browserhtml?branch=gh-pages)",
+ "browserhtml 0.1.7 (git+https://github.com/browserhtml/browserhtml?branch=gh-pages)",
"canvas 0.0.1",
"canvas_traits 0.0.1",
"compositing 0.0.1",
diff --git a/python/servo/post_build_commands.py b/python/servo/post_build_commands.py
index 3170e07437a..693fbfdde0c 100644
--- a/python/servo/post_build_commands.py
+++ b/python/servo/post_build_commands.py
@@ -131,7 +131,10 @@ class PostBuildCommands(CommandBase):
if browserhtml_path is None:
print("Could not find browserhtml package; perhaps you haven't built Servo.")
return 1
- args = args + ['-w', '-b', '--pref', 'dom.mozbrowser.enabled',
+ args = args + ['-w', '-b',
+ '--pref', 'dom.mozbrowser.enabled',
+ '--pref', 'dom.forcetouch.enabled',
+ '--pref', 'shell.quit-on-escape.enabled=false',
path.join(browserhtml_path, 'out', 'index.html')]
args = args + params
else: