From 284cb8aae8ed0c01c12aa866e8e7b15b07fcb816 Mon Sep 17 00:00:00 2001 From: Pyfisch Date: Sat, 17 Jun 2017 15:33:34 +0200 Subject: Fix several bugs related to scrolling * scrollLeft/scrollTop returned values of parent or even document root Only the scroll of the node itself is returned. Otherwise 0.0. * Scrolling via script had set viewport. This resulted in other nodes appearing scrolled. Now scroll_offsets are updated with correct node id. These bugs caused other odd behavior like both body and document.documentElement being scrolled or the view for scrolled elements jumping. --- components/script/dom/document.rs | 1 + components/script/dom/element.rs | 6 +++--- components/script/dom/window.rs | 40 +++++++++++++++++++-------------------- 3 files changed, 23 insertions(+), 24 deletions(-) (limited to 'components/script') diff --git a/components/script/dom/document.rs b/components/script/dom/document.rs index 5db39cf4feb..5e67d286363 100644 --- a/components/script/dom/document.rs +++ b/components/script/dom/document.rs @@ -703,6 +703,7 @@ impl Document { // Step 3 let global_scope = self.window.upcast::(); let webrender_pipeline_id = global_scope.pipeline_id().to_webrender(); + self.window.update_viewport_for_scroll(x, y); self.window.perform_a_scroll(x, y, ClipId::root_scroll_node(webrender_pipeline_id), diff --git a/components/script/dom/element.rs b/components/script/dom/element.rs index 7e01bc66764..05fca3c97d2 100644 --- a/components/script/dom/element.rs +++ b/components/script/dom/element.rs @@ -1356,7 +1356,7 @@ impl Element { // Step 10 (TODO) // Step 11 - win.scroll_node(node.to_trusted_node_address(), x, y, behavior); + win.scroll_node(node, x, y, behavior); } // https://w3c.github.io/DOM-Parsing/#parsing @@ -1794,7 +1794,7 @@ impl ElementMethods for Element { // Step 10 (TODO) // Step 11 - win.scroll_node(node.to_trusted_node_address(), self.ScrollLeft(), y, behavior); + win.scroll_node(node, self.ScrollLeft(), y, behavior); } // https://drafts.csswg.org/cssom-view/#dom-element-scrolltop @@ -1887,7 +1887,7 @@ impl ElementMethods for Element { // Step 10 (TODO) // Step 11 - win.scroll_node(node.to_trusted_node_address(), x, self.ScrollTop(), behavior); + win.scroll_node(node, x, self.ScrollTop(), behavior); } // https://drafts.csswg.org/cssom-view/#dom-element-scrollwidth diff --git a/components/script/dom/window.rs b/components/script/dom/window.rs index 1f6a7c26eea..427d9503d1a 100644 --- a/components/script/dom/window.rs +++ b/components/script/dom/window.rs @@ -13,7 +13,6 @@ use dom::bindings::codegen::Bindings::EventHandlerBinding::EventHandlerNonNull; use dom::bindings::codegen::Bindings::EventHandlerBinding::OnBeforeUnloadEventHandlerNonNull; use dom::bindings::codegen::Bindings::EventHandlerBinding::OnErrorEventHandlerNonNull; use dom::bindings::codegen::Bindings::FunctionBinding::Function; -use dom::bindings::codegen::Bindings::NodeBinding::NodeMethods; use dom::bindings::codegen::Bindings::PermissionStatusBinding::PermissionState; use dom::bindings::codegen::Bindings::RequestBinding::RequestInit; use dom::bindings::codegen::Bindings::WindowBinding::{self, FrameRequestCallback, WindowMethods}; @@ -1126,8 +1125,11 @@ impl Window { //let document = self.Document(); // Step 12 let global_scope = self.upcast::(); - self.perform_a_scroll(x.to_f32().unwrap_or(0.0f32), - y.to_f32().unwrap_or(0.0f32), + let x = x.to_f32().unwrap_or(0.0f32); + let y = y.to_f32().unwrap_or(0.0f32); + self.update_viewport_for_scroll(x, y); + self.perform_a_scroll(x, + y, global_scope.pipeline_id().root_scroll_node(), behavior, None); @@ -1158,9 +1160,6 @@ impl Window { scroll_offset: Vector2D::new(-x, -y), })).unwrap(); - // TODO (farodin91): Raise an event to stop the current_viewport - self.update_viewport_for_scroll(x, y); - let global_scope = self.upcast::(); let message = ConstellationMsg::ScrollFragmentPoint(scroll_root_id, point, smooth); global_scope.constellation_chan().send(message).unwrap(); @@ -1450,33 +1449,32 @@ impl Window { } pub fn scroll_offset_query(&self, node: &Node) -> Vector2D { - let mut node = Root::from_ref(node); - loop { - if let Some(scroll_offset) = self.scroll_offsets - .borrow() - .get(&node.to_untrusted_node_address()) { - return *scroll_offset - } - node = match node.GetParentNode() { - Some(node) => node, - None => break, - } + if let Some(scroll_offset) = self.scroll_offsets + .borrow() + .get(&node.to_untrusted_node_address()) { + return *scroll_offset } - let vp_origin = self.current_viewport.get().origin; - Vector2D::new(vp_origin.x.to_f32_px(), vp_origin.y.to_f32_px()) + Vector2D::new(0.0, 0.0) } // https://drafts.csswg.org/cssom-view/#dom-element-scroll pub fn scroll_node(&self, - node: TrustedNodeAddress, + node: &Node, x_: f64, y_: f64, behavior: ScrollBehavior) { if !self.reflow(ReflowGoal::ForScriptQuery, - ReflowQueryType::NodeScrollRootIdQuery(node), + ReflowQueryType::NodeScrollRootIdQuery(node.to_trusted_node_address()), ReflowReason::Query) { return; } + + // The scroll offsets are immediatly updated since later calls + // to topScroll and others may access the properties before + // webrender has a chance to update the offsets. + self.scroll_offsets.borrow_mut().insert(node.to_untrusted_node_address(), + Vector2D::new(x_ as f32, y_ as f32)); + let NodeScrollRootIdResponse(scroll_root_id) = self.layout_rpc.node_scroll_root_id(); // Step 12 -- cgit v1.2.3 From 80dee7a65f8b4b7d1d93c92e4641c70633734803 Mon Sep 17 00:00:00 2001 From: Jonathan Chan Date: Wed, 7 Jun 2017 10:22:49 -0700 Subject: Force HTMLStyleElement to create a new CSSStyleSheet when re-parsing. We already call Document::invalidate_style_sheets and set the stylesheet member to a new Stylesheet. This matches the behavior of Firefox, and means the new CSSStyleSheet you get from accessing .sheet from JS will be correct instead of stale. (::get_cssom_stylesheet already tries to use the new Stylesheet, but MutNullableJS::or_init is called, so if we already created a CSSStyleSheet we will continue to return that one). --- components/script/dom/htmlstyleelement.rs | 1 + 1 file changed, 1 insertion(+) (limited to 'components/script') diff --git a/components/script/dom/htmlstyleelement.rs b/components/script/dom/htmlstyleelement.rs index bf4266e1875..bbce33f3d52 100644 --- a/components/script/dom/htmlstyleelement.rs +++ b/components/script/dom/htmlstyleelement.rs @@ -111,6 +111,7 @@ impl HTMLStyleElement { win.layout_chan().send(Msg::AddStylesheet(sheet.clone())).unwrap(); *self.stylesheet.borrow_mut() = Some(sheet); + self.cssom_stylesheet.set(None); doc.invalidate_stylesheets(); } -- cgit v1.2.3 From 917fe9241a1f0c81a73587653b48e9438487b147 Mon Sep 17 00:00:00 2001 From: Corey Farwell Date: Thu, 22 Jun 2017 23:49:38 -0400 Subject: Replace iterator struct with anonymous return iterator type. --- components/script/dom/nodelist.rs | 23 +++-------------------- 1 file changed, 3 insertions(+), 20 deletions(-) (limited to 'components/script') diff --git a/components/script/dom/nodelist.rs b/components/script/dom/nodelist.rs index 39b4cc1c41e..31e4dfb40c8 100644 --- a/components/script/dom/nodelist.rs +++ b/components/script/dom/nodelist.rs @@ -103,11 +103,9 @@ impl NodeList { } } - pub fn iter(&self) -> NodeListIterator { - NodeListIterator { - nodes: self, - offset: 0, - } + pub fn iter<'a>(&'a self) -> impl Iterator> + 'a { + let len = self.Length(); + (0..len).flat_map(move |i| self.Item(i)) } } @@ -289,18 +287,3 @@ impl ChildrenList { self.last_index.set(0u32); } } - -pub struct NodeListIterator<'a> { - nodes: &'a NodeList, - offset: u32, -} - -impl<'a> Iterator for NodeListIterator<'a> { - type Item = Root; - - fn next(&mut self) -> Option> { - let result = self.nodes.Item(self.offset); - self.offset = self.offset + 1; - result - } -} -- cgit v1.2.3