Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2025-02-05 05:30:29 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 1329854 - Check IsInStyleRefresh for all the servo-related handling in nsCSSFrameConstructor::Content{Appended,RangeInserted}. r=heycam

Browse Source
This commit is contained in:
Bobby Holley 2017-01-12 12:27:47 -08:00
parent 0574db6b6e
commit 6a150c778b
1 changed files with 25 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

47
layout/base/nsCSSFrameConstructor.cpp
View File

@ -7366,13 +7366,21 @@ nsCSSFrameConstructor::ContentAppended(nsIContent* aContainer,
return rv;
}
// The frame constructor uses this codepath both for bonafide newly-added
// content and for RestyleManager-driven frame construction (RECONSTRUCT_FRAME
// and lazy frame construction). If we're using the Servo style system, we
// want to ensure that styles get resolved in the first case, whereas for the
// second case they should have already been resolved if needed.
bool isNewlyAddedContentForServo = aContainer->IsStyledByServo() &&
!RestyleManager()->AsBase()->IsInStyleRefresh();
// See comment in ContentRangeInserted for why this is necessary.
if (!GetContentInsertionFrameFor(aContainer) &&
!aContainer->IsActiveChildrenElement()) {
// We're punting on frame construction because there's no container frame.
// The Servo-backed style system handles this case like the lazy frame
// construction case.
if (aContainer->IsStyledByServo()) {
if (isNewlyAddedContentForServo) {
aContainer->AsElement()->NoteDirtyDescendantsForServo();
}
return NS_OK;
@ -7380,22 +7388,15 @@ nsCSSFrameConstructor::ContentAppended(nsIContent* aContainer,
if (aAllowLazyConstruction &&
MaybeConstructLazily(CONTENTAPPEND, aContainer, aFirstNewContent)) {
if (aContainer->IsStyledByServo()) {
if (isNewlyAddedContentForServo) {
aContainer->AsElement()->NoteDirtyDescendantsForServo();
}
return NS_OK;
}
// We couldn't construct lazily. Make Servo eagerly traverse the subtree.
if (ServoStyleSet* set = mPresShell->StyleSet()->GetAsServo()) {
// We use the same codepaths to handle both of the following cases:
// (a) Newly-appended content for which lazy frame construction is disallowed.
// (b) Lazy frame construction driven by the restyle manager.
// We need the styles for (a). In the case of (b), the Servo traversal has
// already happened, so we don't need to do it again.
if (!RestyleManager()->AsBase()->IsInStyleRefresh()) {
set->StyleNewChildren(aContainer->AsElement());
}
if (isNewlyAddedContentForServo) {
mPresShell->StyleSet()->AsServo()->StyleNewChildren(aContainer->AsElement());
}
LAYOUT_PHASE_TEMP_EXIT();
@ -7823,6 +7824,15 @@ nsCSSFrameConstructor::ContentRangeInserted(nsIContent* aContainer,
return rv;
}
// The frame constructor uses this codepath both for bonafide newly-added
// content and for RestyleManager-driven frame construction (RECONSTRUCT_FRAME
// and lazy frame construction). If we're using the Servo style system, we
// want to ensure that styles get resolved in the first case, whereas for the
// second case they should have already been resolved if needed.
bool isNewlyAddedContentForServo = aContainer->IsStyledByServo() &&
!RestyleManager()->AsBase()->IsInStyleRefresh();
// Put 'parentFrame' inside a scope so we don't confuse it with
// 'insertion.mParentFrame' later.
{
@ -7834,7 +7844,7 @@ nsCSSFrameConstructor::ContentRangeInserted(nsIContent* aContainer,
// We're punting on frame construction because there's no container frame.
// The Servo-backed style system handles this case like the lazy frame
// construction case.
if (aContainer->IsStyledByServo()) {
if (isNewlyAddedContentForServo) {
aContainer->AsElement()->NoteDirtyDescendantsForServo();
}
return NS_OK;
@ -7846,7 +7856,7 @@ nsCSSFrameConstructor::ContentRangeInserted(nsIContent* aContainer,
if (aAllowLazyConstruction &&
MaybeConstructLazily(CONTENTINSERT, aContainer, aStartChild)) {
if (aContainer->IsStyledByServo()) {
if (isNewlyAddedContentForServo) {
aContainer->AsElement()->NoteDirtyDescendantsForServo();
}
return NS_OK;
@ -7854,15 +7864,8 @@ nsCSSFrameConstructor::ContentRangeInserted(nsIContent* aContainer,
}
// We couldn't construct lazily. Make Servo eagerly traverse the subtree.
if (ServoStyleSet* set = mPresShell->StyleSet()->GetAsServo()) {
// We use the same codepaths to handle both of the following cases:
// (a) Newly-appended content for which lazy frame construction is disallowed.
// (b) Lazy frame construction driven by the restyle manager.
// We need the styles for (a). In the case of (b), the Servo traversal has
// already happened, so we don't need to do it again.
if (!RestyleManager()->AsBase()->IsInStyleRefresh()) {
set->StyleNewChildren(aContainer->AsElement());
}
if (isNewlyAddedContentForServo) {
mPresShell->StyleSet()->AsServo()->StyleNewChildren(aContainer->AsElement());
}
InsertionPoint insertion;