servo: Merge #18735 - Update WR (clip masks on angle gradients, fix clips on transformed images) (from glennw:update-wr-angle-clips); r=mbrubeck
authorGlenn Watson <github@intuitionlibrary.com>
Wed, 04 Oct 2017 17:09:40 -0500
changeset 384587 9769b8b1027e1b8428a74f43298e2deba15cce1a
parent 384586 645f013cd54f5c2b621a77e15c6a2b259d9d0a55
child 384588 5ead3eb427c78aff76aba9bba21df9142a421901
push id32631
push userarchaeopteryx@coole-files.de
push dateThu, 05 Oct 2017 08:51:33 +0000
treeherdermozilla-central@66042a706980 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersmbrubeck
bugs18735
milestone58.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
servo: Merge #18735 - Update WR (clip masks on angle gradients, fix clips on transformed images) (from glennw:update-wr-angle-clips); r=mbrubeck Source-Repo: https://github.com/servo/servo Source-Revision: 22685465156a07eadca0edfcc5eca119f3ec4681
servo/Cargo.lock
servo/components/layout/webrender_helpers.rs
--- a/servo/Cargo.lock
+++ b/servo/Cargo.lock
@@ -3608,17 +3608,17 @@ dependencies = [
  "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)",
  "webdriver 0.22.0 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
 name = "webrender"
 version = "0.52.0"
-source = "git+https://github.com/servo/webrender#8ce0212a0d5c9b32b1ba11a6b20014e88321c605"
+source = "git+https://github.com/servo/webrender#29d325f54bbead84e97dcf7dc536463c45f8eece"
 dependencies = [
  "app_units 0.5.6 (registry+https://github.com/rust-lang/crates.io-index)",
  "bincode 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "bitflags 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)",
  "byteorder 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "core-foundation 0.4.4 (registry+https://github.com/rust-lang/crates.io-index)",
  "core-graphics 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)",
  "core-text 7.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -3636,17 +3636,17 @@ dependencies = [
  "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.0 (git+https://github.com/servo/webrender)",
 ]
 
 [[package]]
 name = "webrender_api"
 version = "0.52.0"
-source = "git+https://github.com/servo/webrender#8ce0212a0d5c9b32b1ba11a6b20014e88321c605"
+source = "git+https://github.com/servo/webrender#29d325f54bbead84e97dcf7dc536463c45f8eece"
 dependencies = [
  "app_units 0.5.6 (registry+https://github.com/rust-lang/crates.io-index)",
  "bincode 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "bitflags 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)",
  "byteorder 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "core-foundation 0.4.4 (registry+https://github.com/rust-lang/crates.io-index)",
  "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)",
--- a/servo/components/layout/webrender_helpers.rs
+++ b/servo/components/layout/webrender_helpers.rs
@@ -453,25 +453,25 @@ impl WebRenderDisplayItemConverter for D
                                         item.color,
                                         item.blur_radius.to_f32_px(),
                                         item.spread_radius.to_f32_px(),
                                         item.border_radius.to_f32_px(),
                                         item.clip_mode.to_clip_mode());
             }
             DisplayItem::PushTextShadow(ref item) => {
                 let rect = item.base.bounds;
-                builder.push_text_shadow(&prim_info(rect, Some(item.base.local_clip)),
-                                         webrender_api::TextShadow {
-                                             blur_radius: item.blur_radius.to_f32_px(),
-                                             offset: item.offset.to_vectorf(),
-                                             color: item.color,
-                                         });
+                builder.push_shadow(&prim_info(rect, Some(item.base.local_clip)),
+                                    webrender_api::Shadow {
+                                        blur_radius: item.blur_radius.to_f32_px(),
+                                        offset: item.offset.to_vectorf(),
+                                        color: item.color,
+                                    });
             }
             DisplayItem::PopTextShadow(_) => {
-                builder.pop_text_shadow();
+                builder.pop_shadow();
             }
             DisplayItem::Iframe(ref item) => {
                 let rect = item.base.bounds;
                 let pipeline_id = item.iframe.to_webrender();
                 builder.push_iframe(&prim_info(rect, Some(item.base.local_clip)), pipeline_id);
             }
             DisplayItem::PushStackingContext(ref item) => {
                 let stacking_context = &item.stacking_context;