servo: Merge #11332 - browserhtml update (from paulrouget:bhtmlUpdate); r=Manishearth
authorPaul Rouget <me@paulrouget.com>
Sun, 22 May 2016 21:28:17 -0700
changeset 338873 b5e22f4ac5c02abb3bd3ea949dde2234aa8fd8c5
parent 338872 ad6fc368d3b7170867d88b2f8dc81c81ed8197fd
child 338874 59cfdf62fdbc6984b2849555f2d10f76c5e088d2
push id31307
push usergszorc@mozilla.com
push dateSat, 04 Feb 2017 00:59:06 +0000
treeherdermozilla-central@94079d43835f [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersManishearth
servo: Merge #11332 - browserhtml update (from paulrouget:bhtmlUpdate); r=Manishearth - [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 Source-Repo: https://github.com/servo/servo Source-Revision: aa9fc4e0549c54fafef358a50f32f520c9014ba6
servo/components/servo/Cargo.lock
servo/ports/cef/Cargo.lock
servo/ports/gonk/Cargo.lock
servo/python/servo/post_build_commands.py
--- a/servo/components/servo/Cargo.lock
+++ b/servo/components/servo/Cargo.lock
@@ -1,14 +1,14 @@
 [root]
 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",
  "compositing 0.0.1",
  "constellation 0.0.1",
  "devtools 0.0.1",
  "devtools_traits 0.0.1",
  "env_logger 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -169,18 +169,18 @@ dependencies = [
 
 [[package]]
 name = "brotli"
 version = "0.3.23"
 source = "git+https://github.com/ende76/brotli-rs#d8507fd07e9fa57ed8251d5dc500dcd62df62c7c"
 
 [[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"
 version = "0.5.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 
 [[package]]
 name = "canvas"
--- a/servo/ports/cef/Cargo.lock
+++ b/servo/ports/cef/Cargo.lock
@@ -146,18 +146,18 @@ dependencies = [
 
 [[package]]
 name = "brotli"
 version = "0.3.23"
 source = "git+https://github.com/ende76/brotli-rs#d8507fd07e9fa57ed8251d5dc500dcd62df62c7c"
 
 [[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"
 version = "0.5.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 
 [[package]]
 name = "canvas"
@@ -1840,17 +1840,17 @@ dependencies = [
  "serde_codegen 0.7.5 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
 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",
  "constellation 0.0.1",
  "devtools 0.0.1",
  "devtools_traits 0.0.1",
  "env_logger 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)",
  "euclid 0.6.6 (registry+https://github.com/rust-lang/crates.io-index)",
--- a/servo/ports/gonk/Cargo.lock
+++ b/servo/ports/gonk/Cargo.lock
@@ -148,18 +148,18 @@ dependencies = [
 
 [[package]]
 name = "brotli"
 version = "0.3.23"
 source = "git+https://github.com/ende76/brotli-rs#d8507fd07e9fa57ed8251d5dc500dcd62df62c7c"
 
 [[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"
 version = "0.5.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 
 [[package]]
 name = "canvas"
@@ -1828,17 +1828,17 @@ dependencies = [
  "serde_codegen 0.7.5 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
 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",
  "constellation 0.0.1",
  "devtools 0.0.1",
  "devtools_traits 0.0.1",
  "env_logger 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)",
  "euclid 0.6.6 (registry+https://github.com/rust-lang/crates.io-index)",
--- a/servo/python/servo/post_build_commands.py
+++ b/servo/python/servo/post_build_commands.py
@@ -126,17 +126,20 @@ class PostBuildCommands(CommandBase):
             # Prepend the debugger args.
             args = ([command] + self.debuggerInfo.args +
                     args + params)
         elif browserhtml:
             browserhtml_path = find_dep_path_newest('browserhtml', args[0])
             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:
             args = args + params
 
         try:
             check_call(args, env=env)
         except subprocess.CalledProcessError as e: