aboutsummaryrefslogtreecommitdiffstats
path: root/components/script_layout_interface/wrapper_traits.rs
diff options
context:
space:
mode:
authorMartin Robinson <mrobinson@igalia.com>2018-01-16 18:47:05 +0100
committerMartin Robinson <mrobinson@igalia.com>2018-02-06 15:10:35 +0100
commit99eb457fc7afb0cd4178ae955d0d998e253b25f2 (patch)
tree7be3fa7b2607a271983fede7720c984610e4b255 /components/script_layout_interface/wrapper_traits.rs
parent984f3ccc414bf420787efcb10eebe48cf2cbca36 (diff)
downloadservo-99eb457fc7afb0cd4178ae955d0d998e253b25f2.tar.gz
servo-99eb457fc7afb0cd4178ae955d0d998e253b25f2.zip
Update WebRender
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.
Diffstat (limited to 'components/script_layout_interface/wrapper_traits.rs')
-rw-r--r--components/script_layout_interface/wrapper_traits.rs6
1 files changed, 3 insertions, 3 deletions
diff --git a/components/script_layout_interface/wrapper_traits.rs b/components/script_layout_interface/wrapper_traits.rs
index 0b04d4256a6..a3365c3c6e5 100644
--- a/components/script_layout_interface/wrapper_traits.rs
+++ b/components/script_layout_interface/wrapper_traits.rs
@@ -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())
}
}