Fix unit tests

This commit is contained in:
Pyfisch 2018-08-06 22:40:04 +02:00
parent 9e971f9d8f
commit 3d2957c737

View file

@ -4,13 +4,13 @@
use gfx_traits::Epoch; use gfx_traits::Epoch;
use ipc_channel::ipc; use ipc_channel::ipc;
use layout::display_list::items::{BaseDisplayItem, DisplayItem, DisplayList, ImageDisplayItem}; use layout::display_list::items::{BaseDisplayItem, CommonDisplayItem, DisplayItem, DisplayList};
use metrics::{PaintTimeMetrics, ProfilerMetadataFactory, ProgressiveWebMetric}; use metrics::{PaintTimeMetrics, ProfilerMetadataFactory, ProgressiveWebMetric};
use msg::constellation_msg::TEST_PIPELINE_ID; use msg::constellation_msg::TEST_PIPELINE_ID;
use profile_traits::time::{ProfilerChan, TimerMetadata}; use profile_traits::time::{ProfilerChan, TimerMetadata};
use servo_url::ServoUrl; use servo_url::ServoUrl;
use time; use time;
use webrender_api::{ImageKey, ImageRendering, LayoutSize}; use webrender_api::{AlphaType, ImageDisplayItem, ImageKey, ImageRendering, LayoutSize};
struct DummyProfilerMetadataFactory {} struct DummyProfilerMetadataFactory {}
impl ProfilerMetadataFactory for DummyProfilerMetadataFactory { impl ProfilerMetadataFactory for DummyProfilerMetadataFactory {
@ -116,13 +116,16 @@ fn test_first_paint_setter() {
#[test] #[test]
fn test_first_contentful_paint_setter() { fn test_first_contentful_paint_setter() {
let image = DisplayItem::Image(Box::new(ImageDisplayItem { let image = DisplayItem::Image(CommonDisplayItem::new(
base: BaseDisplayItem::empty(), BaseDisplayItem::empty(),
id: ImageKey::DUMMY, ImageDisplayItem {
stretch_size: LayoutSize::zero(), image_key: ImageKey::DUMMY,
tile_spacing: LayoutSize::zero(), stretch_size: LayoutSize::zero(),
image_rendering: ImageRendering::Auto, tile_spacing: LayoutSize::zero(),
})); image_rendering: ImageRendering::Auto,
alpha_type: AlphaType::PremultipliedAlpha,
}
));
let display_list = DisplayList { let display_list = DisplayList {
list: vec![image], list: vec![image],
clip_scroll_nodes: Vec::new(), clip_scroll_nodes: Vec::new(),