Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-07-23 15:23:42 +01:00
Code Issues Projects Releases Packages Wiki Activity

fixup! Checks moved to Element::client_rect(), fixed conditions for the special cases, reconfigured Window constructor to initialize current_viewport to initial window size

Browse source
This commit is contained in:
switchpiggy 2023-05-05 02:32:29 -07:00
parent 7c61c5b930
commit 34762d97ad
2 changed files with 14 additions and 27 deletions
Download patch file Download diff file Expand all files Collapse all files

33
components/script/dom/element.rs
View file

@ -84,10 +84,8 @@ use crate::dom::window::ReflowReason;
use crate::script_thread::ScriptThread; use crate::script_thread::ScriptThread;
use crate::stylesheet_loader::StylesheetOwner; use crate::stylesheet_loader::StylesheetOwner;
use crate::task::TaskOnce; use crate::task::TaskOnce;
use app_units::Au;
use devtools_traits::AttrInfo; use devtools_traits::AttrInfo;
use dom_struct::dom_struct; use dom_struct::dom_struct;
use euclid::default::Point2D;
use euclid::default::Rect; use euclid::default::Rect;
use euclid::default::Size2D; use euclid::default::Size2D;
use html5ever::serialize; use html5ever::serialize;
@ -3297,26 +3295,21 @@ impl Element {
} }
let mut rect = self.upcast::<Node>().client_rect(); let mut rect = self.upcast::<Node>().client_rect();
let owner_doc = self.node.owner_doc(); let in_quirks_mode = self.node.owner_doc().quirks_mode() == QuirksMode::Quirks;
if (matches!(owner_doc.quirks_mode(), QuirksMode::Quirks) && if (in_quirks_mode &&
owner_doc.GetBody().as_deref() == self.downcast::<HTMLElement>()) || self.node.owner_doc().GetBody().as_deref() == self.downcast::<HTMLElement>()) ||
(matches!(owner_doc.quirks_mode(), QuirksMode::NoQuirks) && (!in_quirks_mode && *self.root_element() == *self)
*self.root_element() == *self)
{ {
let viewport = owner_doc.window().current_viewport(); let viewport_dimensions = self
.node
//cast Rect<Au, _> into Rect<i32, _> .owner_doc()
rect = Rect::<i32>::new( .window()
Point2D::<i32>::new( .window_size()
viewport.origin.x.to_nearest_px(), .initial_viewport
viewport.origin.y.to_nearest_px(), .round()
), .to_i32();
Size2D::<i32>::new( rect.size = Size2D::<i32>::new(viewport_dimensions.width, viewport_dimensions.height);
viewport.size.width.to_nearest_px(),
viewport.size.height.to_nearest_px(),
),
);
} }
self.ensure_rare_data().client_rect = Some(window_from_node(self).cache_layout_value(rect)); self.ensure_rare_data().client_rect = Some(window_from_node(self).cache_layout_value(rect));

8
components/script/dom/window.rs
View file

@ -2609,13 +2609,7 @@ impl Window {
layout_chan, layout_chan,
layout_rpc, layout_rpc,
window_size: Cell::new(window_size), window_size: Cell::new(window_size),
current_viewport: Cell::new(Rect::new( current_viewport: Cell::new(Rect::zero()),
Point2D::zero(),
Size2D::new(
Au::from_f32_px(window_size.initial_viewport.width.into()),
Au::from_f32_px(window_size.initial_viewport.width.into()),
),
)),
suppress_reflow: Cell::new(true), suppress_reflow: Cell::new(true),
pending_reflow_count: Default::default(), pending_reflow_count: Default::default(),
current_state: Cell::new(WindowState::Alive), current_state: Cell::new(WindowState::Alive),