Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-08-06 14:10:11 +01:00
Code Issues Projects Releases Packages Wiki Activity

Update WR (render notifier API changes).

Browse source
This commit is contained in:
Glenn Watson 2017-10-23 11:18:40 +10:00
parent 99b5eac393
commit 1da9dc99b5
21 changed files with 88 additions and 31 deletions
Download patch file Download diff file Expand all files Collapse all files

59
Cargo.lock generated
View file

@ -317,8 +317,8 @@ dependencies = [
"num-traits 0.1.37 (registry+https://github.com/rust-lang/crates.io-index)",
"offscreen_gl_context 0.12.0 (registry+https://github.com/rust-lang/crates.io-index)",
"servo_config 0.0.1",
"webrender 0.52.1 (git+https://github.com/servo/webrender)",
"webrender_api 0.52.1 (git+https://github.com/servo/webrender)",
"webrender 0.53.0 (git+https://github.com/servo/webrender)",
"webrender_api 0.53.0 (git+https://github.com/servo/webrender)",
]
[[package]]
@ -335,7 +335,7 @@ dependencies = [
"offscreen_gl_context 0.12.0 (registry+https://github.com/rust-lang/crates.io-index)",
"serde 1.0.14 (registry+https://github.com/rust-lang/crates.io-index)",
"servo_config 0.0.1",
"webrender_api 0.52.1 (git+https://github.com/servo/webrender)",
"webrender_api 0.53.0 (git+https://github.com/servo/webrender)",
]
[[package]]
@ -492,8 +492,8 @@ dependencies = [
"servo_url 0.0.1",
"style_traits 0.0.1",
"time 0.1.37 (registry+https://github.com/rust-lang/crates.io-index)",
"webrender 0.52.1 (git+https://github.com/servo/webrender)",
"webrender_api 0.52.1 (git+https://github.com/servo/webrender)",
"webrender 0.53.0 (git+https://github.com/servo/webrender)",
"webrender_api 0.53.0 (git+https://github.com/servo/webrender)",
]
[[package]]
@ -529,7 +529,7 @@ dependencies = [
"servo_remutex 0.0.1",
"servo_url 0.0.1",
"style_traits 0.0.1",
"webrender_api 0.52.1 (git+https://github.com/servo/webrender)",
"webrender_api 0.53.0 (git+https://github.com/servo/webrender)",
"webvr_traits 0.0.1",
]
@ -803,7 +803,7 @@ dependencies = [
"servo_geometry 0.0.1",
"servo_url 0.0.1",
"style_traits 0.0.1",
"webrender_api 0.52.1 (git+https://github.com/servo/webrender)",
"webrender_api 0.53.0 (git+https://github.com/servo/webrender)",
"x11 2.14.0 (registry+https://github.com/rust-lang/crates.io-index)",
]
@ -1128,7 +1128,7 @@ dependencies = [
"truetype 0.26.0 (registry+https://github.com/rust-lang/crates.io-index)",
"unicode-bidi 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)",
"unicode-script 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
"webrender_api 0.52.1 (git+https://github.com/servo/webrender)",
"webrender_api 0.53.0 (git+https://github.com/servo/webrender)",
"xi-unicode 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
"xml5ever 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)",
]
@ -1209,7 +1209,7 @@ dependencies = [
"servo_url 0.0.1",
"style_traits 0.0.1",
"user32-sys 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
"webrender_api 0.52.1 (git+https://github.com/servo/webrender)",
"webrender_api 0.53.0 (git+https://github.com/servo/webrender)",
"winapi 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)",
"x11 2.14.0 (registry+https://github.com/rust-lang/crates.io-index)",
]
@ -1553,7 +1553,7 @@ dependencies = [
"style_traits 0.0.1",
"unicode-bidi 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)",
"unicode-script 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
"webrender_api 0.52.1 (git+https://github.com/servo/webrender)",
"webrender_api 0.53.0 (git+https://github.com/servo/webrender)",
]
[[package]]
@ -1603,7 +1603,7 @@ dependencies = [
"servo_url 0.0.1",
"style 0.0.1",
"style_traits 0.0.1",
"webrender_api 0.52.1 (git+https://github.com/servo/webrender)",
"webrender_api 0.53.0 (git+https://github.com/servo/webrender)",
]
[[package]]
@ -1618,7 +1618,7 @@ dependencies = [
"profile_traits 0.0.1",
"script_traits 0.0.1",
"servo_url 0.0.1",
"webrender_api 0.52.1 (git+https://github.com/servo/webrender)",
"webrender_api 0.53.0 (git+https://github.com/servo/webrender)",
]
[[package]]
@ -1702,8 +1702,8 @@ dependencies = [
"style 0.0.1",
"style_traits 0.0.1",
"webdriver_server 0.0.1",
"webrender 0.52.1 (git+https://github.com/servo/webrender)",
"webrender_api 0.52.1 (git+https://github.com/servo/webrender)",
"webrender 0.53.0 (git+https://github.com/servo/webrender)",
"webrender_api 0.53.0 (git+https://github.com/servo/webrender)",
"webvr 0.0.1",
"webvr_traits 0.0.1",
]
@ -1763,7 +1763,7 @@ dependencies = [
"smallvec 0.4.3 (registry+https://github.com/rust-lang/crates.io-index)",
"string_cache 0.6.2 (registry+https://github.com/rust-lang/crates.io-index)",
"url 1.5.1 (registry+https://github.com/rust-lang/crates.io-index)",
"webrender_api 0.52.1 (git+https://github.com/servo/webrender)",
"webrender_api 0.53.0 (git+https://github.com/servo/webrender)",
"xml5ever 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)",
]
@ -1934,7 +1934,7 @@ dependencies = [
"malloc_size_of_derive 0.0.1",
"nonzero 0.0.1",
"serde 1.0.14 (registry+https://github.com/rust-lang/crates.io-index)",
"webrender_api 0.52.1 (git+https://github.com/servo/webrender)",
"webrender_api 0.53.0 (git+https://github.com/servo/webrender)",
]
[[package]]
@ -1992,7 +1992,7 @@ dependencies = [
"unicase 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
"url 1.5.1 (registry+https://github.com/rust-lang/crates.io-index)",
"uuid 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)",
"webrender_api 0.52.1 (git+https://github.com/servo/webrender)",
"webrender_api 0.53.0 (git+https://github.com/servo/webrender)",
]
[[package]]
@ -2049,7 +2049,7 @@ dependencies = [
"servo_url 0.0.1",
"url 1.5.1 (registry+https://github.com/rust-lang/crates.io-index)",
"uuid 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)",
"webrender_api 0.52.1 (git+https://github.com/servo/webrender)",
"webrender_api 0.53.0 (git+https://github.com/servo/webrender)",
]
[[package]]
@ -2674,7 +2674,7 @@ dependencies = [
"url 1.5.1 (registry+https://github.com/rust-lang/crates.io-index)",
"utf-8 0.7.1 (registry+https://github.com/rust-lang/crates.io-index)",
"uuid 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)",
"webrender_api 0.52.1 (git+https://github.com/servo/webrender)",
"webrender_api 0.53.0 (git+https://github.com/servo/webrender)",
"webvr_traits 0.0.1",
"xml5ever 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)",
]
@ -2707,7 +2707,7 @@ dependencies = [
"servo_atoms 0.0.1",
"servo_url 0.0.1",
"style 0.0.1",
"webrender_api 0.52.1 (git+https://github.com/servo/webrender)",
"webrender_api 0.53.0 (git+https://github.com/servo/webrender)",
]
[[package]]
@ -2751,7 +2751,7 @@ dependencies = [
"style_traits 0.0.1",
"time 0.1.37 (registry+https://github.com/rust-lang/crates.io-index)",
"url 1.5.1 (registry+https://github.com/rust-lang/crates.io-index)",
"webrender_api 0.52.1 (git+https://github.com/servo/webrender)",
"webrender_api 0.53.0 (git+https://github.com/servo/webrender)",
"webvr_traits 0.0.1",
]
@ -3250,7 +3250,7 @@ dependencies = [
"serde 1.0.14 (registry+https://github.com/rust-lang/crates.io-index)",
"servo_arc 0.0.1",
"servo_atoms 0.0.1",
"webrender_api 0.52.1 (git+https://github.com/servo/webrender)",
"webrender_api 0.53.0 (git+https://github.com/servo/webrender)",
]
[[package]]
@ -3620,8 +3620,8 @@ dependencies = [
[[package]]
name = "webrender"
version = "0.52.1"
source = "git+https://github.com/servo/webrender#37d531900bcb8e7c09c01759af12493abed8c0e3"
version = "0.53.0"
source = "git+https://github.com/servo/webrender#d741f472dd3d6c3441646f7bf4e714c71bea39b7"
dependencies = [
"app_units 0.5.6 (registry+https://github.com/rust-lang/crates.io-index)",
"bincode 0.9.2 (registry+https://github.com/rust-lang/crates.io-index)",
@ -3643,13 +3643,13 @@ dependencies = [
"rayon 0.8.2 (registry+https://github.com/rust-lang/crates.io-index)",
"thread_profiler 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)",
"time 0.1.37 (registry+https://github.com/rust-lang/crates.io-index)",
"webrender_api 0.52.1 (git+https://github.com/servo/webrender)",
"webrender_api 0.53.0 (git+https://github.com/servo/webrender)",
]
[[package]]
name = "webrender_api"
version = "0.52.1"
source = "git+https://github.com/servo/webrender#37d531900bcb8e7c09c01759af12493abed8c0e3"
version = "0.53.0"
source = "git+https://github.com/servo/webrender#d741f472dd3d6c3441646f7bf4e714c71bea39b7"
dependencies = [
"app_units 0.5.6 (registry+https://github.com/rust-lang/crates.io-index)",
"bincode 0.9.2 (registry+https://github.com/rust-lang/crates.io-index)",
@ -3659,7 +3659,6 @@ dependencies = [
"core-graphics 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)",
"dwrote 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
"euclid 0.15.3 (registry+https://github.com/rust-lang/crates.io-index)",
"heapsize 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
"ipc-channel 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)",
"serde 1.0.14 (registry+https://github.com/rust-lang/crates.io-index)",
"time 0.1.37 (registry+https://github.com/rust-lang/crates.io-index)",
@ -4069,8 +4068,8 @@ dependencies = [
"checksum void 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)" = "6a02e4885ed3bc0f2de90ea6dd45ebcbb66dacffe03547fadbb0eeae2770887d"
"checksum walkdir 1.0.7 (registry+https://github.com/rust-lang/crates.io-index)" = "bb08f9e670fab86099470b97cd2b252d6527f0b3cc1401acdb595ffc9dd288ff"
"checksum webdriver 0.22.0 (registry+https://github.com/rust-lang/crates.io-index)" = "d548aabf87411b1b4ba91fd07eacd8b238135c7131a452b8a9f6386209167e18"
"checksum webrender 0.52.1 (git+https://github.com/servo/webrender)" = "<none>"
"checksum webrender_api 0.52.1 (git+https://github.com/servo/webrender)" = "<none>"
"checksum webrender 0.53.0 (git+https://github.com/servo/webrender)" = "<none>"
"checksum webrender_api 0.53.0 (git+https://github.com/servo/webrender)" = "<none>"
"checksum winapi 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)" = "167dc9d6949a9b857f3451275e911c3f44255842c1f7a76f33c55103a909087a"
"checksum winapi-build 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "2d315eee3b34aca4797b2da6b13ed88266e6d612562a0c46390af8299fc699bc"
"checksum ws 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)" = "04614a58714f3fd4a8b1da4bcae9f031c532d35988c3d39627619248113f8be8"

4
components/compositing/compositor.rs
View file

@ -325,6 +325,10 @@ impl RenderNotifier {
}
impl webrender_api::RenderNotifier for RenderNotifier {
fn clone(&self) -> Box<webrender_api::RenderNotifier> {
Box::new(RenderNotifier::new(self.compositor_proxy.clone()))
}
fn new_frame_ready(&self) {
self.compositor_proxy.recomposite(CompositingReason::NewWebRenderFrame);
}

2
components/servo/lib.rs
View file

@ -185,7 +185,7 @@ impl<Window> Servo<Window> where Window: WindowMethods + 'static {
let mut debug_flags = webrender::DebugFlags::empty();
debug_flags.set(webrender::DebugFlags::PROFILER_DBG, opts.webrender_stats);
let render_notifier = RenderNotifier::new(compositor_proxy.clone());
let render_notifier = Box::new(RenderNotifier::new(compositor_proxy.clone()));
webrender::Renderer::new(window.gl(), render_notifier, webrender::RendererOptions {
device_pixel_ratio: device_pixel_ratio,

3
tests/wpt/metadata-css/css21_dev/html4/border-left-applies-to-001.htm.ini Normal file
View file

@ -0,0 +1,3 @@
[border-left-applies-to-001.htm]
type: reftest
expected: FAIL

3
tests/wpt/metadata-css/css21_dev/html4/border-left-applies-to-002.htm.ini Normal file
View file

@ -0,0 +1,3 @@
[border-left-applies-to-002.htm]
type: reftest
expected: FAIL

3
tests/wpt/metadata-css/css21_dev/html4/border-left-applies-to-003.htm.ini Normal file
View file

@ -0,0 +1,3 @@
[border-left-applies-to-003.htm]
type: reftest
expected: FAIL

3
tests/wpt/metadata-css/css21_dev/html4/border-left-color-applies-to-001.htm.ini Normal file
View file

@ -0,0 +1,3 @@
[border-left-color-applies-to-001.htm]
type: reftest
expected: FAIL

3
tests/wpt/metadata-css/css21_dev/html4/border-left-color-applies-to-002.htm.ini Normal file
View file

@ -0,0 +1,3 @@
[border-left-color-applies-to-002.htm]
type: reftest
expected: FAIL

3
tests/wpt/metadata-css/css21_dev/html4/border-left-color-applies-to-003.htm.ini Normal file
View file

@ -0,0 +1,3 @@
[border-left-color-applies-to-003.htm]
type: reftest
expected: FAIL

3
tests/wpt/metadata-css/css21_dev/html4/border-left-width-applies-to-001.htm.ini Normal file
View file

@ -0,0 +1,3 @@
[border-left-width-applies-to-001.htm]
type: reftest
expected: FAIL

3
tests/wpt/metadata-css/css21_dev/html4/border-left-width-applies-to-002.htm.ini Normal file
View file

@ -0,0 +1,3 @@
[border-left-width-applies-to-002.htm]
type: reftest
expected: FAIL

3
tests/wpt/metadata-css/css21_dev/html4/border-left-width-applies-to-003.htm.ini Normal file
View file

@ -0,0 +1,3 @@
[border-left-width-applies-to-003.htm]
type: reftest
expected: FAIL

3
tests/wpt/metadata-css/css21_dev/html4/border-top-applies-to-001.htm.ini Normal file
View file

@ -0,0 +1,3 @@
[border-top-applies-to-001.htm]
type: reftest
expected: FAIL

3
tests/wpt/metadata-css/css21_dev/html4/border-top-applies-to-002.htm.ini Normal file
View file

@ -0,0 +1,3 @@
[border-top-applies-to-002.htm]
type: reftest
expected: FAIL

3
tests/wpt/metadata-css/css21_dev/html4/border-top-applies-to-003.htm.ini Normal file
View file

@ -0,0 +1,3 @@
[border-top-applies-to-003.htm]
type: reftest
expected: FAIL

3
tests/wpt/metadata-css/css21_dev/html4/border-top-color-applies-to-001.htm.ini Normal file
View file

@ -0,0 +1,3 @@
[border-top-color-applies-to-001.htm]
type: reftest
expected: FAIL

3
tests/wpt/metadata-css/css21_dev/html4/border-top-color-applies-to-002.htm.ini Normal file
View file

@ -0,0 +1,3 @@
[border-top-color-applies-to-002.htm]
type: reftest
expected: FAIL

3
tests/wpt/metadata-css/css21_dev/html4/border-top-color-applies-to-003.htm.ini Normal file
View file

@ -0,0 +1,3 @@
[border-top-color-applies-to-003.htm]
type: reftest
expected: FAIL

3
tests/wpt/metadata-css/css21_dev/html4/border-top-width-applies-to-001.htm.ini Normal file
View file

@ -0,0 +1,3 @@
[border-top-width-applies-to-001.htm]
type: reftest
expected: FAIL

3
tests/wpt/metadata-css/css21_dev/html4/border-top-width-applies-to-002.htm.ini Normal file
View file

@ -0,0 +1,3 @@
[border-top-width-applies-to-002.htm]
type: reftest
expected: FAIL

3
tests/wpt/metadata-css/css21_dev/html4/border-top-width-applies-to-003.htm.ini Normal file
View file

@ -0,0 +1,3 @@
[border-top-width-applies-to-003.htm]
type: reftest
expected: FAIL