Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-08-03 12:40:06 +01:00
Code Issues Projects Releases Packages Wiki Activity

Fix compilation errors due to the rebase

Browse source 
It's too complicated to make all the commits in that branch compile properly.
This commit is contained in:
Anthony Ramine 2019-07-31 18:58:02 +02:00
parent 317d700f5d
commit f8341daf95
9 changed files with 31 additions and 72 deletions
Download patch file Download diff file Expand all files Collapse all files

2
components/layout_2020/display_list/builder.rs
View file

@ -10,7 +10,7 @@
use crate::display_list::items::OpaqueNode;
use app_units::Au;
use euclid::Point2D;
use euclid::default::Point2D;
use fnv::FnvHashMap;
use gfx::text::glyph::ByteIndex;
use gfx::text::TextRun;

3
components/layout_2020/display_list/items.rs
View file

@ -6,6 +6,7 @@ use euclid::Vector2D;
use gfx_traits;
use std::collections::HashMap;
use std::f32;
use webrender_api::units::LayoutPixel;
use webrender_api::ExternalScrollId;
pub use style::dom::OpaqueNode;
@ -20,4 +21,4 @@ impl gfx_traits::DisplayList for DisplayList {
}
/// The type of the scroll offset list. This is only populated if WebRender is in use.
pub type ScrollOffsetMap = HashMap<ExternalScrollId, Vector2D<f32>>;
pub type ScrollOffsetMap = HashMap<ExternalScrollId, Vector2D<f32, LayoutPixel>>;

2
components/layout_2020/display_list/webrender_helpers.rs
View file

@ -4,8 +4,8 @@
use crate::display_list::items::DisplayList;
use msg::constellation_msg::PipelineId;
use webrender_api::units::LayoutSize;
use webrender_api::{self, DisplayListBuilder};
use webrender_api::units::{LayoutSize};
pub trait WebRenderDisplayListConverter {
fn convert_to_webrender(&mut self, pipeline_id: PipelineId) -> DisplayListBuilder;