Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix failing assertion -- failure to pop reference frame #26063

Merged
merged 1 commit into from Mar 31, 2020
Merged
Changes from all commits
Commits
File filter...
Filter file types
Jump to…
Jump to file
Failed to load files.

Always

Just for now

@@ -195,7 +195,7 @@ pub struct StackingContext {
/// The clip and scroll info for this StackingContext.
pub parent_clipping_and_scrolling: ClippingAndScrolling,

/// The index of the reference frame that this stacking context estalishes.
/// The index of the reference frame that this stacking context establishes.
pub established_reference_frame: Option<ClipScrollNodeIndex>,
}

@@ -261,6 +261,7 @@ impl StackingContext {
let pop_item = DisplayItem::PopStackingContext(Box::new(PopStackingContextItem {
base: base_item.clone(),
stacking_context_id: self.id,
established_reference_frame: self.established_reference_frame.is_some(),
}));

let push_item = DisplayItem::PushStackingContext(Box::new(PushStackingContextItem {
@@ -657,6 +658,8 @@ pub struct PopStackingContextItem {
pub base: BaseDisplayItem,

pub stacking_context_id: StackingContextId,

pub established_reference_frame: bool,
}

/// Starts a group of items inside a particular scroll root.
@@ -186,7 +186,7 @@ impl DisplayItem {
);
IsContentful(false)
},
DisplayItem::PushStackingContext(ref mut item) => {
DisplayItem::PushStackingContext(ref item) => {
let stacking_context = &item.stacking_context;
debug_assert_eq!(stacking_context.context_type, StackingContextType::Real);

@@ -252,8 +252,11 @@ impl DisplayItem {
builder.push_item(&WrDisplayItem::PushStackingContext(wr_item));
IsContentful(false)
},
DisplayItem::PopStackingContext(_) => {
DisplayItem::PopStackingContext(ref item) => {
builder.pop_stacking_context();
if item.established_reference_frame {
builder.pop_reference_frame();
}
IsContentful(false)
},
DisplayItem::DefineClipScrollNode(ref mut item) => {

This file was deleted.

ProTip! Use n and p to navigate between commits in a pull request.
You can’t perform that action at this time.