diff options
| author | bors-servo <lbergstrom+bors@mozilla.com> | 2017-03-05 14:23:41 -0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-03-05 14:23:41 -0800 |
| commit | 6b28a18f45199cfd80a949178af810001fcb83e0 (patch) | |
| tree | 629ee6f8f2813d22b41ffd084980e0173f2883a5 | |
| parent | 72fd27bbccf9214cee11c78834ca1fbc96b3bf22 (diff) | |
| parent | 44fe81da41a193e01b611ef7217f0d9a5627190c (diff) | |
| download | servo-6b28a18f45199cfd80a949178af810001fcb83e0.tar.gz servo-6b28a18f45199cfd80a949178af810001fcb83e0.zip | |
Auto merge of #15826 - glennw:update-wr-viewport, r=KiChjang
Update WR (overscroll support + fix viewport tests).
<!-- 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/15826)
<!-- Reviewable:end -->
| -rw-r--r-- | Cargo.lock | 4 | ||||
| -rw-r--r-- | components/servo/lib.rs | 6 | ||||
| -rw-r--r-- | tests/wpt/mozilla/meta/css/viewport_meta.html.ini | 3 | ||||
| -rw-r--r-- | tests/wpt/mozilla/meta/css/viewport_rule.html.ini | 3 |
4 files changed, 7 insertions, 9 deletions
diff --git a/Cargo.lock b/Cargo.lock index 875a4854d15..c98ca1bd721 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -3176,7 +3176,7 @@ dependencies = [ [[package]] name = "webrender" version = "0.22.1" -source = "git+https://github.com/servo/webrender#68f5b72fb3f871f6930c772c7e2705412512dde2" +source = "git+https://github.com/servo/webrender#f9860e08a22e9753974fbb7f34dbf675b2891b59" dependencies = [ "app_units 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)", "bincode 1.0.0-alpha2 (registry+https://github.com/rust-lang/crates.io-index)", @@ -3204,7 +3204,7 @@ dependencies = [ [[package]] name = "webrender_traits" version = "0.23.1" -source = "git+https://github.com/servo/webrender#68f5b72fb3f871f6930c772c7e2705412512dde2" +source = "git+https://github.com/servo/webrender#f9860e08a22e9753974fbb7f34dbf675b2891b59" dependencies = [ "app_units 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)", "byteorder 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)", diff --git a/components/servo/lib.rs b/components/servo/lib.rs index 69b9bbeceb8..40ffba9eb8d 100644 --- a/components/servo/lib.rs +++ b/components/servo/lib.rs @@ -172,6 +172,10 @@ impl<Window> Browser<Window> where Window: WindowMethods + 'static { None }; + let framebuffer_size = window.framebuffer_size(); + let framebuffer_size = webrender_traits::DeviceUintSize::new(framebuffer_size.width, + framebuffer_size.height); + webrender::Renderer::new(webrender::RendererOptions { device_pixel_ratio: device_pixel_ratio, resource_override_path: Some(resource_path), @@ -184,7 +188,7 @@ impl<Window> Browser<Window> where Window: WindowMethods + 'static { renderer_kind: renderer_kind, enable_subpixel_aa: opts.enable_subpixel_text_antialiasing, ..Default::default() - }).expect("Unable to initialize webrender!") + }, framebuffer_size).expect("Unable to initialize webrender!") }; // Important that this call is done in a single-threaded fashion, we diff --git a/tests/wpt/mozilla/meta/css/viewport_meta.html.ini b/tests/wpt/mozilla/meta/css/viewport_meta.html.ini index a0166a230d5..b737c1dcb74 100644 --- a/tests/wpt/mozilla/meta/css/viewport_meta.html.ini +++ b/tests/wpt/mozilla/meta/css/viewport_meta.html.ini @@ -1,4 +1 @@ prefs: [layout.viewport.enabled:true] -[viewport_meta.html] - type: reftest - expected: FAIL diff --git a/tests/wpt/mozilla/meta/css/viewport_rule.html.ini b/tests/wpt/mozilla/meta/css/viewport_rule.html.ini index 9701fc34674..b737c1dcb74 100644 --- a/tests/wpt/mozilla/meta/css/viewport_rule.html.ini +++ b/tests/wpt/mozilla/meta/css/viewport_rule.html.ini @@ -1,4 +1 @@ prefs: [layout.viewport.enabled:true] -[viewport_rule.html] - type: reftest - expected: FAIL |