author | Mats Palmgren <mats@mozilla.com> |
Tue, 20 Jan 2015 18:20:04 +0000 | |
changeset 224735 | 700835de77fe0238b32a0f780ca57267da8b63a7 |
parent 224734 | 1bc3300cb6d17b3429d7daf24f7b42a381b103b5 |
child 224736 | 538af3cc79b26ede03d38a7fd483892add4a5a1f |
push id | 28143 |
push user | ryanvm@gmail.com |
push date | Wed, 21 Jan 2015 03:14:12 +0000 |
treeherder | mozilla-central@540077a30866 [default view] [failures only] |
perfherder | [talos] [build metrics] [platform microbench] (compared to previous push) |
reviewers | roc |
bugs | 1116714 |
milestone | 38.0a1 |
first release with | nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
|
last release without | nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
|
--- a/layout/base/nsCSSFrameConstructor.cpp +++ b/layout/base/nsCSSFrameConstructor.cpp @@ -9291,19 +9291,19 @@ nsCSSFrameConstructor::RecreateFramesFor if (frame->GetStateBits() & NS_FRAME_ANONYMOUSCONTENTCREATOR_CONTENT) { // Recreate the frames for the entire nsIAnonymousContentCreator tree // since |frame| or one of its descendants may need an nsStyleContext // that associates it to a CSS pseudo-element, and only the // nsIAnonymousContentCreator that created this content knows how to make // that happen. nsIAnonymousContentCreator* acc = nullptr; - nsIFrame* ancestor = frame->GetParent(); + nsIFrame* ancestor = nsLayoutUtils::GetParentOrPlaceholderFor(frame); while (!(acc = do_QueryFrame(ancestor))) { - ancestor = ancestor->GetParent(); + ancestor = nsLayoutUtils::GetParentOrPlaceholderFor(ancestor); } NS_ASSERTION(acc, "Where is the nsIAnonymousContentCreator? We may fail " "to recreate its content correctly"); // nsSVGUseFrame is special, and we know this is unnecessary for it. if (ancestor->GetType() != nsGkAtoms::svgUseFrame) { NS_ASSERTION(aContent->IsInNativeAnonymousSubtree(), "Why is NS_FRAME_ANONYMOUSCONTENTCREATOR_CONTENT set?"); return RecreateFramesForContent(ancestor->GetContent(), aAsyncInsert,