servo: Merge #12731 - Browserhtml update (from paulrouget:bhtmlupdate); r=nox
authorPaul Rouget <me@paulrouget.com>
Thu, 04 Aug 2016 05:33:40 -0500
changeset 339436 675ca88795a7211bed660a64a7ecd90a03b74477
parent 339435 dbf44fe0ed8b6f8805c713317d8b43131ef304bd
child 339437 dc8ec0241b68a75eeffe8eeddff41e44795ba46f
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)
reviewersnox
servo: Merge #12731 - Browserhtml update (from paulrouget:bhtmlupdate); r=nox We also changed the branch name. Fix #12012 Source-Repo: https://github.com/servo/servo Source-Revision: 41cb4f4c77e8873a291218284db41118da43f708
servo/components/servo/Cargo.lock
servo/components/servo/Cargo.toml
servo/ports/cef/Cargo.lock
--- a/servo/components/servo/Cargo.lock
+++ b/servo/components/servo/Cargo.lock
@@ -1,15 +1,15 @@
 [root]
 name = "servo"
 version = "0.0.1"
 dependencies = [
  "android_glue 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)",
  "backtrace 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)",
- "browserhtml 0.1.15 (git+https://github.com/browserhtml/browserhtml?branch=gh-pages)",
+ "browserhtml 0.1.15 (git+https://github.com/browserhtml/browserhtml?branch=crate)",
  "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.4 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -188,17 +188,17 @@ version = "1.0.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
  "alloc-no-stdlib 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
 name = "browserhtml"
 version = "0.1.15"
-source = "git+https://github.com/browserhtml/browserhtml?branch=gh-pages#48eed1856f8bf49ccf3f60e25d871e1654d67f22"
+source = "git+https://github.com/browserhtml/browserhtml?branch=crate#702f464d198481476363693315085d37b8e305b7"
 
 [[package]]
 name = "byteorder"
 version = "0.5.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 
 [[package]]
 name = "canvas"
--- a/servo/components/servo/Cargo.toml
+++ b/servo/components/servo/Cargo.toml
@@ -39,17 +39,17 @@ net_tests = {path = "../../tests/unit/ne
 net_traits_tests = {path = "../../tests/unit/net_traits"}
 plugin_compiletest = {path = "../../tests/compiletest/plugin"}
 profile_tests = {path = "../../tests/unit/profile"}
 script_tests = {path = "../../tests/unit/script"}
 style_tests = {path = "../../tests/unit/style"}
 util_tests = {path = "../../tests/unit/util"}
 
 [dependencies]
-browserhtml = {git = "https://github.com/browserhtml/browserhtml", branch = "gh-pages"}
+browserhtml = {git = "https://github.com/browserhtml/browserhtml", branch = "crate"}
 canvas = {path = "../canvas"}
 canvas_traits = {path = "../canvas_traits"}
 compositing = {path = "../compositing"}
 constellation = {path = "../constellation"}
 devtools = {path = "../devtools"}
 devtools_traits = {path = "../devtools_traits"}
 env_logger = "0.3"
 euclid = "0.7.1"
--- a/servo/ports/cef/Cargo.lock
+++ b/servo/ports/cef/Cargo.lock
@@ -162,17 +162,17 @@ version = "1.0.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
  "alloc-no-stdlib 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
 name = "browserhtml"
 version = "0.1.15"
-source = "git+https://github.com/browserhtml/browserhtml?branch=gh-pages#48eed1856f8bf49ccf3f60e25d871e1654d67f22"
+source = "git+https://github.com/browserhtml/browserhtml?branch=crate#702f464d198481476363693315085d37b8e305b7"
 
 [[package]]
 name = "byteorder"
 version = "0.5.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 
 [[package]]
 name = "canvas"
@@ -1880,17 +1880,17 @@ dependencies = [
 ]
 
 [[package]]
 name = "servo"
 version = "0.0.1"
 dependencies = [
  "android_glue 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)",
  "backtrace 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)",
- "browserhtml 0.1.15 (git+https://github.com/browserhtml/browserhtml?branch=gh-pages)",
+ "browserhtml 0.1.15 (git+https://github.com/browserhtml/browserhtml?branch=crate)",
  "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.4 (registry+https://github.com/rust-lang/crates.io-index)",
  "euclid 0.7.1 (registry+https://github.com/rust-lang/crates.io-index)",