From d13172845c2320a8ec4025e964dd1e8617b3c6df Mon Sep 17 00:00:00 2001 From: Pyfisch Date: Sat, 15 Sep 2018 21:19:22 +0200 Subject: [PATCH 1/4] 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 From 171469c27c95f7a3a41663da58320494ea63dba8 Mon Sep 17 00:00:00 2001 From: Josh Matthews Date: Tue, 9 Oct 2018 14:41:37 -0400 Subject: [PATCH 2/4] Update webrender to 923ee495bd9b0fda8a4a94c5a6cf42e2f0548731. --- Cargo.lock | 148 ++++++++++-------- components/gfx/Cargo.toml | 6 +- components/gfx/platform/macos/font.rs | 22 +-- components/gfx/platform/macos/font_list.rs | 7 +- components/layout/display_list/background.rs | 21 +-- components/layout/display_list/builder.rs | 1 + components/layout/display_list/conversions.rs | 14 +- .../layout/display_list/webrender_helpers.rs | 4 +- components/malloc_size_of/lib.rs | 2 - components/servo/lib.rs | 10 +- servo-tidy.toml | 1 + .../css/CSS2/borders/groove-default.html.ini | 2 - .../matrix/svg-matrix-061.html.ini | 2 - .../scroll-behavior-smooth.html.ini | 8 - 14 files changed, 128 insertions(+), 120 deletions(-) delete mode 100644 tests/wpt/metadata/css/CSS2/borders/groove-default.html.ini delete mode 100644 tests/wpt/metadata/css/css-transforms/matrix/svg-matrix-061.html.ini delete mode 100644 tests/wpt/metadata/css/cssom-view/scroll-behavior-smooth.html.ini diff --git a/Cargo.lock b/Cargo.lock index 07fe49b2ff0..30c1655eac2 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -118,7 +118,7 @@ dependencies = [ "cfg-if 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)", "libc 0.2.42 (registry+https://github.com/rust-lang/crates.io-index)", "rustc-demangle 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)", - "winapi 0.3.5 (registry+https://github.com/rust-lang/crates.io-index)", + "winapi 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -318,7 +318,7 @@ dependencies = [ "cssparser 0.24.0 (registry+https://github.com/rust-lang/crates.io-index)", "euclid 0.19.0 (registry+https://github.com/rust-lang/crates.io-index)", "fnv 1.0.5 (registry+https://github.com/rust-lang/crates.io-index)", - "gleam 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)", + "gleam 0.6.2 (registry+https://github.com/rust-lang/crates.io-index)", "ipc-channel 0.11.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)", @@ -335,7 +335,7 @@ version = "0.0.1" dependencies = [ "cssparser 0.24.0 (registry+https://github.com/rust-lang/crates.io-index)", "euclid 0.19.0 (registry+https://github.com/rust-lang/crates.io-index)", - "gleam 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)", + "gleam 0.6.2 (registry+https://github.com/rust-lang/crates.io-index)", "ipc-channel 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)", "lazy_static 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)", "malloc_size_of 0.0.1", @@ -384,7 +384,7 @@ name = "cgl" version = "0.2.3" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "gleam 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)", + "gleam 0.6.2 (registry+https://github.com/rust-lang/crates.io-index)", "libc 0.2.42 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -439,7 +439,7 @@ name = "clipboard-win" version = "2.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "winapi 0.3.5 (registry+https://github.com/rust-lang/crates.io-index)", + "winapi 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -494,7 +494,7 @@ dependencies = [ "embedder_traits 0.0.1", "euclid 0.19.0 (registry+https://github.com/rust-lang/crates.io-index)", "gfx_traits 0.0.1", - "gleam 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)", + "gleam 0.6.2 (registry+https://github.com/rust-lang/crates.io-index)", "image 0.19.0 (registry+https://github.com/rust-lang/crates.io-index)", "ipc-channel 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)", "libc 0.2.42 (registry+https://github.com/rust-lang/crates.io-index)", @@ -562,16 +562,16 @@ dependencies = [ [[package]] name = "core-foundation" -version = "0.6.0" +version = "0.6.2" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "core-foundation-sys 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)", + "core-foundation-sys 0.6.2 (registry+https://github.com/rust-lang/crates.io-index)", "libc 0.2.42 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] name = "core-foundation-sys" -version = "0.6.0" +version = "0.6.2" source = "registry+https://github.com/rust-lang/crates.io-index" [[package]] @@ -580,18 +580,29 @@ version = "0.16.0" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "bitflags 1.0.3 (registry+https://github.com/rust-lang/crates.io-index)", - "core-foundation 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)", + "core-foundation 0.6.2 (registry+https://github.com/rust-lang/crates.io-index)", + "foreign-types 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.2.42 (registry+https://github.com/rust-lang/crates.io-index)", +] + +[[package]] +name = "core-graphics" +version = "0.17.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +dependencies = [ + "bitflags 1.0.3 (registry+https://github.com/rust-lang/crates.io-index)", + "core-foundation 0.6.2 (registry+https://github.com/rust-lang/crates.io-index)", "foreign-types 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)", "libc 0.2.42 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] name = "core-text" -version = "11.0.0" +version = "13.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "core-foundation 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)", - "core-graphics 0.16.0 (registry+https://github.com/rust-lang/crates.io-index)", + "core-foundation 0.6.2 (registry+https://github.com/rust-lang/crates.io-index)", + "core-graphics 0.17.2 (registry+https://github.com/rust-lang/crates.io-index)", "foreign-types 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)", "libc 0.2.42 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -816,7 +827,7 @@ version = "1.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "libc 0.2.42 (registry+https://github.com/rust-lang/crates.io-index)", - "winapi 0.3.5 (registry+https://github.com/rust-lang/crates.io-index)", + "winapi 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -863,16 +874,14 @@ dependencies = [ [[package]] name = "dwrote" -version = "0.4.2" +version = "0.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "gdi32-sys 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)", - "kernel32-sys 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)", "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)", "serde 1.0.66 (registry+https://github.com/rust-lang/crates.io-index)", "serde_derive 1.0.66 (registry+https://github.com/rust-lang/crates.io-index)", - "winapi 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)", + "winapi 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -1123,10 +1132,10 @@ dependencies = [ "app_units 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)", "bitflags 1.0.3 (registry+https://github.com/rust-lang/crates.io-index)", "byteorder 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)", - "core-foundation 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)", - "core-graphics 0.16.0 (registry+https://github.com/rust-lang/crates.io-index)", - "core-text 11.0.0 (registry+https://github.com/rust-lang/crates.io-index)", - "dwrote 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)", + "core-foundation 0.6.2 (registry+https://github.com/rust-lang/crates.io-index)", + "core-graphics 0.17.2 (registry+https://github.com/rust-lang/crates.io-index)", + "core-text 13.1.0 (registry+https://github.com/rust-lang/crates.io-index)", + "dwrote 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)", "euclid 0.19.0 (registry+https://github.com/rust-lang/crates.io-index)", "fnv 1.0.5 (registry+https://github.com/rust-lang/crates.io-index)", "fontsan 0.4.0 (git+https://github.com/servo/fontsan)", @@ -1191,7 +1200,7 @@ dependencies = [ [[package]] name = "gleam" -version = "0.6.0" +version = "0.6.2" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "gl_generator 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)", @@ -1231,7 +1240,7 @@ dependencies = [ "android_glue 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)", "cgl 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)", "cocoa 0.17.0 (registry+https://github.com/rust-lang/crates.io-index)", - "core-foundation 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)", + "core-foundation 0.6.2 (registry+https://github.com/rust-lang/crates.io-index)", "core-graphics 0.16.0 (registry+https://github.com/rust-lang/crates.io-index)", "gl_generator 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)", "lazy_static 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)", @@ -1240,7 +1249,7 @@ dependencies = [ "osmesa-sys 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)", "shared_library 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)", "wayland-client 0.20.10 (registry+https://github.com/rust-lang/crates.io-index)", - "winapi 0.3.5 (registry+https://github.com/rust-lang/crates.io-index)", + "winapi 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)", "winit 0.17.0 (registry+https://github.com/rust-lang/crates.io-index)", "x11-dl 2.18.3 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -1617,8 +1626,8 @@ version = "0.11.1" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "cgl 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)", - "core-foundation 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)", - "gleam 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)", + "core-foundation 0.6.2 (registry+https://github.com/rust-lang/crates.io-index)", + "gleam 0.6.2 (registry+https://github.com/rust-lang/crates.io-index)", "leaky-cow 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", "libc 0.2.42 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -1876,7 +1885,7 @@ version = "0.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "cc 1.0.18 (registry+https://github.com/rust-lang/crates.io-index)", - "winapi 0.3.5 (registry+https://github.com/rust-lang/crates.io-index)", + "winapi 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -1898,7 +1907,7 @@ dependencies = [ "euclid 0.19.0 (registry+https://github.com/rust-lang/crates.io-index)", "gaol 0.0.1 (git+https://github.com/servo/gaol)", "gfx 0.0.1", - "gleam 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)", + "gleam 0.6.2 (registry+https://github.com/rust-lang/crates.io-index)", "ipc-channel 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)", "layout_thread 0.0.1", "log 0.4.5 (registry+https://github.com/rust-lang/crates.io-index)", @@ -1936,7 +1945,7 @@ dependencies = [ "libservo 0.0.1", "log 0.4.5 (registry+https://github.com/rust-lang/crates.io-index)", "serde_json 1.0.13 (registry+https://github.com/rust-lang/crates.io-index)", - "winapi 0.3.5 (registry+https://github.com/rust-lang/crates.io-index)", + "winapi 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -2071,7 +2080,7 @@ version = "0.6.2" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "libc 0.2.42 (registry+https://github.com/rust-lang/crates.io-index)", - "winapi 0.3.5 (registry+https://github.com/rust-lang/crates.io-index)", + "winapi 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -2232,7 +2241,7 @@ version = "0.1.6" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "time 0.1.37 (registry+https://github.com/rust-lang/crates.io-index)", - "winapi 0.3.5 (registry+https://github.com/rust-lang/crates.io-index)", + "winapi 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -2302,7 +2311,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "cfg-if 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)", "libc 0.2.42 (registry+https://github.com/rust-lang/crates.io-index)", - "winapi 0.3.5 (registry+https://github.com/rust-lang/crates.io-index)", + "winapi 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -2452,17 +2461,17 @@ version = "0.21.0" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "cgl 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)", - "core-foundation 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)", + "core-foundation 0.6.2 (registry+https://github.com/rust-lang/crates.io-index)", "euclid 0.19.0 (registry+https://github.com/rust-lang/crates.io-index)", "gl_generator 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)", - "gleam 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)", + "gleam 0.6.2 (registry+https://github.com/rust-lang/crates.io-index)", "lazy_static 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)", "libloading 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)", "log 0.4.5 (registry+https://github.com/rust-lang/crates.io-index)", "objc 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)", "osmesa-sys 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)", "serde 1.0.66 (registry+https://github.com/rust-lang/crates.io-index)", - "winapi 0.3.5 (registry+https://github.com/rust-lang/crates.io-index)", + "winapi 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)", "x11 2.17.3 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -2554,7 +2563,7 @@ dependencies = [ "libc 0.2.42 (registry+https://github.com/rust-lang/crates.io-index)", "rand 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)", "smallvec 0.6.3 (registry+https://github.com/rust-lang/crates.io-index)", - "winapi 0.3.5 (registry+https://github.com/rust-lang/crates.io-index)", + "winapi 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -2618,7 +2627,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" [[package]] name = "plane-split" -version = "0.13.0" +version = "0.13.2" 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)", @@ -2753,7 +2762,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "fuchsia-zircon 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)", "libc 0.2.42 (registry+https://github.com/rust-lang/crates.io-index)", - "winapi 0.3.5 (registry+https://github.com/rust-lang/crates.io-index)", + "winapi 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -2765,7 +2774,7 @@ dependencies = [ "fuchsia-zircon 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)", "libc 0.2.42 (registry+https://github.com/rust-lang/crates.io-index)", "rand_core 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)", - "winapi 0.3.5 (registry+https://github.com/rust-lang/crates.io-index)", + "winapi 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -2852,7 +2861,7 @@ name = "remove_dir_all" version = "0.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "winapi 0.3.5 (registry+https://github.com/rust-lang/crates.io-index)", + "winapi 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -2915,7 +2924,7 @@ name = "same-file" version = "1.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "winapi 0.3.5 (registry+https://github.com/rust-lang/crates.io-index)", + "winapi 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -2953,7 +2962,7 @@ dependencies = [ "enum-iterator 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)", "euclid 0.19.0 (registry+https://github.com/rust-lang/crates.io-index)", "fnv 1.0.5 (registry+https://github.com/rust-lang/crates.io-index)", - "gleam 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)", + "gleam 0.6.2 (registry+https://github.com/rust-lang/crates.io-index)", "half 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)", "html5ever 0.22.3 (registry+https://github.com/rust-lang/crates.io-index)", "hyper 0.10.13 (registry+https://github.com/rust-lang/crates.io-index)", @@ -3169,7 +3178,7 @@ dependencies = [ "crossbeam-channel 0.2.5 (registry+https://github.com/rust-lang/crates.io-index)", "euclid 0.19.0 (registry+https://github.com/rust-lang/crates.io-index)", "gdi32-sys 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)", - "gleam 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)", + "gleam 0.6.2 (registry+https://github.com/rust-lang/crates.io-index)", "glutin 0.18.0 (registry+https://github.com/rust-lang/crates.io-index)", "lazy_static 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)", "libservo 0.0.1", @@ -3285,7 +3294,7 @@ dependencies = [ "cmake 0.1.29 (registry+https://github.com/rust-lang/crates.io-index)", "euclid 0.19.0 (registry+https://github.com/rust-lang/crates.io-index)", "expat-sys 2.1.6 (registry+https://github.com/rust-lang/crates.io-index)", - "gleam 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)", + "gleam 0.6.2 (registry+https://github.com/rust-lang/crates.io-index)", "glutin 0.18.0 (registry+https://github.com/rust-lang/crates.io-index)", "glx 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)", "io-surface 0.11.1 (registry+https://github.com/rust-lang/crates.io-index)", @@ -3684,7 +3693,7 @@ dependencies = [ "rand 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)", "redox_syscall 0.1.17 (registry+https://github.com/rust-lang/crates.io-index)", "remove_dir_all 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)", - "winapi 0.3.5 (registry+https://github.com/rust-lang/crates.io-index)", + "winapi 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -3934,7 +3943,7 @@ version = "2.1.4" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "same-file 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)", - "winapi 0.3.5 (registry+https://github.com/rust-lang/crates.io-index)", + "winapi 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -4029,7 +4038,7 @@ dependencies = [ [[package]] name = "webrender" version = "0.57.2" -source = "git+https://github.com/servo/webrender#9156a4465f6ad715a0206cdd9a7e9a6f0385fbd6" +source = "git+https://github.com/servo/webrender#923ee495bd9b0fda8a4a94c5a6cf42e2f0548731" 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)", @@ -4037,19 +4046,19 @@ dependencies = [ "bitflags 1.0.3 (registry+https://github.com/rust-lang/crates.io-index)", "byteorder 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)", "cfg-if 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)", - "core-foundation 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)", - "core-graphics 0.16.0 (registry+https://github.com/rust-lang/crates.io-index)", - "core-text 11.0.0 (registry+https://github.com/rust-lang/crates.io-index)", - "dwrote 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)", + "core-foundation 0.6.2 (registry+https://github.com/rust-lang/crates.io-index)", + "core-graphics 0.17.2 (registry+https://github.com/rust-lang/crates.io-index)", + "core-text 13.1.0 (registry+https://github.com/rust-lang/crates.io-index)", + "dwrote 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)", "euclid 0.19.0 (registry+https://github.com/rust-lang/crates.io-index)", "freetype 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)", "fxhash 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)", - "gleam 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)", + "gleam 0.6.2 (registry+https://github.com/rust-lang/crates.io-index)", "image 0.19.0 (registry+https://github.com/rust-lang/crates.io-index)", "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.13.0 (registry+https://github.com/rust-lang/crates.io-index)", + "plane-split 0.13.2 (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,15 +4073,15 @@ dependencies = [ [[package]] name = "webrender_api" version = "0.57.2" -source = "git+https://github.com/servo/webrender#9156a4465f6ad715a0206cdd9a7e9a6f0385fbd6" +source = "git+https://github.com/servo/webrender#923ee495bd9b0fda8a4a94c5a6cf42e2f0548731" 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)", "bitflags 1.0.3 (registry+https://github.com/rust-lang/crates.io-index)", "byteorder 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)", - "core-foundation 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)", - "core-graphics 0.16.0 (registry+https://github.com/rust-lang/crates.io-index)", - "dwrote 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)", + "core-foundation 0.6.2 (registry+https://github.com/rust-lang/crates.io-index)", + "core-graphics 0.17.2 (registry+https://github.com/rust-lang/crates.io-index)", + "dwrote 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)", "euclid 0.19.0 (registry+https://github.com/rust-lang/crates.io-index)", "ipc-channel 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)", "serde 1.0.66 (registry+https://github.com/rust-lang/crates.io-index)", @@ -4122,7 +4131,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" [[package]] name = "winapi" -version = "0.3.5" +version = "0.3.6" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "winapi-i686-pc-windows-gnu 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)", @@ -4149,7 +4158,7 @@ name = "wincolor" version = "0.1.6" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "winapi 0.3.5 (registry+https://github.com/rust-lang/crates.io-index)", + "winapi 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -4159,7 +4168,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "android_glue 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)", "cocoa 0.17.0 (registry+https://github.com/rust-lang/crates.io-index)", - "core-foundation 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)", + "core-foundation 0.6.2 (registry+https://github.com/rust-lang/crates.io-index)", "core-graphics 0.16.0 (registry+https://github.com/rust-lang/crates.io-index)", "image 0.19.0 (registry+https://github.com/rust-lang/crates.io-index)", "lazy_static 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)", @@ -4170,7 +4179,7 @@ dependencies = [ "percent-encoding 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)", "smithay-client-toolkit 0.2.6 (registry+https://github.com/rust-lang/crates.io-index)", "wayland-client 0.20.10 (registry+https://github.com/rust-lang/crates.io-index)", - "winapi 0.3.5 (registry+https://github.com/rust-lang/crates.io-index)", + "winapi 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)", "x11-dl 2.18.3 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -4336,10 +4345,11 @@ dependencies = [ "checksum color_quant 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "a475fc4af42d83d28adf72968d9bcfaf035a1a9381642d8e85d8a04957767b0d" "checksum combine 3.5.2 (registry+https://github.com/rust-lang/crates.io-index)" = "54cedd8056314afe0d844a37a207007edf8a45f2cc452fd77629cd63c221740e" "checksum cookie 0.10.1 (registry+https://github.com/rust-lang/crates.io-index)" = "746858cae4eae40fff37e1998320068df317bc247dc91a67c6cfa053afdc2abb" -"checksum core-foundation 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)" = "c7caa6cb9e76ddddbea09a03266d6b3bc98cd41e9fb9b017c473e7cca593ec25" -"checksum core-foundation-sys 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)" = "b2a53cce0ddcf7e7e1f998738d757d5a3bf08bf799a180e50ebe50d298f52f5a" +"checksum core-foundation 0.6.2 (registry+https://github.com/rust-lang/crates.io-index)" = "58667b9a618a37ea8c4c4cb5298703e5dfadcd3698c79f54fc43e6a2e94733ea" +"checksum core-foundation-sys 0.6.2 (registry+https://github.com/rust-lang/crates.io-index)" = "e7ca8a5221364ef15ce201e8ed2f609fc312682a8f4e0e3d4aa5879764e0fa3b" "checksum core-graphics 0.16.0 (registry+https://github.com/rust-lang/crates.io-index)" = "92801c908ea6301ae619ed842a72e01098085fc321b9c2f3f833dad555bba055" -"checksum core-text 11.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "157ff38a92496dc676ce36d9124554e9ac66f1c1039f952690ac64f71cfa5968" +"checksum core-graphics 0.17.2 (registry+https://github.com/rust-lang/crates.io-index)" = "46a1b26242df9c08350ffede6684753773eab42289745f618fc42c2f41486ffa" +"checksum core-text 13.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "a6705907bc253cee90b8551017836ce50904be305c99fec5ea74a8d72d799e58" "checksum crc 1.8.1 (registry+https://github.com/rust-lang/crates.io-index)" = "d663548de7f5cca343f1e0a48d14dcfb0e9eb4e079ec58883b7251539fa10aeb" "checksum crossbeam-channel 0.2.5 (registry+https://github.com/rust-lang/crates.io-index)" = "a5716fadb87a5633db34c5e83ee6e036e6edc229f8a6bfb7c7c84ed340ba95df" "checksum crossbeam-deque 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "f739f8c5363aca78cfb059edf753d8f0d36908c348f3d8d1503f03d8b75d9cf3" @@ -4360,7 +4370,7 @@ dependencies = [ "checksum downcast-rs 1.0.3 (registry+https://github.com/rust-lang/crates.io-index)" = "18df8ce4470c189d18aa926022da57544f31e154631eb4cfe796aea97051fe6c" "checksum dtoa 0.4.1 (registry+https://github.com/rust-lang/crates.io-index)" = "80c8b71fd71146990a9742fc06dcbbde19161a267e0ad4e572c35162f4578c90" "checksum dtoa-short 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)" = "fe6f727b406462fd57c95fed84d1b0dbfb5f0136fcac005adba9ea0367c05cc8" -"checksum dwrote 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)" = "b26e30aaa6bf31ec830db15fec14ed04f0f2ecfcc486ecfce88c55d3389b237f" +"checksum dwrote 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)" = "30a998e9ff70cd208ccdc4f864e998688bf61d7b897dccec8e17a884d17358bf" "checksum either 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "18785c1ba806c258137c937e44ada9ee7e69a37e3c72077542cd2f069d78562a" "checksum encoding_rs 0.7.1 (registry+https://github.com/rust-lang/crates.io-index)" = "f5215aabf22b83153be3ee44dfe3f940214541b2ce13d419c55e7a115c8c51a9" "checksum energy-monitor 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "fe872d0664f1cc60db36349af245d892ee67d3c8f78055df0ebc43271fd4e05c" @@ -4390,7 +4400,7 @@ dependencies = [ "checksum getopts 0.2.17 (registry+https://github.com/rust-lang/crates.io-index)" = "b900c08c1939860ce8b54dc6a89e26e00c04c380fd0e09796799bd7f12861e05" "checksum gif 0.10.0 (registry+https://github.com/rust-lang/crates.io-index)" = "ff3414b424657317e708489d2857d9575f4403698428b040b609b9d1c1a84a2c" "checksum gl_generator 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)" = "7a795170cbd85b5a7baa58d6d7525cae6a03e486859860c220f7ebbbdd379d0a" -"checksum gleam 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)" = "0d41e7ac812597988fdae31c9baec3c6d35cadb8ad9ab88a9bf9c0f119ed66c2" +"checksum gleam 0.6.2 (registry+https://github.com/rust-lang/crates.io-index)" = "24ba6539d49223f6bca4f076d9490c001bdbfe07d59cb0ad4079033c75bdc92d" "checksum glib 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)" = "740f7fda8dde5f5e3944dabdb4a73ac6094a8a7fdf0af377468e98ca93733e61" "checksum glib-sys 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)" = "3573351e846caed9f11207b275cd67bc07f0c2c94fb628e5d7c92ca056c7882d" "checksum glob 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)" = "8be18de09a56b60ed0edf84bc9df007e30040691af7acd1c41874faac5895bfb" @@ -4506,7 +4516,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.13.0 (registry+https://github.com/rust-lang/crates.io-index)" = "64d766f38b15fe1337bdddfc869ef5c50437323f857aaaadc6490197db80a1b8" +"checksum plane-split 0.13.2 (registry+https://github.com/rust-lang/crates.io-index)" = "d252db71f3d2109c4936e87d9f29f3c737e89f9ac239999d78866bdd60b9deda" "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" @@ -4619,7 +4629,7 @@ dependencies = [ "checksum webrender_api 0.57.2 (git+https://github.com/servo/webrender)" = "" "checksum which 1.0.3 (registry+https://github.com/rust-lang/crates.io-index)" = "4be6cfa54dab45266e98b5d7be2f8ce959ddd49abd141a05d52dce4b07f803bb" "checksum winapi 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)" = "167dc9d6949a9b857f3451275e911c3f44255842c1f7a76f33c55103a909087a" -"checksum winapi 0.3.5 (registry+https://github.com/rust-lang/crates.io-index)" = "773ef9dcc5f24b7d850d0ff101e542ff24c3b090a9768e03ff889fdef41f00fd" +"checksum winapi 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)" = "92c1eb33641e276cfa214a0522acad57be5c56b10cb348b3c5117db75f3ac4b0" "checksum winapi-build 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "2d315eee3b34aca4797b2da6b13ed88266e6d612562a0c46390af8299fc699bc" "checksum winapi-i686-pc-windows-gnu 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6" "checksum winapi-x86_64-pc-windows-gnu 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" diff --git a/components/gfx/Cargo.toml b/components/gfx/Cargo.toml index 2a09114f8f6..a657d802ea0 100644 --- a/components/gfx/Cargo.toml +++ b/components/gfx/Cargo.toml @@ -48,8 +48,8 @@ ucd = "0.1.1" [target.'cfg(target_os = "macos")'.dependencies] byteorder = "1.0" core-foundation = "0.6" -core-graphics = "0.16" -core-text = "11.0" +core-graphics = "0.17" +core-text = "13.0" [target.'cfg(any(target_os = "linux", target_os = "android"))'.dependencies] freetype = "0.4" @@ -62,5 +62,5 @@ servo-fontconfig = "0.2.1" xml5ever = {version = "0.12"} [target.'cfg(target_os = "windows")'.dependencies] -dwrote = "0.4" +dwrote = "0.5" truetype = "0.26" diff --git a/components/gfx/platform/macos/font.rs b/components/gfx/platform/macos/font.rs index 842c52fd70c..dca2175c5ab 100644 --- a/components/gfx/platform/macos/font.rs +++ b/components/gfx/platform/macos/font.rs @@ -235,9 +235,11 @@ impl FontHandleMethods for FontHandle { let mut glyphs: [CGGlyph; 1] = [0 as CGGlyph]; let count: CFIndex = 1; - let result = self - .ctfont - .get_glyphs_for_characters(&characters[0], &mut glyphs[0], count); + let result = unsafe { + self + .ctfont + .get_glyphs_for_characters(&characters[0], &mut glyphs[0], count) + }; if !result { // No glyph for this character @@ -263,12 +265,14 @@ impl FontHandleMethods for FontHandle { fn glyph_h_advance(&self, glyph: GlyphId) -> Option { let glyphs = [glyph as CGGlyph]; - let advance = self.ctfont.get_advances_for_glyphs( - kCTFontDefaultOrientation, - &glyphs[0], - ptr::null_mut(), - 1, - ); + let advance = unsafe { + self.ctfont.get_advances_for_glyphs( + kCTFontDefaultOrientation, + &glyphs[0], + ptr::null_mut(), + 1, + ) + }; Some(advance as FractionalPixel) } diff --git a/components/gfx/platform/macos/font_list.rs b/components/gfx/platform/macos/font_list.rs index df78a3917c8..44412771bee 100644 --- a/components/gfx/platform/macos/font_list.rs +++ b/components/gfx/platform/macos/font_list.rs @@ -24,9 +24,10 @@ where let family_collection = core_text::font_collection::create_for_family(family_name); if let Some(family_collection) = family_collection { - let family_descriptors = family_collection.get_descriptors(); - for family_descriptor in family_descriptors.iter() { - callback(family_descriptor.font_name()); + if let Some(family_descriptors) = family_collection.get_descriptors() { + for family_descriptor in family_descriptors.iter() { + callback(family_descriptor.font_name()); + } } } } diff --git a/components/layout/display_list/background.rs b/components/layout/display_list/background.rs index 3c75c250405..19976a3bf83 100644 --- a/components/layout/display_list/background.rs +++ b/components/layout/display_list/background.rs @@ -36,8 +36,8 @@ use style::values::generics::image::EndingShape as GenericEndingShape; use style::values::generics::image::GradientItem as GenericGradientItem; use style::values::specified::background::BackgroundRepeatKeyword; use style::values::specified::position::{X, Y}; -use webrender_api::{BorderRadius, BorderSide, BorderStyle, BorderWidths, ColorF}; -use webrender_api::{ExtendMode, Gradient, GradientStop, LayoutSize}; +use webrender_api::{BorderRadius, BorderSide, BorderStyle, ColorF}; +use webrender_api::{ExtendMode, Gradient, GradientStop, LayoutSize, LayoutSideOffsets}; use webrender_api::{NormalBorder, RadialGradient}; /// A helper data structure for gradients. @@ -771,6 +771,7 @@ pub fn simple_normal_border(color: ColorF, style: BorderStyle) -> NormalBorder { top: side, bottom: side, radius: BorderRadius::zero(), + do_aa: true, } } @@ -834,13 +835,13 @@ fn calculate_border_image_width_side( pub fn calculate_border_image_width( width: &BorderImageWidth, - border: BorderWidths, + border: LayoutSideOffsets, border_area: Size2D, -) -> BorderWidths { - BorderWidths { - left: calculate_border_image_width_side(width.3, border.left, border_area.width), - top: calculate_border_image_width_side(width.0, border.top, border_area.height), - right: calculate_border_image_width_side(width.1, border.right, border_area.width), - bottom: calculate_border_image_width_side(width.2, border.bottom, border_area.height), - } +) -> LayoutSideOffsets { + LayoutSideOffsets::new( + calculate_border_image_width_side(width.0, border.top, border_area.height), + calculate_border_image_width_side(width.1, border.right, border_area.width), + calculate_border_image_width_side(width.2, border.bottom, border_area.height), + calculate_border_image_width_side(width.3, border.left, border_area.width), + ) } diff --git a/components/layout/display_list/builder.rs b/components/layout/display_list/builder.rs index 1b97b35b471..d8b78a4310b 100644 --- a/components/layout/display_list/builder.rs +++ b/components/layout/display_list/builder.rs @@ -1367,6 +1367,7 @@ impl FragmentDisplayListBuilding for Fragment { style: border_style.bottom.to_layout(), }, radius: border_radius, + do_aa: true, }); state.add_display_item(DisplayItem::Border(CommonDisplayItem::with_data( base, diff --git a/components/layout/display_list/conversions.rs b/components/layout/display_list/conversions.rs index b8c5a8e98b6..a40dadb0eb9 100644 --- a/components/layout/display_list/conversions.rs +++ b/components/layout/display_list/conversions.rs @@ -129,14 +129,14 @@ impl ToLayout for Rect { } impl ToLayout for SideOffsets2D { - type Type = wr::BorderWidths; + type Type = wr::LayoutSideOffsets; fn to_layout(&self) -> Self::Type { - wr::BorderWidths { - left: self.left.to_f32_px(), - top: self.top.to_f32_px(), - right: self.right.to_f32_px(), - bottom: self.bottom.to_f32_px(), - } + wr::LayoutSideOffsets::new( + self.top.to_f32_px(), + self.right.to_f32_px(), + self.bottom.to_f32_px(), + self.left.to_f32_px(), + ) } } diff --git a/components/layout/display_list/webrender_helpers.rs b/components/layout/display_list/webrender_helpers.rs index 4cb6dd17de4..cb386daa748 100644 --- a/components/layout/display_list/webrender_helpers.rs +++ b/components/layout/display_list/webrender_helpers.rs @@ -10,7 +10,7 @@ use display_list::items::{ClipScrollNode, ClipScrollNodeIndex, ClipScrollNodeType}; use display_list::items::{DisplayItem, DisplayList, StackingContextType}; use msg::constellation_msg::PipelineId; -use webrender_api::{self, ClipAndScrollInfo, ClipId, DisplayListBuilder, GlyphRasterSpace}; +use webrender_api::{self, ClipAndScrollInfo, ClipId, DisplayListBuilder, RasterSpace}; use webrender_api::LayoutPoint; pub trait WebRenderDisplayListConverter { @@ -253,7 +253,7 @@ impl WebRenderDisplayItemConverter for DisplayItem { stacking_context.transform_style, stacking_context.mix_blend_mode, stacking_context.filters.clone(), - GlyphRasterSpace::Screen, + RasterSpace::Screen, ); if stacking_context.established_reference_frame.is_some() { diff --git a/components/malloc_size_of/lib.rs b/components/malloc_size_of/lib.rs index 72b7f81595a..dcc45949133 100644 --- a/components/malloc_size_of/lib.rs +++ b/components/malloc_size_of/lib.rs @@ -915,8 +915,6 @@ malloc_size_of_is_0!(webrender_api::BorderRadius); #[cfg(feature = "webrender_api")] malloc_size_of_is_0!(webrender_api::BorderStyle); #[cfg(feature = "webrender_api")] -malloc_size_of_is_0!(webrender_api::BorderWidths); -#[cfg(feature = "webrender_api")] malloc_size_of_is_0!(webrender_api::BoxShadowClipMode); #[cfg(feature = "webrender_api")] malloc_size_of_is_0!(webrender_api::ClipAndScrollInfo); diff --git a/components/servo/lib.rs b/components/servo/lib.rs index 9bd7623df47..f9eee1d937c 100644 --- a/components/servo/lib.rs +++ b/components/servo/lib.rs @@ -103,7 +103,7 @@ use std::borrow::Cow; use std::cmp::max; use std::path::PathBuf; use std::rc::Rc; -use webrender::RendererKind; +use webrender::{RendererKind, ShaderPrecacheFlags}; use webvr::{WebVRThread, WebVRCompositorHandler}; pub use gleam::gl; @@ -190,12 +190,16 @@ where enable_aa: opts.enable_text_antialiasing, debug_flags: debug_flags, recorder: recorder, - precache_shaders: opts.precache_shaders, - enable_scrollbars: opts.output_file.is_none(), + precache_flags: if opts.precache_shaders { + ShaderPrecacheFlags::FULL_COMPILE + } else { + ShaderPrecacheFlags::empty() + }, renderer_kind: renderer_kind, enable_subpixel_aa: opts.enable_subpixel_text_antialiasing, ..Default::default() }, + None, ).expect("Unable to initialize webrender!") }; diff --git a/servo-tidy.toml b/servo-tidy.toml index 471bb629dcd..c951cdc65ea 100644 --- a/servo-tidy.toml +++ b/servo-tidy.toml @@ -33,6 +33,7 @@ rand = [ # Ignored packages with duplicated versions packages = [ "bitflags", + "core-graphics", "crossbeam-epoch", "crossbeam-utils", "log", diff --git a/tests/wpt/metadata/css/CSS2/borders/groove-default.html.ini b/tests/wpt/metadata/css/CSS2/borders/groove-default.html.ini deleted file mode 100644 index 4fad9155e45..00000000000 --- a/tests/wpt/metadata/css/CSS2/borders/groove-default.html.ini +++ /dev/null @@ -1,2 +0,0 @@ -[groove-default.html] - 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 deleted file mode 100644 index b203ab01436..00000000000 --- a/tests/wpt/metadata/css/css-transforms/matrix/svg-matrix-061.html.ini +++ /dev/null @@ -1,2 +0,0 @@ -[svg-matrix-061.html] - expected: FAIL diff --git a/tests/wpt/metadata/css/cssom-view/scroll-behavior-smooth.html.ini b/tests/wpt/metadata/css/cssom-view/scroll-behavior-smooth.html.ini deleted file mode 100644 index bcd187f508c..00000000000 --- a/tests/wpt/metadata/css/cssom-view/scroll-behavior-smooth.html.ini +++ /dev/null @@ -1,8 +0,0 @@ -[scroll-behavior-smooth.html] - expected: ERROR - [scroll-behavior: smooth on DIV element] - expected: FAIL - - [Instant scrolling while doing history navigation.] - expected: FAIL - From 8a2eec27141af43e300d259670f8cbf17ca01607 Mon Sep 17 00:00:00 2001 From: Josh Matthews Date: Tue, 9 Oct 2018 17:09:46 -0400 Subject: [PATCH 3/4] Use upstream font weight values for windows. --- components/gfx/platform/windows/font.rs | 16 +--------------- 1 file changed, 1 insertion(+), 15 deletions(-) diff --git a/components/gfx/platform/windows/font.rs b/components/gfx/platform/windows/font.rs index 074bc62748a..a50fea14986 100644 --- a/components/gfx/platform/windows/font.rs +++ b/components/gfx/platform/windows/font.rs @@ -209,21 +209,7 @@ impl FontInfo { FontStyle::Oblique => GenericFontStyle::Oblique(StyleFontStyle::default_angle()), FontStyle::Italic => GenericFontStyle::Italic, }; - let weight = StyleFontWeight(match font.weight() { - FontWeight::Thin => 100., - FontWeight::ExtraLight => 200., - FontWeight::Light => 300., - // slightly grayer gray - FontWeight::SemiLight => 300., - FontWeight::Regular => 400., - FontWeight::Medium => 500., - FontWeight::SemiBold => 600., - FontWeight::Bold => 700., - FontWeight::ExtraBold => 800., - FontWeight::Black => 900., - // slightly blacker black - FontWeight::ExtraBlack => 1000., - }); + let weight = StyleFontWeight(font.weight().to_u32() as f32); let stretch = StyleFontStretch(NonNegative( match font.stretch() { FontStretch::Undefined => FontStretchKeyword::Normal, From 4e5b3bcf15988088fd8d86e4aad9c04b7a863c41 Mon Sep 17 00:00:00 2001 From: Josh Matthews Date: Thu, 11 Oct 2018 16:35:29 -0400 Subject: [PATCH 4/4] Fix windows build errors. --- components/gfx/platform/windows/font.rs | 23 ++++++++++++++++++++--- 1 file changed, 20 insertions(+), 3 deletions(-) diff --git a/components/gfx/platform/windows/font.rs b/components/gfx/platform/windows/font.rs index a50fea14986..26490d9c52c 100644 --- a/components/gfx/platform/windows/font.rs +++ b/components/gfx/platform/windows/font.rs @@ -9,13 +9,15 @@ use app_units::Au; use dwrote; use dwrote::{Font, FontFace, FontFile}; -use dwrote::{FontWeight, FontStretch, FontStyle}; +use dwrote::{FontStretch, FontStyle}; use font::{FontHandleMethods, FontMetrics, FontTableMethods}; use font::{FontTableTag, FractionalPixel}; use platform::font_template::FontTemplateData; use platform::windows::font_context::FontContextHandle; use platform::windows::font_list::font_from_atom; use servo_atoms::Atom; +use std::fmt; +use std::ops::Deref; use std::sync::Arc; use style::computed_values::font_stretch::T as StyleFontStretch; use style::computed_values::font_weight::T as StyleFontWeight; @@ -238,7 +240,7 @@ impl FontInfo { #[derive(Debug)] pub struct FontHandle { font_data: Arc, - face: FontFace, + face: Nondebug, info: FontInfo, em_size: f32, du_per_em: f32, @@ -246,6 +248,21 @@ pub struct FontHandle { scaled_du_to_px: f32, } +struct Nondebug(T); + +impl fmt::Debug for Nondebug { + fn fmt(&self, _f: &mut fmt::Formatter) -> fmt::Result { + Ok(()) + } +} + +impl Deref for Nondebug { + type Target = T; + fn deref(&self) -> &T { + &self.0 + } +} + impl FontHandle {} impl FontHandleMethods for FontHandle { @@ -284,7 +301,7 @@ impl FontHandleMethods for FontHandle { Ok(FontHandle { font_data: template.clone(), - face: face, + face: Nondebug(face), info: info, em_size: em_size, du_per_em: du_per_em,