mirror of
https://github.com/servo/servo.git
synced 2025-06-08 08:33:26 +00:00
c72d0c2ed0
each iframe. The old code that attempted to do this during layout wasn't able to work for multiple reasons: it couldn't know where the iframe was going to be on the page (because of nested iframes), and at the time it was building the display list for a fragment it couldn't know where that fragment was going to be in page coordinates. This patch rewrites that code so that both the sizes and positions of iframes are determined by the compositor. Layout layerizes all iframes and marks the iframe layers with the appropriate pipeline and subpage IDs so that the compositor can place them correctly. This approach is similar in spirit to Gecko's `RefLayer` infrastructure. The logic that determines when it is time to take the screenshot for reftests has been significantly revamped to deal with this change in delegation of responsibility. Additionally, this code removes the infrastructure that sends layout data back to the layout task to be destroyed, since it is now all thread-safe and can be destroyed on the script task. The failing tests now fail because of a pre-existing bug related to intrinsic heights and borders on inline replaced elements. They happened to pass before because we never rendered the iframes at all, which meant they never had a chance to draw the red border the tests expect to not render! Closes #7377.
72 lines
2.3 KiB
Rust
72 lines
2.3 KiB
Rust
/* This Source Code Form is subject to the terms of the Mozilla Public
|
|
* License, v. 2.0. If a copy of the MPL was not distributed with this
|
|
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
|
|
|
|
use construct::ConstructionResult;
|
|
use incremental::RestyleDamage;
|
|
use parallel::DomParallelInfo;
|
|
use script::dom::node::SharedLayoutData;
|
|
use std::sync::Arc;
|
|
use style::properties::ComputedValues;
|
|
|
|
/// Data that layout associates with a node.
|
|
pub struct PrivateLayoutData {
|
|
/// The results of CSS styling for this node's `before` pseudo-element, if any.
|
|
pub before_style: Option<Arc<ComputedValues>>,
|
|
|
|
/// The results of CSS styling for this node's `after` pseudo-element, if any.
|
|
pub after_style: Option<Arc<ComputedValues>>,
|
|
|
|
/// Description of how to account for recent style changes.
|
|
pub restyle_damage: RestyleDamage,
|
|
|
|
/// The current results of flow construction for this node. This is either a flow or a
|
|
/// `ConstructionItem`. See comments in `construct.rs` for more details.
|
|
pub flow_construction_result: ConstructionResult,
|
|
|
|
pub before_flow_construction_result: ConstructionResult,
|
|
|
|
pub after_flow_construction_result: ConstructionResult,
|
|
|
|
/// Information needed during parallel traversals.
|
|
pub parallel: DomParallelInfo,
|
|
|
|
/// Various flags.
|
|
pub flags: LayoutDataFlags,
|
|
}
|
|
|
|
impl PrivateLayoutData {
|
|
/// Creates new layout data.
|
|
pub fn new() -> PrivateLayoutData {
|
|
PrivateLayoutData {
|
|
before_style: None,
|
|
after_style: None,
|
|
restyle_damage: RestyleDamage::empty(),
|
|
flow_construction_result: ConstructionResult::None,
|
|
before_flow_construction_result: ConstructionResult::None,
|
|
after_flow_construction_result: ConstructionResult::None,
|
|
parallel: DomParallelInfo::new(),
|
|
flags: LayoutDataFlags::empty(),
|
|
}
|
|
}
|
|
}
|
|
|
|
bitflags! {
|
|
flags LayoutDataFlags: u8 {
|
|
#[doc = "Whether a flow has been newly constructed."]
|
|
const HAS_NEWLY_CONSTRUCTED_FLOW = 0x01
|
|
}
|
|
}
|
|
|
|
pub struct LayoutDataWrapper {
|
|
pub shared_data: SharedLayoutData,
|
|
pub data: Box<PrivateLayoutData>,
|
|
}
|
|
|
|
#[allow(dead_code, unsafe_code)]
|
|
fn static_assertion(x: Option<LayoutDataWrapper>) {
|
|
unsafe {
|
|
let _: Option<::script::dom::node::LayoutData> =
|
|
::std::intrinsics::transmute(x);
|
|
}
|
|
}
|