aboutsummaryrefslogtreecommitdiffstats
path: root/tests
diff options
context:
space:
mode:
authorbors-servo <lbergstrom+bors@mozilla.com>2019-07-12 08:10:31 -0400
committerGitHub <noreply@github.com>2019-07-12 08:10:31 -0400
commitdf73c71fb18c144abedd6889c34dd1031ffcbb8e (patch)
treea5d41e6bf6a78b390fb7e0b2bb1f5ed22c936c64 /tests
parent026e550d3536115b23ad794e08b3c93147913dfb (diff)
parent30ea2827209c3c6982c4552c7d3f1193883025b1 (diff)
downloadservo-df73c71fb18c144abedd6889c34dd1031ffcbb8e.tar.gz
servo-df73c71fb18c144abedd6889c34dd1031ffcbb8e.zip
Auto merge of #23516 - pcwalton:webrenderup, r=pcwalton,jdm
Upgrade WebRender This is against an old Servo because I can't build current Servo due to compile errors in RNG crates. I verified that it starts up. --- <!-- Thank you for contributing to Servo! Please replace each `[ ]` by `[X]` when the step is complete, and replace `___` with appropriate data: --> - [x] `./mach build -d` does not report any errors - [x] `./mach test-tidy` does not report any errors - [x] These changes fix #23516 - [x] There are tests for these changes <!-- Reviewable:start --> --- This change is [<img src="https://reviewable.io/review_button.svg" height="34" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/servo/servo/23516) <!-- Reviewable:end -->
Diffstat (limited to 'tests')
-rw-r--r--tests/unit/metrics/paint_time.rs5
-rw-r--r--tests/wpt/metadata/css/compositing/mix-blend-mode/mix-blend-mode-both-parent-and-blended-with-3D-transform.html.ini3
-rw-r--r--tests/wpt/metadata/css/compositing/mix-blend-mode/mix-blend-mode-intermediate-element-overflow-hidden-and-border-radius.html.ini2
-rw-r--r--tests/wpt/mozilla/meta/css/text_decoration_underline_subpx_a.html.ini4
4 files changed, 12 insertions, 2 deletions
diff --git a/tests/unit/metrics/paint_time.rs b/tests/unit/metrics/paint_time.rs
index 7c7502adf29..c404e4d6e7b 100644
--- a/tests/unit/metrics/paint_time.rs
+++ b/tests/unit/metrics/paint_time.rs
@@ -9,7 +9,8 @@ use metrics::{PaintTimeMetrics, ProfilerMetadataFactory, ProgressiveWebMetric};
use msg::constellation_msg::TEST_PIPELINE_ID;
use profile_traits::time::{ProfilerChan, TimerMetadata};
use servo_url::ServoUrl;
-use webrender_api::{AlphaType, ColorF, ImageDisplayItem, ImageKey, ImageRendering, LayoutSize};
+use webrender_api::units::{LayoutRect, LayoutSize};
+use webrender_api::{AlphaType, ColorF, ImageDisplayItem, ImageKey, ImageRendering};
struct DummyProfilerMetadataFactory {}
impl ProfilerMetadataFactory for DummyProfilerMetadataFactory {
@@ -118,6 +119,8 @@ fn test_first_contentful_paint_setter() {
let image = DisplayItem::Image(CommonDisplayItem::new(
BaseDisplayItem::empty(),
ImageDisplayItem {
+ bounds: LayoutRect::zero(),
+ common: layout::display_list::items::empty_common_item_properties(),
image_key: ImageKey::DUMMY,
stretch_size: LayoutSize::zero(),
tile_spacing: LayoutSize::zero(),
diff --git a/tests/wpt/metadata/css/compositing/mix-blend-mode/mix-blend-mode-both-parent-and-blended-with-3D-transform.html.ini b/tests/wpt/metadata/css/compositing/mix-blend-mode/mix-blend-mode-both-parent-and-blended-with-3D-transform.html.ini
index c65930090be..53ab4250231 100644
--- a/tests/wpt/metadata/css/compositing/mix-blend-mode/mix-blend-mode-both-parent-and-blended-with-3D-transform.html.ini
+++ b/tests/wpt/metadata/css/compositing/mix-blend-mode/mix-blend-mode-both-parent-and-blended-with-3D-transform.html.ini
@@ -1,3 +1,4 @@
[mix-blend-mode-both-parent-and-blended-with-3D-transform.html]
type: reftest
- expected: FAIL
+ expected:
+ if os == "linux": FAIL
diff --git a/tests/wpt/metadata/css/compositing/mix-blend-mode/mix-blend-mode-intermediate-element-overflow-hidden-and-border-radius.html.ini b/tests/wpt/metadata/css/compositing/mix-blend-mode/mix-blend-mode-intermediate-element-overflow-hidden-and-border-radius.html.ini
new file mode 100644
index 00000000000..d8f5591b8fd
--- /dev/null
+++ b/tests/wpt/metadata/css/compositing/mix-blend-mode/mix-blend-mode-intermediate-element-overflow-hidden-and-border-radius.html.ini
@@ -0,0 +1,2 @@
+[mix-blend-mode-intermediate-element-overflow-hidden-and-border-radius.html]
+ fuzzy: /css/compositing/mix-blend-mode/reference/mix-blend-mode-intermediate-element-overflow-hidden-and-border-radius-ref.html:9;8
diff --git a/tests/wpt/mozilla/meta/css/text_decoration_underline_subpx_a.html.ini b/tests/wpt/mozilla/meta/css/text_decoration_underline_subpx_a.html.ini
new file mode 100644
index 00000000000..fb0e61c9144
--- /dev/null
+++ b/tests/wpt/mozilla/meta/css/text_decoration_underline_subpx_a.html.ini
@@ -0,0 +1,4 @@
+[text_decoration_underline_subpx_a.html]
+ bug: https://github.com/servo/servo/issues/23569
+ expected:
+ if os == "linux": FAIL