aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorbors-servo <lbergstrom+bors@mozilla.com>2016-10-06 21:03:06 -0500
committerGitHub <noreply@github.com>2016-10-06 21:03:06 -0500
commitae665db02fcc4066344f7ddcfab0d53768e16657 (patch)
treee3c979f943922635775e2c656086a063c952292f
parente5aebfcf73956b190da3b405db9d14022ecf1da6 (diff)
parent792ec0c99a90c59045ee7a6eea8519bfa5f872ee (diff)
downloadservo-ae665db02fcc4066344f7ddcfab0d53768e16657.tar.gz
servo-ae665db02fcc4066344f7ddcfab0d53768e16657.zip
Auto merge of #13628 - glennw:update-wr-profiler, r=pcwalton
Update webrender (new gpu profiler support). <!-- 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/13628) <!-- Reviewable:end -->
-rw-r--r--components/servo/Cargo.lock4
-rw-r--r--ports/cef/Cargo.lock4
2 files changed, 4 insertions, 4 deletions
diff --git a/components/servo/Cargo.lock b/components/servo/Cargo.lock
index 7b2fa3b1474..8d0dd5b5fe9 100644
--- a/components/servo/Cargo.lock
+++ b/components/servo/Cargo.lock
@@ -2697,7 +2697,7 @@ dependencies = [
[[package]]
name = "webrender"
version = "0.5.1"
-source = "git+https://github.com/servo/webrender#f200389d12b30764f9c9d2401cebe6ff8c9eee50"
+source = "git+https://github.com/servo/webrender#98e7331d48620ac1c03397ebbbf526b60e62258b"
dependencies = [
"app_units 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)",
"bincode 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -2722,7 +2722,7 @@ dependencies = [
[[package]]
name = "webrender_traits"
version = "0.5.1"
-source = "git+https://github.com/servo/webrender#f200389d12b30764f9c9d2401cebe6ff8c9eee50"
+source = "git+https://github.com/servo/webrender#98e7331d48620ac1c03397ebbbf526b60e62258b"
dependencies = [
"app_units 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)",
"byteorder 0.5.3 (registry+https://github.com/rust-lang/crates.io-index)",
diff --git a/ports/cef/Cargo.lock b/ports/cef/Cargo.lock
index bf153f49ef1..e5625ca7ce1 100644
--- a/ports/cef/Cargo.lock
+++ b/ports/cef/Cargo.lock
@@ -2556,7 +2556,7 @@ dependencies = [
[[package]]
name = "webrender"
version = "0.5.1"
-source = "git+https://github.com/servo/webrender#f200389d12b30764f9c9d2401cebe6ff8c9eee50"
+source = "git+https://github.com/servo/webrender#98e7331d48620ac1c03397ebbbf526b60e62258b"
dependencies = [
"app_units 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)",
"bincode 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -2581,7 +2581,7 @@ dependencies = [
[[package]]
name = "webrender_traits"
version = "0.5.1"
-source = "git+https://github.com/servo/webrender#f200389d12b30764f9c9d2401cebe6ff8c9eee50"
+source = "git+https://github.com/servo/webrender#98e7331d48620ac1c03397ebbbf526b60e62258b"
dependencies = [
"app_units 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)",
"byteorder 0.5.3 (registry+https://github.com/rust-lang/crates.io-index)",