Bug 1321284 - Crash in nsCSSFrameConstructor::GetInsertionPrevSibling when trying to reframe native anonymous content

* Make StyleChildrenIterator skip NAC generated by root element primary frame ancestors.
* Add nsINode::GetFlattenedTreeParentNodeForStyle.
* Add iterator class to find all restyle roots.

NOTE: Parts 1, 2, and "4.2"

Tag #1375
This commit is contained in:
Matt A. Tobin 2020-04-14 21:50:13 -04:00 • committed by Roy Tam
commit a03838af22
14 changed files with 226 additions and 35 deletions

View file

@ -0,0 +1,41 @@
/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
/* vim: set ts=8 sts=2 et sw=2 tw=80: */
/* 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/. */
#include "DocumentStyleRootIterator.h"
#include "nsContentUtils.h"
namespace mozilla {
DocumentStyleRootIterator::DocumentStyleRootIterator(nsIDocument* aDocument)
: mPosition(0)
{
MOZ_COUNT_CTOR(DocumentStyleRootIterator);
if (Element* root = aDocument->GetRootElement()) {
mStyleRoots.AppendElement(root);
}
nsContentUtils::AppendDocumentLevelNativeAnonymousContentTo(
aDocument, mStyleRoots);
}
Element*
DocumentStyleRootIterator::GetNextStyleRoot()
{
for (;;) {
if (mPosition >= mStyleRoots.Length()) {
return nullptr;
}
nsIContent* next = mStyleRoots[mPosition];
++mPosition;
if (next->IsElement()) {
return next->AsElement();
}
}
}
} // namespace mozilla

View file

@ -0,0 +1,37 @@
/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
/* vim: set ts=8 sts=2 et sw=2 tw=80: */
/* 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/. */
#ifndef DocumentStyleRootIterator_h
#define DocumentStyleRootIterator_h
#include "nsTArray.h"
class nsIContent;
class nsIDocument;
namespace mozilla {
/**
* DocumentStyleRootIterator traverses the roots of the document from the
* perspective of the Servo-backed style system. This will first traverse
* the document root, followed by any document level native anonymous content.
*/
class DocumentStyleRootIterator
{
public:
explicit DocumentStyleRootIterator(nsIDocument* aDocument);
~DocumentStyleRootIterator() { MOZ_COUNT_DTOR(DocumentStyleRootIterator); }
Element* GetNextStyleRoot();
private:
AutoTArray<nsIContent*, 8> mStyleRoots;
uint32_t mPosition;
};
} // namespace mozilla
#endif // DocumentStyleRootIterator_h

View file

@ -88,6 +88,7 @@ EXPORTS.mozilla += [
'CSSVariableValues.h',
'DeclarationBlock.h',
'DeclarationBlockInlines.h',
'DocumentStyleRootIterator.h',
'HandleRefPtr.h',
'IncrementalClearCOMRuleArray.h',
'LayerAnimationInfo.h',
@ -151,6 +152,7 @@ UNIFIED_SOURCES += [
'CSSVariableResolver.cpp',
'CSSVariableValues.cpp',
'Declaration.cpp',
'DocumentStyleRootIterator.cpp',
'ErrorReporter.cpp',
'FontFace.cpp',
'FontFaceSet.cpp',