mirror of
https://github.com/servo/servo.git
synced 2025-08-03 20:50:07 +01:00
Backed out changeset e64e659c077d: servo PR #18809 and revendor for reftest failures, e.g. in layout/reftests/bugs/392435-1.html. r=backout on a CLOSED TREE
Backs out https://github.com/servo/servo/pull/18809
This commit is contained in:
parent
fe16c1d5c3
commit
11c64178d8
142 changed files with 1635 additions and 1685 deletions
|
@ -37,7 +37,7 @@ use style_traits::CSSPixel;
|
|||
use style_traits::DevicePixel;
|
||||
#[cfg(feature = "servo")] use style_traits::SpeculativePainter;
|
||||
use stylist::Stylist;
|
||||
use thread_state::{self, ThreadState};
|
||||
use thread_state;
|
||||
use time;
|
||||
use timer::Timer;
|
||||
use traversal::DomTraversal;
|
||||
|
@ -415,15 +415,15 @@ impl TraversalStatistics {
|
|||
bitflags! {
|
||||
/// Represents which tasks are performed in a SequentialTask of
|
||||
/// UpdateAnimations which is a result of normal restyle.
|
||||
pub struct UpdateAnimationsTasks: u8 {
|
||||
pub flags UpdateAnimationsTasks: u8 {
|
||||
/// Update CSS Animations.
|
||||
const CSS_ANIMATIONS = structs::UpdateAnimationsTasks_CSSAnimations;
|
||||
const CSS_ANIMATIONS = structs::UpdateAnimationsTasks_CSSAnimations,
|
||||
/// Update CSS Transitions.
|
||||
const CSS_TRANSITIONS = structs::UpdateAnimationsTasks_CSSTransitions;
|
||||
const CSS_TRANSITIONS = structs::UpdateAnimationsTasks_CSSTransitions,
|
||||
/// Update effect properties.
|
||||
const EFFECT_PROPERTIES = structs::UpdateAnimationsTasks_EffectProperties;
|
||||
const EFFECT_PROPERTIES = structs::UpdateAnimationsTasks_EffectProperties,
|
||||
/// Update animation cacade results for animations running on the compositor.
|
||||
const CASCADE_RESULTS = structs::UpdateAnimationsTasks_CascadeResults;
|
||||
const CASCADE_RESULTS = structs::UpdateAnimationsTasks_CascadeResults,
|
||||
}
|
||||
}
|
||||
|
||||
|
@ -431,11 +431,11 @@ bitflags! {
|
|||
bitflags! {
|
||||
/// Represents which tasks are performed in a SequentialTask as a result of
|
||||
/// animation-only restyle.
|
||||
pub struct PostAnimationTasks: u8 {
|
||||
pub flags PostAnimationTasks: u8 {
|
||||
/// Display property was changed from none in animation-only restyle so
|
||||
/// that we need to resolve styles for descendants in a subsequent
|
||||
/// normal restyle.
|
||||
const DISPLAY_CHANGED_FROM_NONE_FOR_SMIL = 0x01;
|
||||
const DISPLAY_CHANGED_FROM_NONE_FOR_SMIL = 0x01,
|
||||
}
|
||||
}
|
||||
|
||||
|
@ -477,7 +477,7 @@ impl<E: TElement> SequentialTask<E> {
|
|||
/// Executes this task.
|
||||
pub fn execute(self) {
|
||||
use self::SequentialTask::*;
|
||||
debug_assert!(thread_state::get() == ThreadState::LAYOUT);
|
||||
debug_assert!(thread_state::get() == thread_state::LAYOUT);
|
||||
match self {
|
||||
Unused(_) => unreachable!(),
|
||||
#[cfg(feature = "gecko")]
|
||||
|
@ -565,7 +565,7 @@ impl<E: TElement> SelectorFlagsMap<E> {
|
|||
|
||||
/// Applies the flags. Must be called on the main thread.
|
||||
pub fn apply_flags(&mut self) {
|
||||
debug_assert!(thread_state::get() == ThreadState::LAYOUT);
|
||||
debug_assert!(thread_state::get() == thread_state::LAYOUT);
|
||||
for (el, flags) in self.map.drain() {
|
||||
unsafe { el.set_selector_flags(flags); }
|
||||
}
|
||||
|
@ -602,7 +602,7 @@ where
|
|||
E: TElement,
|
||||
{
|
||||
fn drop(&mut self) {
|
||||
debug_assert!(thread_state::get() == ThreadState::LAYOUT);
|
||||
debug_assert!(thread_state::get() == thread_state::LAYOUT);
|
||||
for task in self.0.drain(..) {
|
||||
task.execute()
|
||||
}
|
||||
|
@ -797,7 +797,7 @@ impl<E: TElement> ThreadLocalStyleContext<E> {
|
|||
impl<E: TElement> Drop for ThreadLocalStyleContext<E> {
|
||||
fn drop(&mut self) {
|
||||
debug_assert!(self.current_element_info.is_none());
|
||||
debug_assert!(thread_state::get() == ThreadState::LAYOUT);
|
||||
debug_assert!(thread_state::get() == thread_state::LAYOUT);
|
||||
|
||||
// Apply any slow selector flags that need to be set on parents.
|
||||
self.selector_flags.apply_flags();
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue