diff options
author | bors-servo <lbergstrom+bors@mozilla.com> | 2016-03-30 11:04:57 +0530 |
---|---|---|
committer | bors-servo <lbergstrom+bors@mozilla.com> | 2016-03-30 11:04:57 +0530 |
commit | 0ec96ac02a6c40ffda98e1074ceb9874dd1fb3cb (patch) | |
tree | 3f4321cb5e266bce43438f842124550bb79ba8e8 /components/style/dom.rs | |
parent | f6d60a716c35f8ec968d259bfa1ffa606d8d15d1 (diff) | |
parent | 4cb4cc93e4c0c2e92a6bef13d53de771de491bd7 (diff) | |
download | servo-0ec96ac02a6c40ffda98e1074ceb9874dd1fb3cb.tar.gz servo-0ec96ac02a6c40ffda98e1074ceb9874dd1fb3cb.zip |
Auto merge of #10277 - perlun:rename-tcomputedvalues-to-computedvalues, r=SimonSapin
Renamed TComputedValues to ComputedValues
This is a followup to #10210, and a continuation of #10185.
<!-- Reviewable:start -->
---
This change is [<img src="https://reviewable.io/review_button.svg" height="35" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/servo/servo/10277)
<!-- Reviewable:end -->
Diffstat (limited to 'components/style/dom.rs')
-rw-r--r-- | components/style/dom.rs | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/components/style/dom.rs b/components/style/dom.rs index 7a332806c09..d0ba545798c 100644 --- a/components/style/dom.rs +++ b/components/style/dom.rs @@ -6,7 +6,7 @@ use data::PrivateStyleData; use element_state::ElementState; -use properties::{PropertyDeclaration, PropertyDeclarationBlock, TComputedValues}; +use properties::{ComputedValues, PropertyDeclaration, PropertyDeclarationBlock}; use restyle_hints::{ElementSnapshot, RESTYLE_DESCENDANTS, RESTYLE_LATER_SIBLINGS, RESTYLE_SELF, RestyleHint}; use selector_impl::ElementExt; use selectors::Element; @@ -42,7 +42,7 @@ impl OpaqueNode { } pub trait TRestyleDamage : BitOr<Output=Self> + Copy { - type ConcreteComputedValues: TComputedValues; + type ConcreteComputedValues: ComputedValues; fn compute(old: Option<&Arc<Self::ConcreteComputedValues>>, new: &Self::ConcreteComputedValues) -> Self; fn rebuild_and_reflow() -> Self; } @@ -51,7 +51,7 @@ pub trait TNode : Sized + Copy + Clone { type ConcreteElement: TElement<ConcreteNode = Self, ConcreteDocument = Self::ConcreteDocument>; type ConcreteDocument: TDocument<ConcreteNode = Self, ConcreteElement = Self::ConcreteElement>; type ConcreteRestyleDamage: TRestyleDamage<ConcreteComputedValues = Self::ConcreteComputedValues>; - type ConcreteComputedValues: TComputedValues; + type ConcreteComputedValues: ComputedValues; fn to_unsafe(&self) -> UnsafeNode; unsafe fn from_unsafe(n: &UnsafeNode) -> Self; |