aboutsummaryrefslogtreecommitdiffstats
path: root/components/script_layout_interface/lib.rs
diff options
context:
space:
mode:
authorbors-servo <lbergstrom+bors@mozilla.com>2016-11-25 09:00:44 -0800
committerGitHub <noreply@github.com>2016-11-25 09:00:44 -0800
commitd98abaec20e624aa89a3abddf4cf2a6399951ef1 (patch)
treeb0df4474a5b049d6b24614e8bb4aca0175642d09 /components/script_layout_interface/lib.rs
parentbeec035eb0ff6babf48ce836184329e60e795177 (diff)
parent900ad112386d65984e4f4c93926f323d12abbaf5 (diff)
downloadservo-d98abaec20e624aa89a3abddf4cf2a6399951ef1.tar.gz
servo-d98abaec20e624aa89a3abddf4cf2a6399951ef1.zip
Auto merge of #14300 - bholley:restyle_driven_traversal, r=emilio
stylo: Basic infrastructure for RestyleHint-driven traversal Gecko Bug: https://bugzilla.mozilla.org/show_bug.cgi?id=131701 (Don't review yet, will flag on the gecko bug when the time comes) <!-- 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/14300) <!-- Reviewable:end -->
Diffstat (limited to 'components/script_layout_interface/lib.rs')
-rw-r--r--components/script_layout_interface/lib.rs13
1 files changed, 2 insertions, 11 deletions
diff --git a/components/script_layout_interface/lib.rs b/components/script_layout_interface/lib.rs
index 5894e96049a..d52990fa8f4 100644
--- a/components/script_layout_interface/lib.rs
+++ b/components/script_layout_interface/lib.rs
@@ -51,8 +51,6 @@ use libc::c_void;
use std::sync::atomic::AtomicIsize;
use style::atomic_refcell::AtomicRefCell;
use style::data::ElementData;
-use style::dom::TRestyleDamage;
-use style::selector_parser::RestyleDamage;
pub struct PartialPersistentLayoutData {
/// Data that the style system associates with a node. When the
@@ -61,9 +59,6 @@ pub struct PartialPersistentLayoutData {
/// transmutations between ElementData and PersistentLayoutData.
pub style_data: ElementData,
- /// Description of how to account for recent style changes.
- pub restyle_damage: RestyleDamage,
-
/// Information needed during parallel traversals.
pub parallel: DomParallelInfo,
}
@@ -71,11 +66,7 @@ pub struct PartialPersistentLayoutData {
impl PartialPersistentLayoutData {
pub fn new() -> Self {
PartialPersistentLayoutData {
- style_data: ElementData::new(),
- // FIXME(bholley): This is needed for now to make sure we do frame
- // construction after initial styling. This will go away shortly when
- // we move restyle damage into the style system.
- restyle_damage: RestyleDamage::rebuild_and_reflow(),
+ style_data: ElementData::new(None),
parallel: DomParallelInfo::new(),
}
}
@@ -142,7 +133,7 @@ pub struct SVGSVGData {
}
/// The address of a node known to be valid. These are sent from script to layout.
-#[derive(Clone, PartialEq, Eq, Copy)]
+#[derive(Clone, Debug, PartialEq, Eq, Copy)]
pub struct TrustedNodeAddress(pub *const c_void);
#[allow(unsafe_code)]