From d13172845c2320a8ec4025e964dd1e8617b3c6df Mon Sep 17 00:00:00 2001 From: Pyfisch Date: Sat, 15 Sep 2018 21:19:22 +0200 Subject: [PATCH] Update Webrender New version is 9156a4465f6ad715a0206cdd9a7e9a6f0385fbd6 --- Cargo.lock | 12 ++++++------ components/canvas/webgl_thread.rs | 3 ++- components/layout/display_list/builder.rs | 4 ++++ components/layout/display_list/webrender_helpers.rs | 1 + tests/unit/metrics/paint_time.rs | 3 ++- .../metadata/css/CSS2/borders/ridge-default.html.ini | 2 -- .../floats-clear/clear-on-parent-and-child.html.ini | 3 +++ .../mix-blend-mode/mix-blend-mode-animation.html.ini | 4 ---- ...e-blended-with-transform-and-perspective.html.ini | 2 ++ .../mix-blend-mode/mix-blend-mode-paragraph.html.ini | 2 ++ .../attachment-local-positioning-2.html.ini | 3 +++ .../attachment-scroll-positioning-1.html.ini | 3 +++ ...ll-positioned-multiple-background-images.html.ini | 3 +++ .../css-transforms/matrix/svg-matrix-061.html.ini | 2 ++ .../css/css-transforms/transform-table-006.html.ini | 3 +++ .../css/cssom-view/elementFromPoint-001.html.ini | 3 +++ .../elementFromPoint-dynamic-anon-box.html.ini | 3 +++ .../mozilla/meta/css/border_black_ridge_a.html.ini | 3 --- .../mozilla/meta/css/border_black_ridge_b.html.ini | 3 --- 19 files changed, 42 insertions(+), 20 deletions(-) delete mode 100644 tests/wpt/metadata/css/CSS2/borders/ridge-default.html.ini create mode 100644 tests/wpt/metadata/css/CSS2/floats-clear/clear-on-parent-and-child.html.ini delete mode 100644 tests/wpt/metadata/css/compositing/mix-blend-mode/mix-blend-mode-animation.html.ini create mode 100644 tests/wpt/metadata/css/compositing/mix-blend-mode/mix-blend-mode-blended-with-transform-and-perspective.html.ini create mode 100644 tests/wpt/metadata/css/compositing/mix-blend-mode/mix-blend-mode-paragraph.html.ini create mode 100644 tests/wpt/metadata/css/css-backgrounds/background-attachment-local/attachment-local-positioning-2.html.ini create mode 100644 tests/wpt/metadata/css/css-backgrounds/background-attachment-local/attachment-scroll-positioning-1.html.ini create mode 100644 tests/wpt/metadata/css/css-backgrounds/scroll-positioned-multiple-background-images.html.ini create mode 100644 tests/wpt/metadata/css/css-transforms/matrix/svg-matrix-061.html.ini create mode 100644 tests/wpt/metadata/css/css-transforms/transform-table-006.html.ini create mode 100644 tests/wpt/metadata/css/cssom-view/elementFromPoint-001.html.ini create mode 100644 tests/wpt/metadata/css/cssom-view/elementFromPoint-dynamic-anon-box.html.ini delete mode 100644 tests/wpt/mozilla/meta/css/border_black_ridge_a.html.ini delete mode 100644 tests/wpt/mozilla/meta/css/border_black_ridge_b.html.ini diff --git a/Cargo.lock b/Cargo.lock index 11dbb0af8e8..07fe49b2ff0 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -2618,7 +2618,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" [[package]] name = "plane-split" -version = "0.12.1" +version = "0.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "binary-space-partition 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)", @@ -2801,7 +2801,7 @@ dependencies = [ "lazy_static 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)", "libc 0.2.42 (registry+https://github.com/rust-lang/crates.io-index)", "num_cpus 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)", - "rand 0.3.22 (registry+https://github.com/rust-lang/crates.io-index)", + "rand 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -4029,7 +4029,7 @@ dependencies = [ [[package]] name = "webrender" version = "0.57.2" -source = "git+https://github.com/servo/webrender#38f3b57cd9bf2c6fb736d14832fee87eb576e322" +source = "git+https://github.com/servo/webrender#9156a4465f6ad715a0206cdd9a7e9a6f0385fbd6" dependencies = [ "app_units 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)", "base64 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)", @@ -4049,7 +4049,7 @@ dependencies = [ "lazy_static 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)", "log 0.4.5 (registry+https://github.com/rust-lang/crates.io-index)", "num-traits 0.2.4 (registry+https://github.com/rust-lang/crates.io-index)", - "plane-split 0.12.1 (registry+https://github.com/rust-lang/crates.io-index)", + "plane-split 0.13.0 (registry+https://github.com/rust-lang/crates.io-index)", "rayon 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)", "ron 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)", "serde 1.0.66 (registry+https://github.com/rust-lang/crates.io-index)", @@ -4064,7 +4064,7 @@ dependencies = [ [[package]] name = "webrender_api" version = "0.57.2" -source = "git+https://github.com/servo/webrender#38f3b57cd9bf2c6fb736d14832fee87eb576e322" +source = "git+https://github.com/servo/webrender#9156a4465f6ad715a0206cdd9a7e9a6f0385fbd6" dependencies = [ "app_units 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)", "bincode 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)", @@ -4506,7 +4506,7 @@ dependencies = [ "checksum phf_generator 0.7.21 (registry+https://github.com/rust-lang/crates.io-index)" = "6b07ffcc532ccc85e3afc45865469bf5d9e4ef5bfcf9622e3cfe80c2d275ec03" "checksum phf_shared 0.7.21 (registry+https://github.com/rust-lang/crates.io-index)" = "07e24b0ca9643bdecd0632f2b3da6b1b89bbb0030e0b992afc1113b23a7bc2f2" "checksum pkg-config 0.3.14 (registry+https://github.com/rust-lang/crates.io-index)" = "676e8eb2b1b4c9043511a9b7bea0915320d7e502b0a079fb03f9635a5252b18c" -"checksum plane-split 0.12.1 (registry+https://github.com/rust-lang/crates.io-index)" = "ff3a4fc9e31d70eb6828e9a2d7a401a824d9f281686a39a8fc06f08796edb1bb" +"checksum plane-split 0.13.0 (registry+https://github.com/rust-lang/crates.io-index)" = "64d766f38b15fe1337bdddfc869ef5c50437323f857aaaadc6490197db80a1b8" "checksum png 0.12.0 (registry+https://github.com/rust-lang/crates.io-index)" = "f54b9600d584d3b8a739e1662a595fab051329eff43f20e7d8cc22872962145b" "checksum podio 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)" = "780fb4b6698bbf9cf2444ea5d22411cef2953f0824b98f33cf454ec5615645bd" "checksum precomputed-hash 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "925383efa346730478fb4838dbe9137d2a47675ad789c546d150a6e1dd4ab31c" diff --git a/components/canvas/webgl_thread.rs b/components/canvas/webgl_thread.rs index 413566e7817..7cdae9a002c 100644 --- a/components/canvas/webgl_thread.rs +++ b/components/canvas/webgl_thread.rs @@ -636,7 +636,8 @@ impl webrender::ExternalImageHandler for WebGLExternal /// The WR client should not change the image content until the unlock() call. fn lock(&mut self, key: webrender_api::ExternalImageId, - _channel_index: u8) -> webrender::ExternalImage { + _channel_index: u8, + _rendering: webrender_api::ImageRendering) -> webrender::ExternalImage { let ctx_id = WebGLContextId(key.0 as _); let (texture_id, size) = self.handler.lock(ctx_id); diff --git a/components/layout/display_list/builder.rs b/components/layout/display_list/builder.rs index 3d49fdbb61c..1b97b35b471 100644 --- a/components/layout/display_list/builder.rs +++ b/components/layout/display_list/builder.rs @@ -1081,6 +1081,7 @@ impl FragmentDisplayListBuilding for Fragment { tile_spacing: placement.tile_spacing.to_layout(), image_rendering: style.get_inherited_box().image_rendering.to_layout(), alpha_type: webrender_api::AlphaType::PremultipliedAlpha, + color: webrender_api::ColorF::WHITE, }, ); }); @@ -1994,6 +1995,7 @@ impl FragmentDisplayListBuilding for Fragment { .image_rendering .to_layout(), alpha_type: webrender_api::AlphaType::PremultipliedAlpha, + color: webrender_api::ColorF::WHITE, }, ); } @@ -2011,6 +2013,7 @@ impl FragmentDisplayListBuilding for Fragment { tile_spacing: LayoutSize::zero(), image_rendering: ImageRendering::Auto, alpha_type: webrender_api::AlphaType::PremultipliedAlpha, + color: webrender_api::ColorF::WHITE, }, ); } @@ -2040,6 +2043,7 @@ impl FragmentDisplayListBuilding for Fragment { tile_spacing: LayoutSize::zero(), image_rendering: ImageRendering::Auto, alpha_type: webrender_api::AlphaType::PremultipliedAlpha, + color: webrender_api::ColorF::WHITE, }; state.add_image_item(base, display_item); diff --git a/components/layout/display_list/webrender_helpers.rs b/components/layout/display_list/webrender_helpers.rs index 43ae47c5241..4cb6dd17de4 100644 --- a/components/layout/display_list/webrender_helpers.rs +++ b/components/layout/display_list/webrender_helpers.rs @@ -123,6 +123,7 @@ impl WebRenderDisplayItemConverter for DisplayItem { item.item.image_rendering, item.item.alpha_type, item.item.image_key, + item.item.color, ); }, DisplayItem::Border(ref item) => { diff --git a/tests/unit/metrics/paint_time.rs b/tests/unit/metrics/paint_time.rs index 7a2748381fa..20c43b28c84 100644 --- a/tests/unit/metrics/paint_time.rs +++ b/tests/unit/metrics/paint_time.rs @@ -10,7 +10,7 @@ use msg::constellation_msg::TEST_PIPELINE_ID; use profile_traits::time::{ProfilerChan, TimerMetadata}; use servo_url::ServoUrl; use time; -use webrender_api::{AlphaType, ImageDisplayItem, ImageKey, ImageRendering, LayoutSize}; +use webrender_api::{AlphaType, ImageDisplayItem, ImageKey, ImageRendering, LayoutSize, ColorF}; struct DummyProfilerMetadataFactory {} impl ProfilerMetadataFactory for DummyProfilerMetadataFactory { @@ -124,6 +124,7 @@ fn test_first_contentful_paint_setter() { tile_spacing: LayoutSize::zero(), image_rendering: ImageRendering::Auto, alpha_type: AlphaType::PremultipliedAlpha, + color: ColorF::WHITE, } )); let display_list = DisplayList { diff --git a/tests/wpt/metadata/css/CSS2/borders/ridge-default.html.ini b/tests/wpt/metadata/css/CSS2/borders/ridge-default.html.ini deleted file mode 100644 index 706fdcd9585..00000000000 --- a/tests/wpt/metadata/css/CSS2/borders/ridge-default.html.ini +++ /dev/null @@ -1,2 +0,0 @@ -[ridge-default.html] - expected: FAIL diff --git a/tests/wpt/metadata/css/CSS2/floats-clear/clear-on-parent-and-child.html.ini b/tests/wpt/metadata/css/CSS2/floats-clear/clear-on-parent-and-child.html.ini new file mode 100644 index 00000000000..c9c1672a96f --- /dev/null +++ b/tests/wpt/metadata/css/CSS2/floats-clear/clear-on-parent-and-child.html.ini @@ -0,0 +1,3 @@ +[clear-on-parent-and-child.html] + bug: https://github.com/servo/webrender/issues/3078 + expected: FAIL diff --git a/tests/wpt/metadata/css/compositing/mix-blend-mode/mix-blend-mode-animation.html.ini b/tests/wpt/metadata/css/compositing/mix-blend-mode/mix-blend-mode-animation.html.ini deleted file mode 100644 index 701a966c7aa..00000000000 --- a/tests/wpt/metadata/css/compositing/mix-blend-mode/mix-blend-mode-animation.html.ini +++ /dev/null @@ -1,4 +0,0 @@ -[mix-blend-mode-animation.html] - type: reftest - expected: FAIL - bug: https://github.com/servo/webrender/pull/2048 diff --git a/tests/wpt/metadata/css/compositing/mix-blend-mode/mix-blend-mode-blended-with-transform-and-perspective.html.ini b/tests/wpt/metadata/css/compositing/mix-blend-mode/mix-blend-mode-blended-with-transform-and-perspective.html.ini new file mode 100644 index 00000000000..0e16a4f7db7 --- /dev/null +++ b/tests/wpt/metadata/css/compositing/mix-blend-mode/mix-blend-mode-blended-with-transform-and-perspective.html.ini @@ -0,0 +1,2 @@ +[mix-blend-mode-blended-with-transform-and-perspective.html] + expected: FAIL diff --git a/tests/wpt/metadata/css/compositing/mix-blend-mode/mix-blend-mode-paragraph.html.ini b/tests/wpt/metadata/css/compositing/mix-blend-mode/mix-blend-mode-paragraph.html.ini new file mode 100644 index 00000000000..fb5b6fd0006 --- /dev/null +++ b/tests/wpt/metadata/css/compositing/mix-blend-mode/mix-blend-mode-paragraph.html.ini @@ -0,0 +1,2 @@ +[mix-blend-mode-paragraph.html] + expected: FAIL diff --git a/tests/wpt/metadata/css/css-backgrounds/background-attachment-local/attachment-local-positioning-2.html.ini b/tests/wpt/metadata/css/css-backgrounds/background-attachment-local/attachment-local-positioning-2.html.ini new file mode 100644 index 00000000000..953bbeabcbf --- /dev/null +++ b/tests/wpt/metadata/css/css-backgrounds/background-attachment-local/attachment-local-positioning-2.html.ini @@ -0,0 +1,3 @@ +[attachment-local-positioning-2.html] + bug: https://github.com/servo/webrender/issues/3078 + expected: FAIL diff --git a/tests/wpt/metadata/css/css-backgrounds/background-attachment-local/attachment-scroll-positioning-1.html.ini b/tests/wpt/metadata/css/css-backgrounds/background-attachment-local/attachment-scroll-positioning-1.html.ini new file mode 100644 index 00000000000..beea55d7dc0 --- /dev/null +++ b/tests/wpt/metadata/css/css-backgrounds/background-attachment-local/attachment-scroll-positioning-1.html.ini @@ -0,0 +1,3 @@ +[attachment-scroll-positioning-1.html] + bug: https://github.com/servo/webrender/issues/3078 + expected: FAIL diff --git a/tests/wpt/metadata/css/css-backgrounds/scroll-positioned-multiple-background-images.html.ini b/tests/wpt/metadata/css/css-backgrounds/scroll-positioned-multiple-background-images.html.ini new file mode 100644 index 00000000000..08321c4b311 --- /dev/null +++ b/tests/wpt/metadata/css/css-backgrounds/scroll-positioned-multiple-background-images.html.ini @@ -0,0 +1,3 @@ +[scroll-positioned-multiple-background-images.html] + bug: https://github.com/servo/webrender/issues/3078 + expected: FAIL diff --git a/tests/wpt/metadata/css/css-transforms/matrix/svg-matrix-061.html.ini b/tests/wpt/metadata/css/css-transforms/matrix/svg-matrix-061.html.ini new file mode 100644 index 00000000000..b203ab01436 --- /dev/null +++ b/tests/wpt/metadata/css/css-transforms/matrix/svg-matrix-061.html.ini @@ -0,0 +1,2 @@ +[svg-matrix-061.html] + expected: FAIL diff --git a/tests/wpt/metadata/css/css-transforms/transform-table-006.html.ini b/tests/wpt/metadata/css/css-transforms/transform-table-006.html.ini new file mode 100644 index 00000000000..0d34decf37c --- /dev/null +++ b/tests/wpt/metadata/css/css-transforms/transform-table-006.html.ini @@ -0,0 +1,3 @@ +[transform-table-006.html] + bug: https://github.com/servo/webrender/issues/3077 + expected: FAIL diff --git a/tests/wpt/metadata/css/cssom-view/elementFromPoint-001.html.ini b/tests/wpt/metadata/css/cssom-view/elementFromPoint-001.html.ini new file mode 100644 index 00000000000..72b09371038 --- /dev/null +++ b/tests/wpt/metadata/css/cssom-view/elementFromPoint-001.html.ini @@ -0,0 +1,3 @@ +[elementFromPoint-001.html] + [CSSOM View - 5 - extensions to the Document interface] + expected: FAIL diff --git a/tests/wpt/metadata/css/cssom-view/elementFromPoint-dynamic-anon-box.html.ini b/tests/wpt/metadata/css/cssom-view/elementFromPoint-dynamic-anon-box.html.ini new file mode 100644 index 00000000000..cf67b5d03dd --- /dev/null +++ b/tests/wpt/metadata/css/cssom-view/elementFromPoint-dynamic-anon-box.html.ini @@ -0,0 +1,3 @@ +[elementFromPoint-dynamic-anon-box.html] + [Link should be clickable after hiding a scrollbox with an anonymous table inside] + expected: FAIL diff --git a/tests/wpt/mozilla/meta/css/border_black_ridge_a.html.ini b/tests/wpt/mozilla/meta/css/border_black_ridge_a.html.ini deleted file mode 100644 index 9b22dd76823..00000000000 --- a/tests/wpt/mozilla/meta/css/border_black_ridge_a.html.ini +++ /dev/null @@ -1,3 +0,0 @@ -[border_black_ridge_a.html] - type: reftest - expected: FAIL diff --git a/tests/wpt/mozilla/meta/css/border_black_ridge_b.html.ini b/tests/wpt/mozilla/meta/css/border_black_ridge_b.html.ini deleted file mode 100644 index 77a903e94d5..00000000000 --- a/tests/wpt/mozilla/meta/css/border_black_ridge_b.html.ini +++ /dev/null @@ -1,3 +0,0 @@ -[border_black_ridge_b.html] - type: reftest - expected: FAIL