Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-08-05 05:30:08 +01:00
Code Issues Projects Releases Packages Wiki Activity

Auto merge of #22167 - emilio:gecko-sync, r=emilio

Browse source 
style: Sync changes from mozilla-central.

See each individual commit for details.

<!-- Reviewable:start -->
---
This change is [<img src="https://reviewable.io/review_button.svg" height="34" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/servo/servo/22167)
<!-- Reviewable:end -->
This commit is contained in:
bors-servo 2018-11-10 15:43:20 -05:00 • committed by GitHub
commit 19b4f35de1
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
76 changed files with 1025 additions and 815 deletions
Download patch file Download diff file Expand all files Collapse all files

1
components/layout/Cargo.toml
View file

@ -29,6 +29,7 @@ log = "0.4"
malloc_size_of = { path = "../malloc_size_of" }
msg = {path = "../msg"}
net_traits = {path = "../net_traits"}
num-traits = "0.2"
ordered-float = "1.0"
parking_lot = "0.6"
profile_traits = {path = "../profile_traits"}

1
components/layout/flow.rs
View file

@ -49,6 +49,7 @@ use crate::table_wrapper::TableWrapperFlow;
use euclid::{Point2D, Rect, Size2D, Vector2D};
use gfx_traits::print_tree::PrintTree;
use gfx_traits::StackingContextId;
use num_traits::cast::FromPrimitive;
use serde::ser::{Serialize, SerializeStruct, Serializer};
use servo_geometry::{au_rect_to_f32_rect, f32_rect_to_au_rect, MaxRect};
use std::fmt;