eliott/servo
1
0
Fork 0
mirror of https://github.com/servo/servo synced 2026-05-05 06:32:13 +02:00
Code Issues Packages Projects Releases Wiki Activity

Update WebRender

Browse Source 
This allows servo to use the ExternalScrollId API from WebRender fixing
some issues related to duplicate scroll root ids.

Fixes #17176.
Fixes #19287.
Fixes #19648.
This commit is contained in:
Martin Robinson
2018-01-16 18:47:05 +01:00
parent 984f3ccc41
commit 99eb457fc7
19 changed files with 154 additions and 119 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
components/script_layout_interface/wrapper_traits.rs
View File

@@ -25,7 +25,7 @@ use style::font_metrics::ServoMetricsProvider;
use style::properties::ComputedValues;
use style::selector_parser::{PseudoElement, PseudoElementCascadeType, SelectorImpl};
use style::stylist::RuleInclusion;
use webrender_api::ClipId;
use webrender_api::ExternalScrollId;
#[derive(Clone, Copy, Debug, PartialEq)]
pub enum PseudoElementType {
@@ -269,9 +269,9 @@ pub trait ThreadSafeLayoutNode: Clone + Copy + Debug + GetLayoutData + NodeInfo
self.get_pseudo_element_type().fragment_type()
}
fn generate_scroll_root_id(&self, pipeline_id: PipelineId) -> ClipId {
fn generate_scroll_id(&self, pipeline_id: PipelineId) -> ExternalScrollId {
let id = combine_id_with_fragment_type(self.opaque().id(), self.fragment_type());
ClipId::new(id as u64, pipeline_id.to_webrender())
ExternalScrollId(id as u64, pipeline_id.to_webrender())
}
}