From c4276aa27ed5c032a529947a6e7c2babc17b2bec Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fernando=20Jim=C3=A9nez=20Moreno?= Date: Mon, 17 Feb 2020 16:38:23 +0100 Subject: [PATCH] Fix rebase issues and run Prettier on layout viewer code --- components/layout_2020/flow/mod.rs | 3 +- components/layout_2020/positioned.rs | 2 +- components/layout_2020/query.rs | 4 +- components/layout_2020/replaced.rs | 2 +- components/layout_thread_2020/lib.rs | 12 +- etc/layout_viewer/viewer.html | 688 ++++++++++++++------------- 6 files changed, 380 insertions(+), 331 deletions(-) diff --git a/components/layout_2020/flow/mod.rs b/components/layout_2020/flow/mod.rs index 635b5d9cdc2..39f57bf4402 100644 --- a/components/layout_2020/flow/mod.rs +++ b/components/layout_2020/flow/mod.rs @@ -9,8 +9,7 @@ use crate::flow::float::{FloatBox, FloatContext}; use crate::flow::inline::InlineFormattingContext; use crate::formatting_contexts::{IndependentFormattingContext, IndependentLayout, NonReplacedIFC}; use crate::fragments::{AnonymousFragment, BoxFragment}; -use crate::fragments::{CollapsedBlockMargins, CollapsedMargin}; -use crate::fragments::{DebugId, Fragment}; +use crate::fragments::{CollapsedBlockMargins, CollapsedMargin, Fragment}; use crate::geom::flow_relative::{Rect, Sides, Vec2}; use crate::positioned::{AbsolutelyPositionedBox, PositioningContext}; use crate::replaced::ReplacedContent; diff --git a/components/layout_2020/positioned.rs b/components/layout_2020/positioned.rs index 5314347e95b..ef561a05692 100644 --- a/components/layout_2020/positioned.rs +++ b/components/layout_2020/positioned.rs @@ -5,7 +5,7 @@ use crate::context::LayoutContext; use crate::dom_traversal::{Contents, NodeExt}; use crate::formatting_contexts::IndependentFormattingContext; -use crate::fragments::{AnonymousFragment, BoxFragment, CollapsedBlockMargins, DebugId, Fragment}; +use crate::fragments::{AnonymousFragment, BoxFragment, CollapsedBlockMargins, Fragment}; use crate::geom::flow_relative::{Rect, Sides, Vec2}; use crate::sizing::ContentSizesRequest; use crate::style_ext::{ComputedValuesExt, DisplayInside}; diff --git a/components/layout_2020/query.rs b/components/layout_2020/query.rs index d281bb57a91..45eb3b25ac0 100644 --- a/components/layout_2020/query.rs +++ b/components/layout_2020/query.rs @@ -166,7 +166,7 @@ impl LayoutRPC for LayoutRPCImpl { pub fn process_content_box_request( requested_node: OpaqueNode, - fragment_tree_root: Option<&FragmentTreeRoot>, + fragment_tree_root: Option>, ) -> Option> { let fragment_tree_root = match fragment_tree_root { Some(fragment_tree_root) => fragment_tree_root, @@ -182,7 +182,7 @@ pub fn process_content_boxes_request(_requested_node: OpaqueNode) -> Vec, + fragment_tree_root: Option>, ) -> Rect { let fragment_tree_root = match fragment_tree_root { Some(fragment_tree_root) => fragment_tree_root, diff --git a/components/layout_2020/replaced.rs b/components/layout_2020/replaced.rs index ba388c0521c..19c4652ca4b 100644 --- a/components/layout_2020/replaced.rs +++ b/components/layout_2020/replaced.rs @@ -34,7 +34,7 @@ pub(crate) struct ReplacedContent { /// /// * For SVG, see https://svgwg.org/svg2-draft/coords.html#SizingSVGInCSS /// and again https://github.com/w3c/csswg-drafts/issues/4572. -#[derive(Debug)] +#[derive(Debug, Serialize)] pub(crate) struct IntrinsicSizes { pub width: Option, pub height: Option, diff --git a/components/layout_thread_2020/lib.rs b/components/layout_thread_2020/lib.rs index 3f2aed688d8..534fb913ab1 100644 --- a/components/layout_thread_2020/lib.rs +++ b/components/layout_thread_2020/lib.rs @@ -874,8 +874,8 @@ impl LayoutThread { self.dump_style_tree, self.dump_rule_tree, self.relayout_event, - true, // nonincremental_layout - self.trace_layout, // trace_layout + true, // nonincremental_layout + self.trace_layout, // trace_layout self.dump_flow_tree, // dump_flow_tree ); } @@ -1235,10 +1235,8 @@ impl LayoutThread { match *reflow_goal { ReflowGoal::LayoutQuery(ref querymsg, _) => match querymsg { &QueryMsg::ContentBoxQuery(node) => { - rw_data.content_box_response = process_content_box_request( - node, - (&*self.fragment_tree_root.borrow()).as_ref(), - ); + rw_data.content_box_response = + process_content_box_request(node, self.fragment_tree_root.borrow().clone()); }, &QueryMsg::ContentBoxesQuery(node) => { rw_data.content_boxes_response = process_content_boxes_request(node); @@ -1253,7 +1251,7 @@ impl LayoutThread { &QueryMsg::ClientRectQuery(node) => { rw_data.client_rect_response = process_node_geometry_request( node, - (&*self.fragment_tree_root.borrow()).as_ref(), + self.fragment_tree_root.borrow().clone(), ); }, &QueryMsg::NodeScrollGeometryQuery(node) => { diff --git a/etc/layout_viewer/viewer.html b/etc/layout_viewer/viewer.html index 9bea6942485..e2df391b0ad 100644 --- a/etc/layout_viewer/viewer.html +++ b/etc/layout_viewer/viewer.html @@ -1,345 +1,397 @@ - - - - - Servo Layout Debugger + + + + + Servo Layout Debugger - - + + - - + + - - + + - - + + - - - -
-
-
-

Servo Layout Viewer

-

Check the README for instructions.

-
-
-
-
-
-
-
- -
-
-
-
-
-
-
-
-
-
-
-
    -
-
-
-
-
-
-
-
-
Box Tree
-
-
-
-
-
-
-
-
Fragment Tree
-
-
-
-
-
-
-
-
-
-
- < Prev step - | - Next step > -
- - -
- Back to top -
+ + + +
+
+
+

Servo Layout Viewer

+

+ Check the + README + for instructions. +

+
+
+
+
+
+
+ +
+
+
+
+
+
+
+
+
+
+
    +
    +
    +
    +
    +
    +
    +
    +
    Box Tree
    +
    +
    +
    +
    +
    +
    +
    +
    Fragment Tree
    +
    +
    +
    +
    +
    +
    +
    +
    +
    +
    + < Prev step + | + Next step > +
    + + +
    + Back to top +
    +
    - - - - - - - - - + + + + + + + + + - - + reader.readAsText(file); + return false; + }; + register_toggle_unchanaged_code_handler(); + register_prev_next_trace_node(); + }); + +