2017-10-27 20:33:53 +03:00
|
|
|
|
/* -*- 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
|
2017-10-18 06:09:07 +03:00
|
|
|
|
* 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 "RetainedDisplayListBuilder.h"
|
2018-02-02 10:18:59 +03:00
|
|
|
|
|
|
|
|
|
#include "DisplayListChecker.h"
|
2018-02-13 20:08:42 +03:00
|
|
|
|
#include "gfxPrefs.h"
|
2018-01-12 20:02:14 +03:00
|
|
|
|
#include "nsPlaceholderFrame.h"
|
2017-10-18 06:09:07 +03:00
|
|
|
|
#include "nsSubDocumentFrame.h"
|
2017-11-25 02:02:20 +03:00
|
|
|
|
#include "nsViewManager.h"
|
2018-04-15 07:38:45 +03:00
|
|
|
|
#include "nsCanvasFrame.h"
|
2017-10-18 06:09:07 +03:00
|
|
|
|
|
|
|
|
|
/**
|
|
|
|
|
* Code for doing display list building for a modified subset of the window,
|
|
|
|
|
* and then merging it into the existing display list (for the full window).
|
|
|
|
|
*
|
|
|
|
|
* The approach primarily hinges on the observation that the ‘true’ ordering of
|
|
|
|
|
* display items is represented by a DAG (only items that intersect in 2d space
|
2018-09-04 23:46:21 +03:00
|
|
|
|
* have a defined ordering). Our display list is just one of a many possible
|
|
|
|
|
* linear representations of this ordering.
|
2017-10-18 06:09:07 +03:00
|
|
|
|
*
|
2018-03-23 16:49:21 +03:00
|
|
|
|
* Each time a frame changes (gets a new ComputedStyle, or has a size/position
|
2018-09-04 23:46:21 +03:00
|
|
|
|
* change), we schedule a paint (as we do currently), but also reord the frame
|
|
|
|
|
* that changed.
|
2017-10-18 06:09:07 +03:00
|
|
|
|
*
|
2018-09-04 23:46:21 +03:00
|
|
|
|
* When the next paint occurs we union the overflow areas (in screen space) of
|
|
|
|
|
* the changed frames, and compute a rect/region that contains all changed
|
|
|
|
|
* items. We then build a display list just for this subset of the screen and
|
|
|
|
|
* merge it into the display list from last paint.
|
2017-10-18 06:09:07 +03:00
|
|
|
|
*
|
|
|
|
|
* Any items that exist in one list and not the other must not have a defined
|
|
|
|
|
* ordering in the DAG, since they need to intersect to have an ordering and
|
|
|
|
|
* we would have built both in the new list if they intersected. Given that, we
|
|
|
|
|
* can align items that appear in both lists, and any items that appear between
|
|
|
|
|
* matched items can be inserted into the merged list in any order.
|
|
|
|
|
*/
|
|
|
|
|
|
|
|
|
|
using namespace mozilla;
|
|
|
|
|
|
2018-09-19 13:21:27 +03:00
|
|
|
|
RetainedDisplayListData*
|
|
|
|
|
GetRetainedDisplayListData(nsIFrame* aRootFrame)
|
|
|
|
|
{
|
|
|
|
|
RetainedDisplayListData* data =
|
|
|
|
|
aRootFrame->GetProperty(RetainedDisplayListData::DisplayListData());
|
|
|
|
|
|
|
|
|
|
return data;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
RetainedDisplayListData*
|
|
|
|
|
GetOrSetRetainedDisplayListData(nsIFrame* aRootFrame)
|
|
|
|
|
{
|
|
|
|
|
RetainedDisplayListData* data = GetRetainedDisplayListData(aRootFrame);
|
|
|
|
|
|
|
|
|
|
if (!data) {
|
|
|
|
|
data = new RetainedDisplayListData();
|
|
|
|
|
aRootFrame->SetProperty(RetainedDisplayListData::DisplayListData(), data);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
MOZ_ASSERT(data);
|
|
|
|
|
return data;
|
|
|
|
|
}
|
|
|
|
|
|
2018-02-23 08:03:45 +03:00
|
|
|
|
static void
|
|
|
|
|
MarkFramesWithItemsAndImagesModified(nsDisplayList* aList)
|
2017-10-18 06:09:07 +03:00
|
|
|
|
{
|
|
|
|
|
for (nsDisplayItem* i = aList->GetBottom(); i != nullptr; i = i->GetAbove()) {
|
2018-09-04 23:46:21 +03:00
|
|
|
|
if (!i->HasDeletedFrame() && i->CanBeReused() &&
|
|
|
|
|
!i->Frame()->IsFrameModified()) {
|
2017-10-18 06:09:07 +03:00
|
|
|
|
// If we have existing cached geometry for this item, then check that for
|
|
|
|
|
// whether we need to invalidate for a sync decode. If we don't, then
|
|
|
|
|
// use the item's flags.
|
|
|
|
|
DisplayItemData* data = FrameLayerBuilder::GetOldDataFor(i);
|
2018-09-04 23:46:21 +03:00
|
|
|
|
// XXX: handle webrender case
|
2017-10-18 06:09:07 +03:00
|
|
|
|
bool invalidate = false;
|
2018-09-04 23:46:21 +03:00
|
|
|
|
if (data && data->GetGeometry()) {
|
2017-10-18 06:09:07 +03:00
|
|
|
|
invalidate = data->GetGeometry()->InvalidateForSyncDecodeImages();
|
|
|
|
|
} else if (!(i->GetFlags() & TYPE_RENDERS_NO_IMAGES)) {
|
|
|
|
|
invalidate = true;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
if (invalidate) {
|
|
|
|
|
i->FrameForInvalidation()->MarkNeedsDisplayItemRebuild();
|
2017-10-27 09:00:52 +03:00
|
|
|
|
if (i->GetDependentFrame()) {
|
|
|
|
|
i->GetDependentFrame()->MarkNeedsDisplayItemRebuild();
|
|
|
|
|
}
|
2017-10-18 06:09:07 +03:00
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
if (i->GetChildren()) {
|
|
|
|
|
MarkFramesWithItemsAndImagesModified(i->GetChildren());
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
2018-01-17 20:27:42 +03:00
|
|
|
|
static AnimatedGeometryRoot*
|
|
|
|
|
SelectAGRForFrame(nsIFrame* aFrame, AnimatedGeometryRoot* aParentAGR)
|
|
|
|
|
{
|
2018-09-04 23:46:21 +03:00
|
|
|
|
if (!aFrame->IsStackingContext() || !aFrame->IsFixedPosContainingBlock()) {
|
2018-01-17 20:27:42 +03:00
|
|
|
|
return aParentAGR;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
if (!aFrame->HasOverrideDirtyRegion()) {
|
|
|
|
|
return nullptr;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
nsDisplayListBuilder::DisplayListBuildingData* data =
|
|
|
|
|
aFrame->GetProperty(nsDisplayListBuilder::DisplayListBuildingRect());
|
|
|
|
|
|
2018-09-04 23:46:21 +03:00
|
|
|
|
return data && data->mModifiedAGR ? data->mModifiedAGR.get() : nullptr;
|
2018-01-17 20:27:42 +03:00
|
|
|
|
}
|
|
|
|
|
|
2017-10-18 06:09:07 +03:00
|
|
|
|
// Removes any display items that belonged to a frame that was deleted,
|
|
|
|
|
// and mark frames that belong to a different AGR so that get their
|
|
|
|
|
// items built again.
|
|
|
|
|
// TODO: We currently descend into all children even if we don't have an AGR
|
|
|
|
|
// to mark, as child stacking contexts might. It would be nice if we could
|
|
|
|
|
// jump into those immediately rather than walking the entire thing.
|
2018-01-12 01:46:23 +03:00
|
|
|
|
bool
|
2018-03-23 06:47:37 +03:00
|
|
|
|
RetainedDisplayListBuilder::PreProcessDisplayList(RetainedDisplayList* aList,
|
2018-05-18 11:50:04 +03:00
|
|
|
|
AnimatedGeometryRoot* aAGR,
|
|
|
|
|
uint32_t aCallerKey,
|
|
|
|
|
uint32_t aNestingDepth)
|
2017-10-18 06:09:07 +03:00
|
|
|
|
{
|
2018-09-04 23:46:21 +03:00
|
|
|
|
// The DAG merging algorithm does not have strong mechanisms in place to keep
|
|
|
|
|
// the complexity of the resulting DAG under control. In some cases we can
|
|
|
|
|
// build up edges very quickly. Detect those cases and force a full display
|
|
|
|
|
// list build if we hit them.
|
2018-03-23 06:47:37 +03:00
|
|
|
|
static const uint32_t kMaxEdgeRatio = 5;
|
|
|
|
|
bool initializeDAG = !aList->mDAG.Length();
|
2018-09-04 23:46:21 +03:00
|
|
|
|
if (!initializeDAG && aList->mDAG.mDirectPredecessorList.Length() >
|
|
|
|
|
(aList->mDAG.mNodesInfo.Length() * kMaxEdgeRatio)) {
|
2018-03-23 06:47:37 +03:00
|
|
|
|
return false;
|
|
|
|
|
}
|
|
|
|
|
|
2018-06-19 06:14:14 +03:00
|
|
|
|
MOZ_RELEASE_ASSERT(initializeDAG || aList->mDAG.Length() == aList->Count());
|
|
|
|
|
|
2017-11-16 06:09:28 +03:00
|
|
|
|
nsDisplayList saved;
|
2018-03-23 06:47:37 +03:00
|
|
|
|
aList->mOldItems.SetCapacity(aList->Count());
|
2018-06-19 06:14:14 +03:00
|
|
|
|
MOZ_RELEASE_ASSERT(aList->mOldItems.IsEmpty());
|
2018-03-23 06:47:37 +03:00
|
|
|
|
while (nsDisplayItem* item = aList->RemoveBottom()) {
|
2018-05-01 18:56:40 +03:00
|
|
|
|
#ifdef MOZ_DIAGNOSTIC_ASSERT_ENABLED
|
|
|
|
|
item->mMergedItem = false;
|
|
|
|
|
item->mPreProcessedItem = true;
|
|
|
|
|
#endif
|
|
|
|
|
|
2018-03-23 06:47:37 +03:00
|
|
|
|
if (item->HasDeletedFrame() || !item->CanBeReused()) {
|
2018-05-15 05:20:59 +03:00
|
|
|
|
size_t i = aList->mOldItems.Length();
|
|
|
|
|
aList->mOldItems.AppendElement(OldItemInfo(nullptr));
|
|
|
|
|
item->Destroy(&mBuilder);
|
|
|
|
|
|
2018-03-23 06:47:37 +03:00
|
|
|
|
if (initializeDAG) {
|
2018-05-15 05:20:59 +03:00
|
|
|
|
if (i == 0) {
|
|
|
|
|
aList->mDAG.AddNode(Span<const MergedListIndex>());
|
|
|
|
|
} else {
|
|
|
|
|
MergedListIndex previous(i - 1);
|
|
|
|
|
aList->mDAG.AddNode(Span<const MergedListIndex>(&previous, 1));
|
|
|
|
|
}
|
2018-03-23 06:47:37 +03:00
|
|
|
|
}
|
2017-10-18 06:09:07 +03:00
|
|
|
|
continue;
|
|
|
|
|
}
|
|
|
|
|
|
2018-04-24 03:59:11 +03:00
|
|
|
|
size_t i = aList->mOldItems.Length();
|
2018-03-23 06:47:37 +03:00
|
|
|
|
aList->mOldItems.AppendElement(OldItemInfo(item));
|
2018-05-18 11:50:04 +03:00
|
|
|
|
item->SetOldListIndex(aList, OldListIndex(i), aCallerKey, aNestingDepth);
|
2018-03-23 06:47:37 +03:00
|
|
|
|
if (initializeDAG) {
|
|
|
|
|
if (i == 0) {
|
|
|
|
|
aList->mDAG.AddNode(Span<const MergedListIndex>());
|
|
|
|
|
} else {
|
|
|
|
|
MergedListIndex previous(i - 1);
|
|
|
|
|
aList->mDAG.AddNode(Span<const MergedListIndex>(&previous, 1));
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
nsIFrame* f = item->Frame();
|
|
|
|
|
|
|
|
|
|
if (item->GetChildren()) {
|
2018-09-04 23:46:21 +03:00
|
|
|
|
if (!PreProcessDisplayList(item->GetChildren(),
|
|
|
|
|
SelectAGRForFrame(f, aAGR),
|
|
|
|
|
item->GetPerFrameKey(),
|
|
|
|
|
aNestingDepth + 1)) {
|
2018-05-15 05:21:05 +03:00
|
|
|
|
return false;
|
2018-01-12 01:46:23 +03:00
|
|
|
|
}
|
2017-10-18 06:09:07 +03:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
// TODO: We should be able to check the clipped bounds relative
|
|
|
|
|
// to the common AGR (of both the existing item and the invalidated
|
|
|
|
|
// frame) and determine if they can ever intersect.
|
2018-03-23 06:47:37 +03:00
|
|
|
|
if (aAGR && item->GetAnimatedGeometryRoot()->GetAsyncAGR() != aAGR) {
|
2017-10-25 13:10:04 +03:00
|
|
|
|
mBuilder.MarkFrameForDisplayIfVisible(f, mBuilder.RootReferenceFrame());
|
2017-10-18 06:09:07 +03:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
// TODO: This is here because we sometimes reuse the previous display list
|
|
|
|
|
// completely. For optimization, we could only restore the state for reused
|
|
|
|
|
// display items.
|
2018-03-23 06:47:37 +03:00
|
|
|
|
item->RestoreState();
|
2017-10-18 06:09:07 +03:00
|
|
|
|
}
|
2018-06-19 06:14:14 +03:00
|
|
|
|
MOZ_RELEASE_ASSERT(aList->mOldItems.Length() == aList->mDAG.Length());
|
2017-10-18 06:09:07 +03:00
|
|
|
|
aList->RestoreState();
|
2018-03-23 06:47:37 +03:00
|
|
|
|
return true;
|
2017-10-18 06:09:07 +03:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
void
|
2018-09-04 23:46:21 +03:00
|
|
|
|
RetainedDisplayListBuilder::IncrementSubDocPresShellPaintCount(
|
|
|
|
|
nsDisplayItem* aItem)
|
2017-10-18 06:09:07 +03:00
|
|
|
|
{
|
|
|
|
|
MOZ_ASSERT(aItem->GetType() == DisplayItemType::TYPE_SUBDOCUMENT);
|
|
|
|
|
|
|
|
|
|
nsSubDocumentFrame* subDocFrame =
|
|
|
|
|
static_cast<nsDisplaySubDocument*>(aItem)->SubDocumentFrame();
|
|
|
|
|
MOZ_ASSERT(subDocFrame);
|
|
|
|
|
|
|
|
|
|
nsIPresShell* presShell = subDocFrame->GetSubdocumentPresShellForPainting(0);
|
|
|
|
|
MOZ_ASSERT(presShell);
|
|
|
|
|
|
|
|
|
|
mBuilder.IncrementPresShellPaintCount(presShell);
|
|
|
|
|
}
|
|
|
|
|
|
2018-04-16 01:14:00 +03:00
|
|
|
|
static bool
|
2018-09-04 23:46:21 +03:00
|
|
|
|
AnyContentAncestorModified(nsIFrame* aFrame, nsIFrame* aStopAtFrame = nullptr)
|
2018-04-16 01:14:00 +03:00
|
|
|
|
{
|
|
|
|
|
for (nsIFrame* f = aFrame; f;
|
|
|
|
|
f = nsLayoutUtils::GetParentOrPlaceholderForCrossDoc(f)) {
|
|
|
|
|
if (f->IsFrameModified()) {
|
|
|
|
|
return true;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
if (aStopAtFrame && f == aStopAtFrame) {
|
|
|
|
|
break;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
return false;
|
|
|
|
|
}
|
|
|
|
|
|
2018-02-23 08:03:45 +03:00
|
|
|
|
static void
|
2018-09-04 23:46:21 +03:00
|
|
|
|
UpdateASR(nsDisplayItem* aItem, Maybe<const ActiveScrolledRoot*>& aContainerASR)
|
2017-11-10 03:16:55 +03:00
|
|
|
|
{
|
2017-11-12 23:02:48 +03:00
|
|
|
|
if (!aContainerASR) {
|
|
|
|
|
return;
|
|
|
|
|
}
|
|
|
|
|
|
2017-11-10 03:16:55 +03:00
|
|
|
|
nsDisplayWrapList* wrapList = aItem->AsDisplayWrapList();
|
|
|
|
|
if (!wrapList) {
|
2017-11-12 23:02:48 +03:00
|
|
|
|
aItem->SetActiveScrolledRoot(aContainerASR.value());
|
2017-11-10 03:16:55 +03:00
|
|
|
|
return;
|
|
|
|
|
}
|
|
|
|
|
|
2018-09-04 23:46:21 +03:00
|
|
|
|
wrapList->SetActiveScrolledRoot(ActiveScrolledRoot::PickAncestor(
|
|
|
|
|
wrapList->GetFrameActiveScrolledRoot(), aContainerASR.value()));
|
2017-11-10 03:16:55 +03:00
|
|
|
|
}
|
|
|
|
|
|
2018-03-23 06:47:37 +03:00
|
|
|
|
void
|
|
|
|
|
OldItemInfo::AddedMatchToMergedList(RetainedDisplayListBuilder* aBuilder,
|
|
|
|
|
MergedListIndex aIndex)
|
|
|
|
|
{
|
|
|
|
|
AddedToMergedList(aIndex);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
void
|
|
|
|
|
OldItemInfo::Discard(RetainedDisplayListBuilder* aBuilder,
|
|
|
|
|
nsTArray<MergedListIndex>&& aDirectPredecessors)
|
|
|
|
|
{
|
|
|
|
|
MOZ_ASSERT(!IsUsed());
|
|
|
|
|
mUsed = mDiscarded = true;
|
2018-05-30 22:15:35 +03:00
|
|
|
|
mDirectPredecessors = std::move(aDirectPredecessors);
|
2018-05-15 05:20:59 +03:00
|
|
|
|
if (mItem) {
|
|
|
|
|
mItem->Destroy(aBuilder->Builder());
|
|
|
|
|
}
|
2018-03-23 06:47:37 +03:00
|
|
|
|
mItem = nullptr;
|
|
|
|
|
}
|
|
|
|
|
|
2018-04-24 03:59:11 +03:00
|
|
|
|
bool
|
|
|
|
|
OldItemInfo::IsChanged()
|
|
|
|
|
{
|
|
|
|
|
return !mItem || mItem->HasDeletedFrame() || !mItem->CanBeReused();
|
|
|
|
|
}
|
|
|
|
|
|
2017-10-18 06:09:07 +03:00
|
|
|
|
/**
|
2018-04-24 03:59:11 +03:00
|
|
|
|
* A C++ implementation of Markus Stange's merge-dags algorithm.
|
2018-03-23 06:47:37 +03:00
|
|
|
|
* https://github.com/mstange/merge-dags
|
2018-03-30 19:08:30 +03:00
|
|
|
|
*
|
2018-03-23 06:47:37 +03:00
|
|
|
|
* MergeState handles combining a new list of display items into an existing
|
|
|
|
|
* DAG and computes the new DAG in a single pass.
|
2018-09-04 23:46:21 +03:00
|
|
|
|
* Each time we add a new item, we resolve all dependencies for it, so that the
|
|
|
|
|
* resulting list and DAG are built in topological ordering.
|
2017-10-18 06:09:07 +03:00
|
|
|
|
*/
|
2018-09-04 23:46:21 +03:00
|
|
|
|
class MergeState
|
|
|
|
|
{
|
2018-03-23 06:47:37 +03:00
|
|
|
|
public:
|
2018-09-04 23:46:21 +03:00
|
|
|
|
MergeState(RetainedDisplayListBuilder* aBuilder,
|
|
|
|
|
RetainedDisplayList& aOldList,
|
|
|
|
|
uint32_t aOuterKey)
|
2018-03-23 06:47:37 +03:00
|
|
|
|
: mBuilder(aBuilder)
|
2018-04-24 03:59:11 +03:00
|
|
|
|
, mOldList(&aOldList)
|
2018-05-30 22:15:35 +03:00
|
|
|
|
, mOldItems(std::move(aOldList.mOldItems))
|
2018-09-04 23:46:21 +03:00
|
|
|
|
, mOldDAG(std::move(
|
|
|
|
|
*reinterpret_cast<DirectedAcyclicGraph<OldListUnits>*>(&aOldList.mDAG)))
|
2018-05-18 11:50:04 +03:00
|
|
|
|
, mOuterKey(aOuterKey)
|
2018-03-23 06:47:37 +03:00
|
|
|
|
, mResultIsModified(false)
|
|
|
|
|
{
|
|
|
|
|
mMergedDAG.EnsureCapacityFor(mOldDAG);
|
2018-06-19 06:14:14 +03:00
|
|
|
|
MOZ_RELEASE_ASSERT(mOldItems.Length() == mOldDAG.Length());
|
2018-03-23 06:47:37 +03:00
|
|
|
|
}
|
|
|
|
|
|
2018-09-04 23:46:21 +03:00
|
|
|
|
MergedListIndex ProcessItemFromNewList(
|
|
|
|
|
nsDisplayItem* aNewItem,
|
|
|
|
|
const Maybe<MergedListIndex>& aPreviousItem)
|
|
|
|
|
{
|
2018-03-23 06:47:37 +03:00
|
|
|
|
OldListIndex oldIndex;
|
2018-04-24 03:59:11 +03:00
|
|
|
|
if (!HasModifiedFrame(aNewItem) &&
|
|
|
|
|
HasMatchingItemInOldList(aNewItem, &oldIndex)) {
|
Bug 1451384 - Check IsChanged on the old item during merging, since that's the one that might have a deleted frame. r=mstange
This happens when an nsIFrame* that builds an nsDisplayWrapList is deleted, but then the memory is immediately reused for another frame that builds the same type display item, within the same display list.
PreProcessDisplayLists chooses not to descend into the nsDisplayWrapList for the deleted frame, and so mOldItems remains uninitialized for the old sublist.
When adding the new instance, IsChanged returns false, since the pointers are the same, and we're checking HasDeletedFrame on the new instance (where it's never true), instead of the old. We then recurse into MergeDisplayLists, with an uninitialized mOldItems array, and crash.
I haven't added a test because I haven't yet figured out how to create a minimal testcase, and the test would rely on implementation details of the frame allocator to remain unchanged to be useful.
MozReview-Commit-ID: pHimEvfAND
--HG--
extra : rebase_source : 10baa8cabf1eca8d592f2be0eb7bc7c9461f9785
2018-04-05 03:20:32 +03:00
|
|
|
|
nsDisplayItem* oldItem = mOldItems[oldIndex.val].mItem;
|
2018-09-04 23:46:21 +03:00
|
|
|
|
MOZ_DIAGNOSTIC_ASSERT(oldItem->GetPerFrameKey() ==
|
|
|
|
|
aNewItem->GetPerFrameKey() &&
|
2018-05-01 18:56:40 +03:00
|
|
|
|
oldItem->Frame() == aNewItem->Frame());
|
2018-04-24 03:59:11 +03:00
|
|
|
|
if (!mOldItems[oldIndex.val].IsChanged()) {
|
2018-05-01 18:56:40 +03:00
|
|
|
|
MOZ_DIAGNOSTIC_ASSERT(!mOldItems[oldIndex.val].IsUsed());
|
2018-07-30 07:03:32 +03:00
|
|
|
|
nsDisplayItem* destItem;
|
|
|
|
|
if (ShouldUseNewItem(aNewItem)) {
|
|
|
|
|
destItem = aNewItem;
|
|
|
|
|
} else {
|
|
|
|
|
destItem = oldItem;
|
|
|
|
|
// The building rect can depend on the overflow rect (when the parent
|
|
|
|
|
// frame is position:fixed), which can change without invalidating
|
|
|
|
|
// the frame/items. If we're using the old item, copy the building
|
|
|
|
|
// rect across from the new item.
|
|
|
|
|
oldItem->SetBuildingRect(aNewItem->GetBuildingRect());
|
|
|
|
|
}
|
|
|
|
|
|
2018-03-23 06:47:37 +03:00
|
|
|
|
if (aNewItem->GetChildren()) {
|
|
|
|
|
Maybe<const ActiveScrolledRoot*> containerASRForChildren;
|
|
|
|
|
if (mBuilder->MergeDisplayLists(aNewItem->GetChildren(),
|
Bug 1451384 - Check IsChanged on the old item during merging, since that's the one that might have a deleted frame. r=mstange
This happens when an nsIFrame* that builds an nsDisplayWrapList is deleted, but then the memory is immediately reused for another frame that builds the same type display item, within the same display list.
PreProcessDisplayLists chooses not to descend into the nsDisplayWrapList for the deleted frame, and so mOldItems remains uninitialized for the old sublist.
When adding the new instance, IsChanged returns false, since the pointers are the same, and we're checking HasDeletedFrame on the new instance (where it's never true), instead of the old. We then recurse into MergeDisplayLists, with an uninitialized mOldItems array, and crash.
I haven't added a test because I haven't yet figured out how to create a minimal testcase, and the test would rely on implementation details of the frame allocator to remain unchanged to be useful.
MozReview-Commit-ID: pHimEvfAND
--HG--
extra : rebase_source : 10baa8cabf1eca8d592f2be0eb7bc7c9461f9785
2018-04-05 03:20:32 +03:00
|
|
|
|
oldItem->GetChildren(),
|
2018-07-13 03:26:36 +03:00
|
|
|
|
destItem->GetChildren(),
|
2018-05-18 11:50:04 +03:00
|
|
|
|
containerASRForChildren,
|
|
|
|
|
aNewItem->GetPerFrameKey())) {
|
2018-07-13 03:26:36 +03:00
|
|
|
|
destItem->InvalidateCachedChildInfo();
|
2018-03-23 06:47:37 +03:00
|
|
|
|
mResultIsModified = true;
|
|
|
|
|
}
|
2018-07-13 03:26:36 +03:00
|
|
|
|
UpdateASR(destItem, containerASRForChildren);
|
|
|
|
|
destItem->UpdateBounds(mBuilder->Builder());
|
2018-03-23 06:47:37 +03:00
|
|
|
|
}
|
2018-03-23 06:47:37 +03:00
|
|
|
|
|
2018-09-04 23:46:21 +03:00
|
|
|
|
AutoTArray<MergedListIndex, 2> directPredecessors =
|
|
|
|
|
ProcessPredecessorsOfOldNode(oldIndex);
|
|
|
|
|
MergedListIndex newIndex = AddNewNode(
|
|
|
|
|
destItem, Some(oldIndex), directPredecessors, aPreviousItem);
|
2018-03-23 06:47:37 +03:00
|
|
|
|
mOldItems[oldIndex.val].AddedMatchToMergedList(mBuilder, newIndex);
|
2018-07-13 03:26:36 +03:00
|
|
|
|
if (destItem == aNewItem) {
|
|
|
|
|
oldItem->Destroy(mBuilder->Builder());
|
|
|
|
|
} else {
|
|
|
|
|
aNewItem->Destroy(mBuilder->Builder());
|
|
|
|
|
}
|
2018-03-23 06:47:37 +03:00
|
|
|
|
return newIndex;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
mResultIsModified = true;
|
2018-09-04 23:46:21 +03:00
|
|
|
|
return AddNewNode(
|
|
|
|
|
aNewItem, Nothing(), Span<MergedListIndex>(), aPreviousItem);
|
2018-03-23 06:47:37 +03:00
|
|
|
|
}
|
|
|
|
|
|
2018-07-13 03:26:36 +03:00
|
|
|
|
bool ShouldUseNewItem(nsDisplayItem* aNewItem)
|
|
|
|
|
{
|
2018-09-04 23:46:21 +03:00
|
|
|
|
// Generally we want to use the old item when the frame isn't marked as
|
|
|
|
|
// modified so that any cached information on the item (or referencing the
|
|
|
|
|
// item) gets retained. Quite a few FrameLayerBuilder performance
|
|
|
|
|
// improvements benefit by this. Sometimes, however, we can end up where the
|
|
|
|
|
// new item paints something different from the old item, even though we
|
|
|
|
|
// haven't modified the frame, and it's hard to fix. In these cases we just
|
|
|
|
|
// always use the new item to be safe.
|
2018-07-13 03:26:36 +03:00
|
|
|
|
DisplayItemType type = aNewItem->GetType();
|
|
|
|
|
if (type == DisplayItemType::TYPE_CANVAS_BACKGROUND_COLOR ||
|
|
|
|
|
type == DisplayItemType::TYPE_SOLID_COLOR) {
|
|
|
|
|
// The canvas background color item can paint the color from another
|
|
|
|
|
// frame, and even though we schedule a paint, we don't mark the canvas
|
|
|
|
|
// frame as invalid.
|
|
|
|
|
return true;
|
2018-09-04 20:19:36 +03:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
if (type == DisplayItemType::TYPE_TABLE_BORDER_COLLAPSE) {
|
2018-09-04 23:46:21 +03:00
|
|
|
|
// We intentionally don't mark the root table frame as modified when a
|
|
|
|
|
// subframe changes, even though the border collapse item for the root
|
|
|
|
|
// frame is what paints the changed border. Marking the root frame as
|
|
|
|
|
// modified would rebuild display items for the whole table area, and we
|
|
|
|
|
// don't want that.
|
2018-07-13 03:26:36 +03:00
|
|
|
|
return true;
|
2018-09-04 20:19:36 +03:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
if (type == DisplayItemType::TYPE_TEXT_OVERFLOW) {
|
2018-09-04 23:46:21 +03:00
|
|
|
|
// Text overflow marker items are created with the wrapping block as their
|
|
|
|
|
// frame, and have an index value to note which line they are created for.
|
|
|
|
|
// Their rendering can change if the items on that line change, which may
|
|
|
|
|
// not mark the block as modified. We rebuild them if we build any item on
|
|
|
|
|
// the line, so we should always get new items if they might have changed
|
|
|
|
|
// rendering, and it's easier to just use the new items rather than
|
|
|
|
|
// computing if we actually need them.
|
2018-07-13 03:26:36 +03:00
|
|
|
|
return true;
|
2018-09-04 20:19:36 +03:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
if (type == DisplayItemType::TYPE_SUBDOCUMENT) {
|
2018-07-13 03:26:36 +03:00
|
|
|
|
// nsDisplaySubDocument::mShouldFlatten can change without an invalidation
|
2018-09-04 23:46:21 +03:00
|
|
|
|
// (and is the reason we unconditionally build the subdocument item), so
|
|
|
|
|
// always use the new one to make sure we get the right value.
|
2018-07-13 03:26:36 +03:00
|
|
|
|
return true;
|
2018-09-04 20:19:36 +03:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
if (type == DisplayItemType::TYPE_CARET) {
|
2018-08-03 13:15:55 +03:00
|
|
|
|
// The caret can change position while still being owned by the same frame
|
2018-09-04 23:46:21 +03:00
|
|
|
|
// and we don't invalidate in that case. Use the new version since the
|
|
|
|
|
// changed bounds are needed for DLBI.
|
2018-08-03 13:15:55 +03:00
|
|
|
|
return true;
|
2018-07-13 03:26:36 +03:00
|
|
|
|
}
|
2018-09-04 20:19:36 +03:00
|
|
|
|
|
2018-07-13 03:26:36 +03:00
|
|
|
|
return false;
|
|
|
|
|
}
|
|
|
|
|
|
2018-09-04 23:46:21 +03:00
|
|
|
|
RetainedDisplayList Finalize()
|
|
|
|
|
{
|
2018-03-23 06:47:37 +03:00
|
|
|
|
for (size_t i = 0; i < mOldDAG.Length(); i++) {
|
|
|
|
|
if (mOldItems[i].IsUsed()) {
|
|
|
|
|
continue;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
AutoTArray<MergedListIndex, 2> directPredecessors =
|
2018-09-04 23:46:21 +03:00
|
|
|
|
ResolveNodeIndexesOldToMerged(
|
|
|
|
|
mOldDAG.GetDirectPredecessors(OldListIndex(i)));
|
2018-05-30 22:15:35 +03:00
|
|
|
|
ProcessOldNode(OldListIndex(i), std::move(directPredecessors));
|
2018-03-23 06:47:37 +03:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
RetainedDisplayList result;
|
|
|
|
|
result.AppendToTop(&mMergedItems);
|
2018-05-30 22:15:35 +03:00
|
|
|
|
result.mDAG = std::move(mMergedDAG);
|
2018-06-19 06:14:14 +03:00
|
|
|
|
MOZ_RELEASE_ASSERT(result.mDAG.Length() == result.Count());
|
2018-03-23 06:47:37 +03:00
|
|
|
|
return result;
|
|
|
|
|
}
|
|
|
|
|
|
2018-04-24 03:59:11 +03:00
|
|
|
|
bool HasMatchingItemInOldList(nsDisplayItem* aItem, OldListIndex* aOutIndex)
|
|
|
|
|
{
|
2018-09-04 23:46:21 +03:00
|
|
|
|
nsIFrame::DisplayItemArray* items =
|
|
|
|
|
aItem->Frame()->GetProperty(nsIFrame::DisplayItems());
|
|
|
|
|
// Look for an item that matches aItem's frame and per-frame-key, but isn't
|
|
|
|
|
// the same item.
|
2018-04-24 03:59:11 +03:00
|
|
|
|
for (nsDisplayItem* i : *items) {
|
|
|
|
|
if (i != aItem && i->Frame() == aItem->Frame() &&
|
|
|
|
|
i->GetPerFrameKey() == aItem->GetPerFrameKey()) {
|
2018-05-23 01:59:11 +03:00
|
|
|
|
if (i->GetOldListIndex(mOldList, mOuterKey, aOutIndex)) {
|
|
|
|
|
return true;
|
|
|
|
|
}
|
2018-04-24 03:59:11 +03:00
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
return false;
|
|
|
|
|
}
|
|
|
|
|
|
2018-09-04 23:46:21 +03:00
|
|
|
|
bool HasModifiedFrame(nsDisplayItem* aItem)
|
|
|
|
|
{
|
2018-04-24 03:59:11 +03:00
|
|
|
|
return AnyContentAncestorModified(aItem->FrameForInvalidation());
|
2018-03-23 06:47:37 +03:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
void UpdateContainerASR(nsDisplayItem* aItem)
|
|
|
|
|
{
|
2017-11-10 03:16:55 +03:00
|
|
|
|
const ActiveScrolledRoot* itemClipASR =
|
|
|
|
|
aItem->GetClipChain() ? aItem->GetClipChain()->mASR : nullptr;
|
|
|
|
|
|
2018-09-04 23:46:21 +03:00
|
|
|
|
const ActiveScrolledRoot* finiteBoundsASR =
|
|
|
|
|
ActiveScrolledRoot::PickDescendant(itemClipASR,
|
|
|
|
|
aItem->GetActiveScrolledRoot());
|
2018-03-23 06:47:37 +03:00
|
|
|
|
if (!mContainerASR) {
|
|
|
|
|
mContainerASR = Some(finiteBoundsASR);
|
2017-11-10 03:16:55 +03:00
|
|
|
|
} else {
|
2018-09-04 23:46:21 +03:00
|
|
|
|
mContainerASR = Some(ActiveScrolledRoot::PickAncestor(
|
|
|
|
|
mContainerASR.value(), finiteBoundsASR));
|
2017-11-10 03:16:55 +03:00
|
|
|
|
}
|
2018-03-23 06:47:37 +03:00
|
|
|
|
}
|
2017-11-11 05:46:48 +03:00
|
|
|
|
|
2018-09-04 23:46:21 +03:00
|
|
|
|
MergedListIndex AddNewNode(
|
|
|
|
|
nsDisplayItem* aItem,
|
|
|
|
|
const Maybe<OldListIndex>& aOldIndex,
|
|
|
|
|
Span<const MergedListIndex> aDirectPredecessors,
|
|
|
|
|
const Maybe<MergedListIndex>& aExtraDirectPredecessor)
|
|
|
|
|
{
|
2018-03-23 06:47:37 +03:00
|
|
|
|
UpdateContainerASR(aItem);
|
2018-05-01 18:56:40 +03:00
|
|
|
|
|
|
|
|
|
#ifdef MOZ_DIAGNOSTIC_ASSERT_ENABLED
|
2018-09-04 23:46:21 +03:00
|
|
|
|
nsIFrame::DisplayItemArray* items =
|
|
|
|
|
aItem->Frame()->GetProperty(nsIFrame::DisplayItems());
|
2018-05-01 18:56:40 +03:00
|
|
|
|
for (nsDisplayItem* i : *items) {
|
|
|
|
|
if (i->Frame() == aItem->Frame() &&
|
|
|
|
|
i->GetPerFrameKey() == aItem->GetPerFrameKey()) {
|
|
|
|
|
MOZ_DIAGNOSTIC_ASSERT(!i->mMergedItem);
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
aItem->mMergedItem = true;
|
|
|
|
|
aItem->mPreProcessedItem = false;
|
|
|
|
|
#endif
|
|
|
|
|
|
2018-03-23 06:47:37 +03:00
|
|
|
|
mMergedItems.AppendToTop(aItem);
|
2018-09-04 23:46:21 +03:00
|
|
|
|
MergedListIndex newIndex =
|
|
|
|
|
mMergedDAG.AddNode(aDirectPredecessors, aExtraDirectPredecessor);
|
2018-03-23 06:47:37 +03:00
|
|
|
|
return newIndex;
|
|
|
|
|
}
|
2017-10-18 06:09:07 +03:00
|
|
|
|
|
2018-09-04 23:46:21 +03:00
|
|
|
|
void ProcessOldNode(OldListIndex aNode,
|
|
|
|
|
nsTArray<MergedListIndex>&& aDirectPredecessors)
|
|
|
|
|
{
|
2018-03-23 06:47:37 +03:00
|
|
|
|
nsDisplayItem* item = mOldItems[aNode.val].mItem;
|
2018-04-24 03:59:11 +03:00
|
|
|
|
if (mOldItems[aNode.val].IsChanged() || HasModifiedFrame(item)) {
|
2018-05-30 22:15:35 +03:00
|
|
|
|
mOldItems[aNode.val].Discard(mBuilder, std::move(aDirectPredecessors));
|
2018-03-23 06:47:37 +03:00
|
|
|
|
mResultIsModified = true;
|
|
|
|
|
} else {
|
|
|
|
|
if (item->GetChildren()) {
|
|
|
|
|
Maybe<const ActiveScrolledRoot*> containerASRForChildren;
|
|
|
|
|
nsDisplayList empty;
|
2018-09-04 23:46:21 +03:00
|
|
|
|
if (mBuilder->MergeDisplayLists(&empty,
|
|
|
|
|
item->GetChildren(),
|
|
|
|
|
item->GetChildren(),
|
|
|
|
|
containerASRForChildren,
|
|
|
|
|
item->GetPerFrameKey())) {
|
2018-07-03 23:26:40 +03:00
|
|
|
|
item->InvalidateCachedChildInfo();
|
2018-03-23 06:47:37 +03:00
|
|
|
|
mResultIsModified = true;
|
|
|
|
|
}
|
|
|
|
|
UpdateASR(item, containerASRForChildren);
|
|
|
|
|
item->UpdateBounds(mBuilder->Builder());
|
|
|
|
|
}
|
|
|
|
|
if (item->GetType() == DisplayItemType::TYPE_SUBDOCUMENT) {
|
|
|
|
|
mBuilder->IncrementSubDocPresShellPaintCount(item);
|
|
|
|
|
}
|
|
|
|
|
item->SetReused(true);
|
|
|
|
|
mOldItems[aNode.val].AddedToMergedList(
|
|
|
|
|
AddNewNode(item, Some(aNode), aDirectPredecessors, Nothing()));
|
2017-10-18 06:09:07 +03:00
|
|
|
|
}
|
2018-03-23 06:47:37 +03:00
|
|
|
|
}
|
2017-11-22 05:10:31 +03:00
|
|
|
|
|
2018-09-04 23:46:21 +03:00
|
|
|
|
struct PredecessorStackItem
|
|
|
|
|
{
|
2018-03-23 06:47:37 +03:00
|
|
|
|
PredecessorStackItem(OldListIndex aNode, Span<OldListIndex> aPredecessors)
|
2018-09-04 23:46:21 +03:00
|
|
|
|
: mNode(aNode)
|
|
|
|
|
, mDirectPredecessors(aPredecessors)
|
|
|
|
|
, mCurrentPredecessorIndex(0)
|
|
|
|
|
{
|
|
|
|
|
}
|
2018-03-26 16:13:54 +03:00
|
|
|
|
|
2018-09-04 23:46:21 +03:00
|
|
|
|
bool IsFinished()
|
|
|
|
|
{
|
2018-03-23 06:47:37 +03:00
|
|
|
|
return mCurrentPredecessorIndex == mDirectPredecessors.Length();
|
2018-04-03 19:51:49 +03:00
|
|
|
|
}
|
2018-03-30 19:08:30 +03:00
|
|
|
|
|
2018-09-04 23:46:21 +03:00
|
|
|
|
OldListIndex GetAndIncrementCurrentPredecessor()
|
|
|
|
|
{
|
|
|
|
|
return mDirectPredecessors[mCurrentPredecessorIndex++];
|
|
|
|
|
}
|
2018-03-23 06:47:37 +03:00
|
|
|
|
|
2018-03-23 06:47:37 +03:00
|
|
|
|
OldListIndex mNode;
|
|
|
|
|
Span<OldListIndex> mDirectPredecessors;
|
|
|
|
|
size_t mCurrentPredecessorIndex;
|
|
|
|
|
};
|
2018-04-03 19:51:49 +03:00
|
|
|
|
|
2018-09-04 23:46:21 +03:00
|
|
|
|
AutoTArray<MergedListIndex, 2> ProcessPredecessorsOfOldNode(
|
|
|
|
|
OldListIndex aNode)
|
|
|
|
|
{
|
|
|
|
|
AutoTArray<PredecessorStackItem, 256> mStack;
|
|
|
|
|
mStack.AppendElement(
|
|
|
|
|
PredecessorStackItem(aNode, mOldDAG.GetDirectPredecessors(aNode)));
|
2018-03-23 06:47:37 +03:00
|
|
|
|
|
|
|
|
|
while (true) {
|
|
|
|
|
if (mStack.LastElement().IsFinished()) {
|
2018-09-04 23:46:21 +03:00
|
|
|
|
// If we've finished processing all the entries in the current set, then
|
|
|
|
|
// pop it off the processing stack and process it.
|
2018-03-23 06:47:37 +03:00
|
|
|
|
PredecessorStackItem item = mStack.PopLastElement();
|
2018-09-04 23:46:21 +03:00
|
|
|
|
AutoTArray<MergedListIndex, 2> result =
|
2018-03-23 06:47:37 +03:00
|
|
|
|
ResolveNodeIndexesOldToMerged(item.mDirectPredecessors);
|
2018-09-04 20:19:36 +03:00
|
|
|
|
|
2018-03-23 06:47:37 +03:00
|
|
|
|
if (mStack.IsEmpty()) {
|
|
|
|
|
return result;
|
2018-03-30 19:08:30 +03:00
|
|
|
|
}
|
2018-09-04 20:19:36 +03:00
|
|
|
|
|
|
|
|
|
ProcessOldNode(item.mNode, std::move(result));
|
2018-03-23 06:47:37 +03:00
|
|
|
|
} else {
|
2018-09-04 23:46:21 +03:00
|
|
|
|
// Grab the current predecessor, push predecessors of that onto the
|
|
|
|
|
// processing stack (if it hasn't already been processed), and then
|
|
|
|
|
// advance to the next entry.
|
|
|
|
|
OldListIndex currentIndex =
|
|
|
|
|
mStack.LastElement().GetAndIncrementCurrentPredecessor();
|
2018-03-23 06:47:37 +03:00
|
|
|
|
if (!mOldItems[currentIndex.val].IsUsed()) {
|
2018-09-04 23:46:21 +03:00
|
|
|
|
mStack.AppendElement(PredecessorStackItem(
|
|
|
|
|
currentIndex, mOldDAG.GetDirectPredecessors(currentIndex)));
|
2018-03-23 06:47:37 +03:00
|
|
|
|
}
|
2018-03-30 19:08:30 +03:00
|
|
|
|
}
|
|
|
|
|
}
|
2018-03-23 06:47:37 +03:00
|
|
|
|
}
|
|
|
|
|
|
2018-09-04 23:46:21 +03:00
|
|
|
|
AutoTArray<MergedListIndex, 2> ResolveNodeIndexesOldToMerged(
|
|
|
|
|
Span<OldListIndex> aDirectPredecessors)
|
|
|
|
|
{
|
2018-03-23 06:47:37 +03:00
|
|
|
|
AutoTArray<MergedListIndex, 2> result;
|
|
|
|
|
result.SetCapacity(aDirectPredecessors.Length());
|
|
|
|
|
for (OldListIndex index : aDirectPredecessors) {
|
|
|
|
|
OldItemInfo& oldItem = mOldItems[index.val];
|
|
|
|
|
if (oldItem.IsDiscarded()) {
|
|
|
|
|
for (MergedListIndex inner : oldItem.mDirectPredecessors) {
|
|
|
|
|
if (!result.Contains(inner)) {
|
|
|
|
|
result.AppendElement(inner);
|
|
|
|
|
}
|
2018-04-03 19:51:49 +03:00
|
|
|
|
}
|
2018-03-23 06:47:37 +03:00
|
|
|
|
} else {
|
|
|
|
|
result.AppendElement(oldItem.mIndex);
|
2018-04-03 19:51:49 +03:00
|
|
|
|
}
|
|
|
|
|
}
|
2018-03-23 06:47:37 +03:00
|
|
|
|
return result;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
RetainedDisplayListBuilder* mBuilder;
|
2018-04-24 03:59:11 +03:00
|
|
|
|
RetainedDisplayList* mOldList;
|
2018-03-23 06:47:37 +03:00
|
|
|
|
Maybe<const ActiveScrolledRoot*> mContainerASR;
|
|
|
|
|
nsTArray<OldItemInfo> mOldItems;
|
|
|
|
|
DirectedAcyclicGraph<OldListUnits> mOldDAG;
|
|
|
|
|
// Unfortunately we can't use strong typing for the hashtables
|
|
|
|
|
// since they internally encode the type with the mOps pointer,
|
|
|
|
|
// and assert when we try swap the contents
|
|
|
|
|
nsDisplayList mMergedItems;
|
|
|
|
|
DirectedAcyclicGraph<MergedListUnits> mMergedDAG;
|
2018-05-18 11:50:04 +03:00
|
|
|
|
uint32_t mOuterKey;
|
2018-03-23 06:47:37 +03:00
|
|
|
|
bool mResultIsModified;
|
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
/**
|
|
|
|
|
* Takes two display lists and merges them into an output list.
|
|
|
|
|
*
|
2018-09-04 23:46:21 +03:00
|
|
|
|
* Display lists wthout an explicit DAG are interpreted as linear DAGs (with a
|
|
|
|
|
* maximum of one direct predecessor and one direct successor per node). We add
|
|
|
|
|
* the two DAGs together, and then output the topological sorted ordering as the
|
|
|
|
|
* final display list.
|
2018-03-23 06:47:37 +03:00
|
|
|
|
*
|
2018-09-04 23:46:21 +03:00
|
|
|
|
* Once we've merged a list, we then retain the DAG (as part of the
|
|
|
|
|
* RetainedDisplayList object) to use for future merges.
|
2018-03-23 06:47:37 +03:00
|
|
|
|
*/
|
|
|
|
|
bool
|
2018-09-04 23:46:21 +03:00
|
|
|
|
RetainedDisplayListBuilder::MergeDisplayLists(
|
|
|
|
|
nsDisplayList* aNewList,
|
|
|
|
|
RetainedDisplayList* aOldList,
|
|
|
|
|
RetainedDisplayList* aOutList,
|
|
|
|
|
mozilla::Maybe<const mozilla::ActiveScrolledRoot*>& aOutContainerASR,
|
|
|
|
|
uint32_t aOuterKey)
|
2018-03-23 06:47:37 +03:00
|
|
|
|
{
|
2018-05-18 11:50:04 +03:00
|
|
|
|
MergeState merge(this, *aOldList, aOuterKey);
|
2018-03-23 06:47:37 +03:00
|
|
|
|
|
|
|
|
|
Maybe<MergedListIndex> previousItemIndex;
|
|
|
|
|
while (nsDisplayItem* item = aNewList->RemoveBottom()) {
|
2018-09-04 23:46:21 +03:00
|
|
|
|
previousItemIndex =
|
|
|
|
|
Some(merge.ProcessItemFromNewList(item, previousItemIndex));
|
2017-10-18 06:09:07 +03:00
|
|
|
|
}
|
|
|
|
|
|
2018-06-01 18:59:07 +03:00
|
|
|
|
*aOutList = merge.Finalize();
|
2018-03-23 06:47:37 +03:00
|
|
|
|
aOutContainerASR = merge.mContainerASR;
|
|
|
|
|
return merge.mResultIsModified;
|
2017-10-18 06:09:07 +03:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
static void
|
2018-01-26 08:42:44 +03:00
|
|
|
|
TakeAndAddModifiedAndFramesWithPropsFromRootFrame(
|
2018-09-19 13:19:30 +03:00
|
|
|
|
nsDisplayListBuilder* aBuilder,
|
2018-01-26 08:42:44 +03:00
|
|
|
|
nsTArray<nsIFrame*>* aModifiedFrames,
|
|
|
|
|
nsTArray<nsIFrame*>* aFramesWithProps,
|
|
|
|
|
nsIFrame* aRootFrame)
|
2017-10-18 06:09:07 +03:00
|
|
|
|
{
|
|
|
|
|
MOZ_ASSERT(aRootFrame);
|
|
|
|
|
|
2018-09-19 13:21:27 +03:00
|
|
|
|
RetainedDisplayListData* data = GetRetainedDisplayListData(aRootFrame);
|
2017-10-18 06:09:07 +03:00
|
|
|
|
|
2018-09-19 13:21:27 +03:00
|
|
|
|
if (!data) {
|
|
|
|
|
return;
|
2018-09-18 10:39:23 +03:00
|
|
|
|
}
|
2017-10-23 19:19:39 +03:00
|
|
|
|
|
2018-09-19 13:21:27 +03:00
|
|
|
|
for (auto it = data->Iterator(); !it.Done(); it.Next()) {
|
|
|
|
|
nsIFrame* frame = it.Key();
|
|
|
|
|
const RetainedDisplayListData::FrameFlags& flags = it.Data();
|
2018-09-17 15:39:09 +03:00
|
|
|
|
|
2018-09-19 13:21:27 +03:00
|
|
|
|
if (flags & RetainedDisplayListData::FrameFlags::Modified) {
|
|
|
|
|
aModifiedFrames->AppendElement(frame);
|
2018-09-17 17:41:08 +03:00
|
|
|
|
}
|
2018-09-17 17:43:07 +03:00
|
|
|
|
|
2018-09-19 13:21:27 +03:00
|
|
|
|
if (flags & RetainedDisplayListData::FrameFlags::HasProps) {
|
|
|
|
|
aFramesWithProps->AppendElement(frame);
|
|
|
|
|
}
|
2018-09-19 13:19:30 +03:00
|
|
|
|
|
|
|
|
|
if (flags & RetainedDisplayListData::FrameFlags::HadWillChange) {
|
|
|
|
|
aBuilder->RemoveFromWillChangeBudget(frame);
|
|
|
|
|
}
|
2018-01-26 08:42:44 +03:00
|
|
|
|
}
|
2018-09-19 13:21:27 +03:00
|
|
|
|
|
|
|
|
|
data->Clear();
|
2017-10-18 06:09:07 +03:00
|
|
|
|
}
|
|
|
|
|
|
2018-09-04 23:46:21 +03:00
|
|
|
|
struct CbData
|
|
|
|
|
{
|
2017-11-25 02:02:20 +03:00
|
|
|
|
nsDisplayListBuilder* builder;
|
2018-01-26 08:42:44 +03:00
|
|
|
|
nsTArray<nsIFrame*>* modifiedFrames;
|
|
|
|
|
nsTArray<nsIFrame*>* framesWithProps;
|
2017-11-25 02:02:20 +03:00
|
|
|
|
};
|
|
|
|
|
|
2018-01-30 01:21:00 +03:00
|
|
|
|
static nsIFrame*
|
|
|
|
|
GetRootFrameForPainting(nsDisplayListBuilder* aBuilder, nsIDocument* aDocument)
|
|
|
|
|
{
|
|
|
|
|
// Although this is the actual subdocument, it might not be
|
|
|
|
|
// what painting uses. Walk up to the nsSubDocumentFrame owning
|
|
|
|
|
// us, and then ask that which subdoc it's going to paint.
|
|
|
|
|
|
|
|
|
|
nsIPresShell* presShell = aDocument->GetShell();
|
|
|
|
|
if (!presShell) {
|
|
|
|
|
return nullptr;
|
|
|
|
|
}
|
|
|
|
|
nsView* rootView = presShell->GetViewManager()->GetRootView();
|
|
|
|
|
if (!rootView) {
|
|
|
|
|
return nullptr;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
// There should be an anonymous inner view between the root view
|
|
|
|
|
// of the subdoc, and the view for the nsSubDocumentFrame.
|
|
|
|
|
nsView* innerView = rootView->GetParent();
|
|
|
|
|
if (!innerView) {
|
|
|
|
|
return nullptr;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
nsView* subDocView = innerView->GetParent();
|
|
|
|
|
if (!subDocView) {
|
|
|
|
|
return nullptr;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
nsIFrame* subDocFrame = subDocView->GetFrame();
|
|
|
|
|
if (!subDocFrame) {
|
|
|
|
|
return nullptr;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
nsSubDocumentFrame* subdocumentFrame = do_QueryFrame(subDocFrame);
|
|
|
|
|
MOZ_ASSERT(subdocumentFrame);
|
|
|
|
|
presShell = subdocumentFrame->GetSubdocumentPresShellForPainting(
|
2018-09-04 23:46:21 +03:00
|
|
|
|
aBuilder->IsIgnoringPaintSuppression()
|
|
|
|
|
? nsSubDocumentFrame::IGNORE_PAINT_SUPPRESSION
|
|
|
|
|
: 0);
|
2018-01-30 01:21:00 +03:00
|
|
|
|
return presShell ? presShell->GetRootFrame() : nullptr;
|
|
|
|
|
}
|
|
|
|
|
|
2017-10-18 06:09:07 +03:00
|
|
|
|
static bool
|
|
|
|
|
SubDocEnumCb(nsIDocument* aDocument, void* aData)
|
|
|
|
|
{
|
|
|
|
|
MOZ_ASSERT(aDocument);
|
|
|
|
|
MOZ_ASSERT(aData);
|
|
|
|
|
|
2017-11-25 02:02:20 +03:00
|
|
|
|
CbData* data = static_cast<CbData*>(aData);
|
|
|
|
|
|
2018-01-30 01:21:00 +03:00
|
|
|
|
nsIFrame* rootFrame = GetRootFrameForPainting(data->builder, aDocument);
|
|
|
|
|
if (rootFrame) {
|
2018-09-04 23:46:21 +03:00
|
|
|
|
TakeAndAddModifiedAndFramesWithPropsFromRootFrame(
|
2018-09-19 13:19:30 +03:00
|
|
|
|
data->builder, data->modifiedFrames, data->framesWithProps, rootFrame);
|
2017-10-18 06:09:07 +03:00
|
|
|
|
|
2018-01-30 01:21:00 +03:00
|
|
|
|
nsIDocument* innerDoc = rootFrame->PresShell()->GetDocument();
|
|
|
|
|
if (innerDoc) {
|
|
|
|
|
innerDoc->EnumerateSubDocuments(SubDocEnumCb, aData);
|
2017-11-25 02:02:20 +03:00
|
|
|
|
}
|
2017-10-18 06:09:07 +03:00
|
|
|
|
}
|
|
|
|
|
return true;
|
|
|
|
|
}
|
|
|
|
|
|
2018-01-26 08:42:44 +03:00
|
|
|
|
static void
|
|
|
|
|
GetModifiedAndFramesWithProps(nsDisplayListBuilder* aBuilder,
|
|
|
|
|
nsTArray<nsIFrame*>* aOutModifiedFrames,
|
|
|
|
|
nsTArray<nsIFrame*>* aOutFramesWithProps)
|
2017-10-18 06:09:07 +03:00
|
|
|
|
{
|
2018-09-19 13:19:30 +03:00
|
|
|
|
nsIFrame* rootFrame = aBuilder->RootReferenceFrame();
|
|
|
|
|
MOZ_ASSERT(rootFrame);
|
2017-10-18 06:09:07 +03:00
|
|
|
|
|
2018-09-04 23:46:21 +03:00
|
|
|
|
TakeAndAddModifiedAndFramesWithPropsFromRootFrame(
|
2018-09-19 13:19:30 +03:00
|
|
|
|
aBuilder, aOutModifiedFrames, aOutFramesWithProps, rootFrame);
|
2017-10-18 06:09:07 +03:00
|
|
|
|
|
2018-09-19 13:19:30 +03:00
|
|
|
|
nsIDocument* rootdoc = rootFrame->PresContext()->Document();
|
2017-10-18 06:09:07 +03:00
|
|
|
|
if (rootdoc) {
|
2018-09-04 23:46:21 +03:00
|
|
|
|
CbData data = { aBuilder, aOutModifiedFrames, aOutFramesWithProps };
|
2018-01-26 08:42:44 +03:00
|
|
|
|
|
2017-11-25 02:02:20 +03:00
|
|
|
|
rootdoc->EnumerateSubDocuments(SubDocEnumCb, &data);
|
2017-10-18 06:09:07 +03:00
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
// ComputeRebuildRegion debugging
|
|
|
|
|
// #define CRR_DEBUG 1
|
|
|
|
|
#if CRR_DEBUG
|
2018-09-04 23:46:21 +03:00
|
|
|
|
#define CRR_LOG(...) printf_stderr(__VA_ARGS__)
|
2017-10-18 06:09:07 +03:00
|
|
|
|
#else
|
2018-09-04 23:46:21 +03:00
|
|
|
|
#define CRR_LOG(...)
|
2017-10-18 06:09:07 +03:00
|
|
|
|
#endif
|
|
|
|
|
|
2018-02-12 06:05:28 +03:00
|
|
|
|
static nsDisplayItem*
|
|
|
|
|
GetFirstDisplayItemWithChildren(nsIFrame* aFrame)
|
|
|
|
|
{
|
2018-09-04 23:46:21 +03:00
|
|
|
|
nsIFrame::DisplayItemArray* items =
|
|
|
|
|
aFrame->GetProperty(nsIFrame::DisplayItems());
|
2018-02-12 06:05:28 +03:00
|
|
|
|
if (!items) {
|
|
|
|
|
return nullptr;
|
|
|
|
|
}
|
2018-09-04 23:46:21 +03:00
|
|
|
|
|
2018-02-12 06:05:28 +03:00
|
|
|
|
for (nsDisplayItem* i : *items) {
|
|
|
|
|
if (i->GetChildren()) {
|
|
|
|
|
return i;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
return nullptr;
|
|
|
|
|
}
|
|
|
|
|
|
2018-06-19 08:49:47 +03:00
|
|
|
|
static bool
|
|
|
|
|
IsInPreserve3DContext(const nsIFrame* aFrame)
|
2018-01-17 20:27:42 +03:00
|
|
|
|
{
|
2018-06-19 08:49:47 +03:00
|
|
|
|
return aFrame->Extend3DContext() ||
|
|
|
|
|
aFrame->Combines3DTransformWithAncestors();
|
2018-01-17 20:27:42 +03:00
|
|
|
|
}
|
|
|
|
|
|
2018-06-19 08:49:47 +03:00
|
|
|
|
static bool
|
2018-09-04 23:46:21 +03:00
|
|
|
|
ProcessFrameInternal(nsIFrame* aFrame,
|
|
|
|
|
nsDisplayListBuilder& aBuilder,
|
|
|
|
|
AnimatedGeometryRoot** aAGR,
|
|
|
|
|
nsRect& aOverflow,
|
|
|
|
|
nsIFrame* aStopAtFrame,
|
|
|
|
|
nsTArray<nsIFrame*>& aOutFramesWithProps,
|
2018-04-15 07:38:44 +03:00
|
|
|
|
const bool aStopAtStackingContext)
|
2018-01-17 20:27:42 +03:00
|
|
|
|
{
|
|
|
|
|
nsIFrame* currentFrame = aFrame;
|
|
|
|
|
|
|
|
|
|
while (currentFrame != aStopAtFrame) {
|
2018-01-23 22:11:34 +03:00
|
|
|
|
CRR_LOG("currentFrame: %p (placeholder=%d), aOverflow: %d %d %d %d\n",
|
2018-09-04 23:46:21 +03:00
|
|
|
|
currentFrame,
|
|
|
|
|
!aStopAtStackingContext,
|
|
|
|
|
aOverflow.x,
|
|
|
|
|
aOverflow.y,
|
|
|
|
|
aOverflow.width,
|
|
|
|
|
aOverflow.height);
|
2018-01-17 20:27:42 +03:00
|
|
|
|
|
2018-01-12 20:02:14 +03:00
|
|
|
|
// If the current frame is an OOF frame, DisplayListBuildingData needs to be
|
|
|
|
|
// set on all the ancestor stacking contexts of the placeholder frame, up
|
|
|
|
|
// to the containing block of the OOF frame. This is done to ensure that the
|
|
|
|
|
// content that might be behind the OOF frame is built for merging.
|
2018-01-23 22:11:34 +03:00
|
|
|
|
nsIFrame* placeholder = currentFrame->HasAnyStateBits(NS_FRAME_OUT_OF_FLOW)
|
2018-09-04 23:46:21 +03:00
|
|
|
|
? currentFrame->GetPlaceholderFrame()
|
|
|
|
|
: nullptr;
|
2018-01-12 20:02:14 +03:00
|
|
|
|
|
|
|
|
|
if (placeholder) {
|
2018-01-23 22:11:34 +03:00
|
|
|
|
// The rect aOverflow is in the coordinate space of the containing block.
|
|
|
|
|
// Convert it to a coordinate space of the placeholder frame.
|
2018-01-12 20:02:14 +03:00
|
|
|
|
nsRect placeholderOverflow =
|
2018-01-23 22:11:34 +03:00
|
|
|
|
aOverflow + currentFrame->GetOffsetTo(placeholder);
|
2018-01-12 20:02:14 +03:00
|
|
|
|
|
|
|
|
|
CRR_LOG("Processing placeholder %p for OOF frame %p\n",
|
2018-09-04 23:46:21 +03:00
|
|
|
|
placeholder,
|
|
|
|
|
currentFrame);
|
2018-01-12 20:02:14 +03:00
|
|
|
|
|
|
|
|
|
CRR_LOG("OOF frame draw area: %d %d %d %d\n",
|
2018-09-04 23:46:21 +03:00
|
|
|
|
placeholderOverflow.x,
|
|
|
|
|
placeholderOverflow.y,
|
|
|
|
|
placeholderOverflow.width,
|
|
|
|
|
placeholderOverflow.height);
|
2018-01-12 20:02:14 +03:00
|
|
|
|
|
|
|
|
|
// Tracking AGRs for the placeholder processing is not necessary, as the
|
|
|
|
|
// goal is to only modify the DisplayListBuildingData rect.
|
|
|
|
|
AnimatedGeometryRoot* dummyAGR = nullptr;
|
|
|
|
|
|
|
|
|
|
// Find a common ancestor frame to handle frame continuations.
|
|
|
|
|
// TODO: It might be possible to write a more specific and efficient
|
|
|
|
|
// function for this.
|
2018-09-04 23:46:21 +03:00
|
|
|
|
nsIFrame* ancestor = nsLayoutUtils::FindNearestCommonAncestorFrame(
|
|
|
|
|
currentFrame->GetParent(), placeholder->GetParent());
|
|
|
|
|
|
|
|
|
|
if (!ProcessFrameInternal(placeholder,
|
|
|
|
|
aBuilder,
|
|
|
|
|
&dummyAGR,
|
|
|
|
|
placeholderOverflow,
|
|
|
|
|
ancestor,
|
|
|
|
|
aOutFramesWithProps,
|
|
|
|
|
false)) {
|
2018-06-19 08:49:47 +03:00
|
|
|
|
return false;
|
|
|
|
|
}
|
2018-01-12 20:02:14 +03:00
|
|
|
|
}
|
|
|
|
|
|
2018-09-04 23:46:21 +03:00
|
|
|
|
// Convert 'aOverflow' into the coordinate space of the nearest stacking
|
|
|
|
|
// context or display port ancestor and update 'currentFrame' to point to
|
|
|
|
|
// that frame.
|
|
|
|
|
aOverflow = nsLayoutUtils::TransformFrameRectToAncestor(
|
|
|
|
|
currentFrame,
|
|
|
|
|
aOverflow,
|
|
|
|
|
aStopAtFrame,
|
|
|
|
|
nullptr,
|
|
|
|
|
nullptr,
|
|
|
|
|
/* aStopAtStackingContextAndDisplayPortAndOOFFrame = */ true,
|
|
|
|
|
¤tFrame);
|
2018-06-19 08:49:47 +03:00
|
|
|
|
if (IsInPreserve3DContext(currentFrame)) {
|
|
|
|
|
return false;
|
|
|
|
|
}
|
|
|
|
|
|
2018-01-23 22:11:34 +03:00
|
|
|
|
MOZ_ASSERT(currentFrame);
|
|
|
|
|
|
2018-01-17 20:27:42 +03:00
|
|
|
|
if (nsLayoutUtils::FrameHasDisplayPort(currentFrame)) {
|
|
|
|
|
CRR_LOG("Frame belongs to displayport frame %p\n", currentFrame);
|
|
|
|
|
nsIScrollableFrame* sf = do_QueryFrame(currentFrame);
|
|
|
|
|
MOZ_ASSERT(sf);
|
|
|
|
|
nsRect displayPort;
|
2018-09-04 23:46:21 +03:00
|
|
|
|
DebugOnly<bool> hasDisplayPort = nsLayoutUtils::GetDisplayPort(
|
|
|
|
|
currentFrame->GetContent(), &displayPort, RelativeTo::ScrollPort);
|
2018-01-17 20:27:42 +03:00
|
|
|
|
MOZ_ASSERT(hasDisplayPort);
|
|
|
|
|
// get it relative to the scrollport (from the scrollframe)
|
|
|
|
|
nsRect r = aOverflow - sf->GetScrollPortRect().TopLeft();
|
|
|
|
|
r.IntersectRect(r, displayPort);
|
|
|
|
|
if (!r.IsEmpty()) {
|
2018-09-04 23:46:21 +03:00
|
|
|
|
nsRect* rect = currentFrame->GetProperty(
|
|
|
|
|
nsDisplayListBuilder::DisplayListBuildingDisplayPortRect());
|
2018-01-17 20:27:42 +03:00
|
|
|
|
if (!rect) {
|
|
|
|
|
rect = new nsRect();
|
2018-09-04 23:46:21 +03:00
|
|
|
|
currentFrame->SetProperty(
|
|
|
|
|
nsDisplayListBuilder::DisplayListBuildingDisplayPortRect(), rect);
|
2018-01-17 20:27:42 +03:00
|
|
|
|
currentFrame->SetHasOverrideDirtyRegion(true);
|
|
|
|
|
aOutFramesWithProps.AppendElement(currentFrame);
|
|
|
|
|
}
|
|
|
|
|
rect->UnionRect(*rect, r);
|
2018-01-12 20:02:14 +03:00
|
|
|
|
CRR_LOG("Adding area to displayport draw area: %d %d %d %d\n",
|
2018-09-04 23:46:21 +03:00
|
|
|
|
r.x,
|
|
|
|
|
r.y,
|
|
|
|
|
r.width,
|
|
|
|
|
r.height);
|
|
|
|
|
|
|
|
|
|
// TODO: Can we just use MarkFrameForDisplayIfVisible, plus
|
|
|
|
|
// MarkFramesForDifferentAGR to ensure that this displayport, plus any
|
|
|
|
|
// items that move relative to it get rebuilt, and then not contribute
|
|
|
|
|
// to the root dirty area?
|
2018-01-17 20:27:42 +03:00
|
|
|
|
aOverflow = sf->GetScrollPortRect();
|
|
|
|
|
} else {
|
|
|
|
|
// Don't contribute to the root dirty area at all.
|
|
|
|
|
aOverflow.SetEmpty();
|
|
|
|
|
}
|
2018-02-15 09:31:47 +03:00
|
|
|
|
} else {
|
2018-09-04 23:46:21 +03:00
|
|
|
|
aOverflow.IntersectRect(
|
|
|
|
|
aOverflow, currentFrame->GetVisualOverflowRectRelativeToSelf());
|
2018-02-15 09:31:47 +03:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
if (aOverflow.IsEmpty()) {
|
|
|
|
|
break;
|
2018-01-17 20:27:42 +03:00
|
|
|
|
}
|
|
|
|
|
|
2018-02-12 06:05:28 +03:00
|
|
|
|
if (currentFrame != aBuilder.RootReferenceFrame() &&
|
2018-04-16 05:23:47 +03:00
|
|
|
|
currentFrame->IsStackingContext() &&
|
|
|
|
|
currentFrame->IsFixedPosContainingBlock()) {
|
2018-01-17 20:27:42 +03:00
|
|
|
|
CRR_LOG("Frame belongs to stacking context frame %p\n", currentFrame);
|
2018-09-04 23:46:21 +03:00
|
|
|
|
// If we found an intermediate stacking context with an existing display
|
|
|
|
|
// item then we can store the dirty rect there and stop. If we couldn't
|
|
|
|
|
// find one then we need to keep bubbling up to the next stacking context.
|
|
|
|
|
nsDisplayItem* wrapperItem =
|
|
|
|
|
GetFirstDisplayItemWithChildren(currentFrame);
|
2018-02-12 06:05:28 +03:00
|
|
|
|
if (!wrapperItem) {
|
2018-01-12 20:02:14 +03:00
|
|
|
|
continue;
|
|
|
|
|
}
|
2018-01-17 20:27:42 +03:00
|
|
|
|
|
2018-01-12 20:02:14 +03:00
|
|
|
|
// Store the stacking context relative dirty area such
|
|
|
|
|
// that display list building will pick it up when it
|
|
|
|
|
// gets to it.
|
|
|
|
|
nsDisplayListBuilder::DisplayListBuildingData* data =
|
2018-09-04 23:46:21 +03:00
|
|
|
|
currentFrame->GetProperty(
|
|
|
|
|
nsDisplayListBuilder::DisplayListBuildingRect());
|
2018-01-12 20:02:14 +03:00
|
|
|
|
if (!data) {
|
|
|
|
|
data = new nsDisplayListBuilder::DisplayListBuildingData();
|
2018-09-04 23:46:21 +03:00
|
|
|
|
currentFrame->SetProperty(
|
|
|
|
|
nsDisplayListBuilder::DisplayListBuildingRect(), data);
|
2018-01-12 20:02:14 +03:00
|
|
|
|
currentFrame->SetHasOverrideDirtyRegion(true);
|
|
|
|
|
aOutFramesWithProps.AppendElement(currentFrame);
|
|
|
|
|
}
|
|
|
|
|
CRR_LOG("Adding area to stacking context draw area: %d %d %d %d\n",
|
2018-09-04 23:46:21 +03:00
|
|
|
|
aOverflow.x,
|
|
|
|
|
aOverflow.y,
|
|
|
|
|
aOverflow.width,
|
|
|
|
|
aOverflow.height);
|
2018-01-12 20:02:14 +03:00
|
|
|
|
data->mDirtyRect.UnionRect(data->mDirtyRect, aOverflow);
|
|
|
|
|
|
|
|
|
|
if (!aStopAtStackingContext) {
|
|
|
|
|
// Continue ascending the frame tree until we reach aStopAtFrame.
|
|
|
|
|
continue;
|
|
|
|
|
}
|
|
|
|
|
|
2018-09-04 23:46:21 +03:00
|
|
|
|
// Grab the visible (display list building) rect for children of this
|
|
|
|
|
// wrapper item and convert into into coordinate relative to the current
|
|
|
|
|
// frame.
|
2018-05-16 06:56:32 +03:00
|
|
|
|
nsRect previousVisible = wrapperItem->GetBuildingRectForChildren();
|
2018-09-04 23:46:21 +03:00
|
|
|
|
if (wrapperItem->ReferenceFrameForChildren() ==
|
|
|
|
|
wrapperItem->ReferenceFrame()) {
|
2018-02-12 06:05:28 +03:00
|
|
|
|
previousVisible -= wrapperItem->ToReferenceFrame();
|
|
|
|
|
} else {
|
2018-09-04 23:46:21 +03:00
|
|
|
|
MOZ_ASSERT(wrapperItem->ReferenceFrameForChildren() ==
|
|
|
|
|
wrapperItem->Frame());
|
2018-02-12 06:05:28 +03:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
if (!previousVisible.Contains(aOverflow)) {
|
2018-09-04 23:46:21 +03:00
|
|
|
|
// If the overflow area of the changed frame isn't contained within the
|
|
|
|
|
// old item, then we might change the size of the item and need to
|
|
|
|
|
// update its sorting accordingly. Keep propagating the overflow area up
|
|
|
|
|
// so that we build intersecting items for sorting.
|
2018-02-12 06:05:28 +03:00
|
|
|
|
continue;
|
|
|
|
|
}
|
|
|
|
|
|
2018-01-12 20:02:14 +03:00
|
|
|
|
if (!data->mModifiedAGR) {
|
|
|
|
|
data->mModifiedAGR = *aAGR;
|
|
|
|
|
} else if (data->mModifiedAGR != *aAGR) {
|
|
|
|
|
data->mDirtyRect = currentFrame->GetVisualOverflowRectRelativeToSelf();
|
2018-09-04 23:46:21 +03:00
|
|
|
|
CRR_LOG("Found multiple modified AGRs within this stacking context, "
|
|
|
|
|
"giving up\n");
|
2018-01-17 20:27:42 +03:00
|
|
|
|
}
|
2018-01-12 20:02:14 +03:00
|
|
|
|
|
|
|
|
|
// Don't contribute to the root dirty area at all.
|
|
|
|
|
aOverflow.SetEmpty();
|
|
|
|
|
*aAGR = nullptr;
|
|
|
|
|
|
|
|
|
|
break;
|
2018-01-17 20:27:42 +03:00
|
|
|
|
}
|
|
|
|
|
}
|
2018-06-19 08:49:47 +03:00
|
|
|
|
return true;
|
2018-01-17 20:27:42 +03:00
|
|
|
|
}
|
2018-01-12 20:02:14 +03:00
|
|
|
|
|
2018-04-15 07:38:44 +03:00
|
|
|
|
bool
|
2018-09-04 23:46:21 +03:00
|
|
|
|
RetainedDisplayListBuilder::ProcessFrame(
|
|
|
|
|
nsIFrame* aFrame,
|
|
|
|
|
nsDisplayListBuilder& aBuilder,
|
|
|
|
|
nsIFrame* aStopAtFrame,
|
|
|
|
|
nsTArray<nsIFrame*>& aOutFramesWithProps,
|
|
|
|
|
const bool aStopAtStackingContext,
|
|
|
|
|
nsRect* aOutDirty,
|
|
|
|
|
AnimatedGeometryRoot** aOutModifiedAGR)
|
2018-04-15 07:38:44 +03:00
|
|
|
|
{
|
|
|
|
|
if (aFrame->HasOverrideDirtyRegion()) {
|
|
|
|
|
aOutFramesWithProps.AppendElement(aFrame);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
if (aFrame->HasAnyStateBits(NS_FRAME_IN_POPUP)) {
|
|
|
|
|
return true;
|
|
|
|
|
}
|
|
|
|
|
|
2018-09-04 23:46:21 +03:00
|
|
|
|
// TODO: There is almost certainly a faster way of doing this, probably can be
|
|
|
|
|
// combined with the ancestor walk for TransformFrameRectToAncestor.
|
|
|
|
|
AnimatedGeometryRoot* agr =
|
|
|
|
|
aBuilder.FindAnimatedGeometryRootFor(aFrame)->GetAsyncAGR();
|
2018-04-15 07:38:44 +03:00
|
|
|
|
|
|
|
|
|
CRR_LOG("Processing frame %p with agr %p\n", aFrame, agr->mFrame);
|
|
|
|
|
|
|
|
|
|
// Convert the frame's overflow rect into the coordinate space
|
|
|
|
|
// of the nearest stacking context that has an existing display item.
|
|
|
|
|
// We store that as a dirty rect on that stacking context so that we build
|
|
|
|
|
// all items that intersect the changed frame within the stacking context,
|
|
|
|
|
// and then we use MarkFrameForDisplayIfVisible to make sure the stacking
|
2018-09-04 23:46:21 +03:00
|
|
|
|
// context itself gets built. We don't need to build items that intersect
|
|
|
|
|
// outside of the stacking context, since we know the stacking context item
|
|
|
|
|
// exists in the old list, so we can trivially merge without needing other
|
|
|
|
|
// items.
|
2018-04-15 07:38:44 +03:00
|
|
|
|
nsRect overflow = aFrame->GetVisualOverflowRectRelativeToSelf();
|
|
|
|
|
|
|
|
|
|
// If the modified frame is also a caret frame, include the caret area.
|
|
|
|
|
// This is needed because some frames (for example text frames without text)
|
|
|
|
|
// might have an empty overflow rect.
|
|
|
|
|
if (aFrame == aBuilder.GetCaretFrame()) {
|
|
|
|
|
overflow.UnionRect(overflow, aBuilder.GetCaretRect());
|
|
|
|
|
}
|
|
|
|
|
|
2018-09-04 23:46:21 +03:00
|
|
|
|
if (!ProcessFrameInternal(aFrame,
|
|
|
|
|
aBuilder,
|
|
|
|
|
&agr,
|
|
|
|
|
overflow,
|
|
|
|
|
aStopAtFrame,
|
|
|
|
|
aOutFramesWithProps,
|
|
|
|
|
aStopAtStackingContext)) {
|
2018-06-19 08:49:47 +03:00
|
|
|
|
return false;
|
|
|
|
|
}
|
2018-04-15 07:38:44 +03:00
|
|
|
|
|
|
|
|
|
if (!overflow.IsEmpty()) {
|
|
|
|
|
aOutDirty->UnionRect(*aOutDirty, overflow);
|
|
|
|
|
CRR_LOG("Adding area to root draw area: %d %d %d %d\n",
|
2018-09-04 23:46:21 +03:00
|
|
|
|
overflow.x,
|
|
|
|
|
overflow.y,
|
|
|
|
|
overflow.width,
|
|
|
|
|
overflow.height);
|
|
|
|
|
|
|
|
|
|
// If we get changed frames from multiple AGRS, then just give up as it gets
|
|
|
|
|
// really complex to track which items would need to be marked in
|
|
|
|
|
// MarkFramesForDifferentAGR.
|
2018-04-15 07:38:44 +03:00
|
|
|
|
if (!*aOutModifiedAGR) {
|
|
|
|
|
CRR_LOG("Setting %p as root stacking context AGR\n", agr);
|
|
|
|
|
*aOutModifiedAGR = agr;
|
|
|
|
|
} else if (agr && *aOutModifiedAGR != agr) {
|
|
|
|
|
CRR_LOG("Found multiple AGRs in root stacking context, giving up\n");
|
|
|
|
|
return false;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
return true;
|
|
|
|
|
}
|
|
|
|
|
|
2018-04-15 07:38:45 +03:00
|
|
|
|
static void
|
|
|
|
|
AddFramesForContainingBlock(nsIFrame* aBlock,
|
|
|
|
|
const nsFrameList& aFrames,
|
|
|
|
|
nsTArray<nsIFrame*>& aExtraFrames)
|
|
|
|
|
{
|
|
|
|
|
for (nsIFrame* f : aFrames) {
|
2018-09-04 23:46:21 +03:00
|
|
|
|
if (!f->IsFrameModified() && AnyContentAncestorModified(f, aBlock)) {
|
2018-04-15 07:38:45 +03:00
|
|
|
|
CRR_LOG("Adding invalid OOF %p\n", f);
|
|
|
|
|
aExtraFrames.AppendElement(f);
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
// Placeholder descendants of aFrame don't contribute to aFrame's overflow area.
|
|
|
|
|
// Find all the containing blocks that might own placeholders under us, walk
|
2018-09-04 23:46:21 +03:00
|
|
|
|
// their OOF frames list, and manually invalidate any frames that are
|
|
|
|
|
// descendants of a modified frame (us, or another frame we'll get to soon).
|
2018-04-15 07:38:45 +03:00
|
|
|
|
// This is combined with the work required for MarkFrameForDisplayIfVisible,
|
|
|
|
|
// so that we can avoid an extra ancestor walk, and we can reuse the flag
|
2018-09-04 23:46:21 +03:00
|
|
|
|
// to detect when we've already visited an ancestor (and thus all further
|
|
|
|
|
// ancestors must also be visited).
|
|
|
|
|
void
|
|
|
|
|
FindContainingBlocks(nsIFrame* aFrame, nsTArray<nsIFrame*>& aExtraFrames)
|
2018-04-15 07:38:45 +03:00
|
|
|
|
{
|
|
|
|
|
for (nsIFrame* f = aFrame; f;
|
|
|
|
|
f = nsLayoutUtils::GetParentOrPlaceholderForCrossDoc(f)) {
|
|
|
|
|
if (f->ForceDescendIntoIfVisible())
|
|
|
|
|
return;
|
|
|
|
|
f->SetForceDescendIntoIfVisible(true);
|
|
|
|
|
CRR_LOG("Considering OOFs for %p\n", f);
|
|
|
|
|
|
2018-09-04 23:46:21 +03:00
|
|
|
|
AddFramesForContainingBlock(
|
|
|
|
|
f, f->GetChildList(nsIFrame::kFloatList), aExtraFrames);
|
|
|
|
|
AddFramesForContainingBlock(
|
|
|
|
|
f, f->GetChildList(f->GetAbsoluteListID()), aExtraFrames);
|
2018-04-15 07:38:45 +03:00
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
2017-10-18 06:09:07 +03:00
|
|
|
|
/**
|
2018-09-04 23:46:21 +03:00
|
|
|
|
* Given a list of frames that has been modified, computes the region that we
|
|
|
|
|
* need to do display list building for in order to build all modified display
|
|
|
|
|
* items.
|
2017-10-18 06:09:07 +03:00
|
|
|
|
*
|
2018-09-04 23:46:21 +03:00
|
|
|
|
* When a modified frame is within a stacking context (with an existing display
|
|
|
|
|
* item), then we only contribute to the build area within the stacking context,
|
|
|
|
|
* as well as forcing display list building to descend to the stacking context.
|
|
|
|
|
* We don't need to add build area outside of the stacking context (and force
|
|
|
|
|
* items above/below the stacking context container item to be built), since
|
|
|
|
|
* just matching the position of the stacking context container item is
|
|
|
|
|
* sufficient to ensure correct ordering during merging.
|
2017-10-18 06:09:07 +03:00
|
|
|
|
*
|
2018-09-04 23:46:21 +03:00
|
|
|
|
* We need to rebuild all items that might intersect with the modified frame,
|
|
|
|
|
* both now and during async changes on the compositor. We do this by rebuilding
|
|
|
|
|
* the area covered by the changed frame, as well as rebuilding all items that
|
|
|
|
|
* have a different (async) AGR to the changed frame. If we have changes to
|
|
|
|
|
* multiple AGRs (within a stacking context), then we rebuild that stacking
|
|
|
|
|
* context entirely.
|
2017-10-18 06:09:07 +03:00
|
|
|
|
*
|
|
|
|
|
* @param aModifiedFrames The list of modified frames.
|
|
|
|
|
* @param aOutDirty The result region to use for display list building.
|
|
|
|
|
* @param aOutModifiedAGR The modified AGR for the root stacking context.
|
2018-09-04 23:46:21 +03:00
|
|
|
|
* @param aOutFramesWithProps The list of frames to which we attached partial
|
|
|
|
|
* build data so that it can be cleaned up.
|
2017-10-18 06:09:07 +03:00
|
|
|
|
*
|
2018-09-04 23:46:21 +03:00
|
|
|
|
* @return true if we succesfully computed a partial rebuild region, false if a
|
|
|
|
|
* full build is required.
|
2017-10-18 06:09:07 +03:00
|
|
|
|
*/
|
|
|
|
|
bool
|
2018-09-04 23:46:21 +03:00
|
|
|
|
RetainedDisplayListBuilder::ComputeRebuildRegion(
|
|
|
|
|
nsTArray<nsIFrame*>& aModifiedFrames,
|
|
|
|
|
nsRect* aOutDirty,
|
|
|
|
|
AnimatedGeometryRoot** aOutModifiedAGR,
|
|
|
|
|
nsTArray<nsIFrame*>& aOutFramesWithProps)
|
2017-10-18 06:09:07 +03:00
|
|
|
|
{
|
2018-09-04 23:46:21 +03:00
|
|
|
|
CRR_LOG("Computing rebuild regions for %zu frames:\n",
|
|
|
|
|
aModifiedFrames.Length());
|
2018-04-15 07:38:44 +03:00
|
|
|
|
nsTArray<nsIFrame*> extraFrames;
|
2017-10-18 06:09:07 +03:00
|
|
|
|
for (nsIFrame* f : aModifiedFrames) {
|
2017-10-23 19:19:39 +03:00
|
|
|
|
MOZ_ASSERT(f);
|
2017-10-18 06:09:07 +03:00
|
|
|
|
|
2018-04-15 07:38:45 +03:00
|
|
|
|
mBuilder.AddFrameMarkedForDisplayIfVisible(f);
|
|
|
|
|
FindContainingBlocks(f, extraFrames);
|
|
|
|
|
|
2018-09-04 23:46:21 +03:00
|
|
|
|
if (!ProcessFrame(f,
|
|
|
|
|
mBuilder,
|
|
|
|
|
mBuilder.RootReferenceFrame(),
|
|
|
|
|
aOutFramesWithProps,
|
|
|
|
|
true,
|
|
|
|
|
aOutDirty,
|
|
|
|
|
aOutModifiedAGR)) {
|
2018-04-15 07:38:45 +03:00
|
|
|
|
return false;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
for (nsIFrame* f : extraFrames) {
|
|
|
|
|
mBuilder.MarkFrameModifiedDuringBuilding(f);
|
2018-01-03 08:31:31 +03:00
|
|
|
|
|
2018-09-04 23:46:21 +03:00
|
|
|
|
if (!ProcessFrame(f,
|
|
|
|
|
mBuilder,
|
|
|
|
|
mBuilder.RootReferenceFrame(),
|
|
|
|
|
aOutFramesWithProps,
|
|
|
|
|
true,
|
|
|
|
|
aOutDirty,
|
|
|
|
|
aOutModifiedAGR)) {
|
2018-04-15 07:38:44 +03:00
|
|
|
|
return false;
|
2017-10-18 06:09:07 +03:00
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
return true;
|
|
|
|
|
}
|
|
|
|
|
|
2017-10-24 15:54:16 +03:00
|
|
|
|
/*
|
|
|
|
|
* A simple early exit heuristic to avoid slow partial display list rebuilds.
|
|
|
|
|
*/
|
|
|
|
|
static bool
|
|
|
|
|
ShouldBuildPartial(nsTArray<nsIFrame*>& aModifiedFrames)
|
|
|
|
|
{
|
|
|
|
|
if (aModifiedFrames.Length() > gfxPrefs::LayoutRebuildFrameLimit()) {
|
|
|
|
|
return false;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
for (nsIFrame* f : aModifiedFrames) {
|
|
|
|
|
MOZ_ASSERT(f);
|
|
|
|
|
|
|
|
|
|
const LayoutFrameType type = f->Type();
|
|
|
|
|
|
|
|
|
|
// If we have any modified frames of the following types, it is likely that
|
|
|
|
|
// doing a partial rebuild of the display list will be slower than doing a
|
|
|
|
|
// full rebuild.
|
|
|
|
|
// This is because these frames either intersect or may intersect with most
|
|
|
|
|
// of the page content. This is either due to display port size or different
|
|
|
|
|
// async AGR.
|
|
|
|
|
if (type == LayoutFrameType::Viewport ||
|
|
|
|
|
type == LayoutFrameType::PageContent ||
|
2018-09-04 23:46:21 +03:00
|
|
|
|
type == LayoutFrameType::Canvas || type == LayoutFrameType::Scrollbar) {
|
2017-10-24 15:54:16 +03:00
|
|
|
|
return false;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
return true;
|
|
|
|
|
}
|
2017-10-18 06:09:07 +03:00
|
|
|
|
|
2017-11-10 03:32:29 +03:00
|
|
|
|
static void
|
|
|
|
|
ClearFrameProps(nsTArray<nsIFrame*>& aFrames)
|
|
|
|
|
{
|
|
|
|
|
for (nsIFrame* f : aFrames) {
|
|
|
|
|
if (f->HasOverrideDirtyRegion()) {
|
|
|
|
|
f->SetHasOverrideDirtyRegion(false);
|
|
|
|
|
f->DeleteProperty(nsDisplayListBuilder::DisplayListBuildingRect());
|
2018-09-04 23:46:21 +03:00
|
|
|
|
f->DeleteProperty(
|
|
|
|
|
nsDisplayListBuilder::DisplayListBuildingDisplayPortRect());
|
2017-11-10 03:32:29 +03:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
f->SetFrameIsModified(false);
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
2018-01-12 01:43:41 +03:00
|
|
|
|
class AutoClearFramePropsArray
|
|
|
|
|
{
|
|
|
|
|
public:
|
2018-09-19 13:21:27 +03:00
|
|
|
|
explicit AutoClearFramePropsArray(size_t aCapacity)
|
|
|
|
|
: mFrames(aCapacity)
|
|
|
|
|
{
|
|
|
|
|
}
|
|
|
|
|
|
2018-01-12 01:43:41 +03:00
|
|
|
|
AutoClearFramePropsArray() = default;
|
|
|
|
|
|
2018-09-04 23:46:21 +03:00
|
|
|
|
~AutoClearFramePropsArray() { ClearFrameProps(mFrames); }
|
2018-01-12 01:43:41 +03:00
|
|
|
|
|
|
|
|
|
nsTArray<nsIFrame*>& Frames() { return mFrames; }
|
|
|
|
|
|
|
|
|
|
bool IsEmpty() const { return mFrames.IsEmpty(); }
|
|
|
|
|
|
|
|
|
|
private:
|
|
|
|
|
nsTArray<nsIFrame*> mFrames;
|
|
|
|
|
};
|
|
|
|
|
|
2017-11-09 18:10:21 +03:00
|
|
|
|
void
|
2018-01-26 08:42:44 +03:00
|
|
|
|
RetainedDisplayListBuilder::ClearFramesWithProps()
|
2017-11-09 18:10:21 +03:00
|
|
|
|
{
|
2018-01-12 01:43:41 +03:00
|
|
|
|
AutoClearFramePropsArray modifiedFrames;
|
|
|
|
|
AutoClearFramePropsArray framesWithProps;
|
2018-09-04 23:46:21 +03:00
|
|
|
|
GetModifiedAndFramesWithProps(
|
|
|
|
|
&mBuilder, &modifiedFrames.Frames(), &framesWithProps.Frames());
|
2017-11-09 18:10:21 +03:00
|
|
|
|
}
|
|
|
|
|
|
2018-01-12 01:46:23 +03:00
|
|
|
|
auto
|
2018-02-02 10:18:59 +03:00
|
|
|
|
RetainedDisplayListBuilder::AttemptPartialUpdate(
|
|
|
|
|
nscolor aBackstop,
|
2018-01-12 01:46:23 +03:00
|
|
|
|
mozilla::DisplayListChecker* aChecker) -> PartialUpdateResult
|
2017-10-18 06:09:07 +03:00
|
|
|
|
{
|
2018-01-25 16:26:30 +03:00
|
|
|
|
mBuilder.RemoveModifiedWindowRegions();
|
2018-01-25 16:27:45 +03:00
|
|
|
|
mBuilder.ClearWindowOpaqueRegion();
|
|
|
|
|
|
2017-10-18 06:09:07 +03:00
|
|
|
|
if (mBuilder.ShouldSyncDecodeImages()) {
|
2018-04-03 19:51:49 +03:00
|
|
|
|
MarkFramesWithItemsAndImagesModified(&mList);
|
2017-10-18 06:09:07 +03:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
mBuilder.EnterPresShell(mBuilder.RootReferenceFrame());
|
|
|
|
|
|
2018-01-12 01:43:41 +03:00
|
|
|
|
// We set the override dirty regions during ComputeRebuildRegion or in
|
|
|
|
|
// nsLayoutUtils::InvalidateForDisplayPortChange. The display port change also
|
|
|
|
|
// marks the frame modified, so those regions are cleared here as well.
|
2018-09-19 13:21:27 +03:00
|
|
|
|
AutoClearFramePropsArray modifiedFrames(64);
|
2018-01-12 01:43:41 +03:00
|
|
|
|
AutoClearFramePropsArray framesWithProps;
|
2018-09-04 23:46:21 +03:00
|
|
|
|
GetModifiedAndFramesWithProps(
|
|
|
|
|
&mBuilder, &modifiedFrames.Frames(), &framesWithProps.Frames());
|
2017-10-18 06:09:07 +03:00
|
|
|
|
|
2017-11-10 03:32:29 +03:00
|
|
|
|
// Do not allow partial builds if the retained display list is empty, or if
|
|
|
|
|
// ShouldBuildPartial heuristic fails.
|
2018-09-04 23:46:21 +03:00
|
|
|
|
bool shouldBuildPartial =
|
|
|
|
|
!mList.IsEmpty() && ShouldBuildPartial(modifiedFrames.Frames());
|
2018-04-04 02:30:35 +03:00
|
|
|
|
|
|
|
|
|
// We don't support retaining with overlay scrollbars, since they require
|
|
|
|
|
// us to look at the display list and pick the highest z-index, which
|
|
|
|
|
// we can't do during partial building.
|
2018-04-11 12:49:30 +03:00
|
|
|
|
if (mBuilder.DisablePartialUpdates()) {
|
2018-04-04 02:30:35 +03:00
|
|
|
|
shouldBuildPartial = false;
|
2018-04-11 12:49:30 +03:00
|
|
|
|
mBuilder.SetDisablePartialUpdates(false);
|
2018-04-04 02:30:35 +03:00
|
|
|
|
}
|
2017-10-24 15:54:16 +03:00
|
|
|
|
|
2017-10-18 06:09:07 +03:00
|
|
|
|
if (mPreviousCaret != mBuilder.GetCaretFrame()) {
|
|
|
|
|
if (mPreviousCaret) {
|
2017-10-26 12:02:05 +03:00
|
|
|
|
if (mBuilder.MarkFrameModifiedDuringBuilding(mPreviousCaret)) {
|
2018-01-12 01:43:41 +03:00
|
|
|
|
modifiedFrames.Frames().AppendElement(mPreviousCaret);
|
2017-10-26 12:02:05 +03:00
|
|
|
|
}
|
2017-10-18 06:09:07 +03:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
if (mBuilder.GetCaretFrame()) {
|
2017-10-26 12:02:05 +03:00
|
|
|
|
if (mBuilder.MarkFrameModifiedDuringBuilding(mBuilder.GetCaretFrame())) {
|
2018-01-12 01:43:41 +03:00
|
|
|
|
modifiedFrames.Frames().AppendElement(mBuilder.GetCaretFrame());
|
2017-10-26 12:02:05 +03:00
|
|
|
|
}
|
2017-10-18 06:09:07 +03:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
mPreviousCaret = mBuilder.GetCaretFrame();
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
nsRect modifiedDirty;
|
|
|
|
|
AnimatedGeometryRoot* modifiedAGR = nullptr;
|
2018-01-12 01:43:41 +03:00
|
|
|
|
if (!shouldBuildPartial ||
|
2018-09-04 23:46:21 +03:00
|
|
|
|
!ComputeRebuildRegion(modifiedFrames.Frames(),
|
|
|
|
|
&modifiedDirty,
|
|
|
|
|
&modifiedAGR,
|
|
|
|
|
framesWithProps.Frames()) ||
|
2018-03-23 06:47:37 +03:00
|
|
|
|
!PreProcessDisplayList(&mList, modifiedAGR)) {
|
|
|
|
|
mBuilder.LeavePresShell(mBuilder.RootReferenceFrame(), List());
|
2018-05-16 03:55:08 +03:00
|
|
|
|
mList.DeleteAll(&mBuilder);
|
2018-01-12 01:46:23 +03:00
|
|
|
|
return PartialUpdateResult::Failed;
|
2018-01-12 01:43:41 +03:00
|
|
|
|
}
|
2017-10-18 06:09:07 +03:00
|
|
|
|
|
2018-04-15 07:38:45 +03:00
|
|
|
|
// This is normally handled by EnterPresShell, but we skipped it so that we
|
|
|
|
|
// didn't call MarkFrameForDisplayIfVisible before ComputeRebuildRegion.
|
2018-09-04 23:46:21 +03:00
|
|
|
|
nsIScrollableFrame* sf = mBuilder.RootReferenceFrame()
|
|
|
|
|
->PresShell()
|
|
|
|
|
->GetRootScrollFrameAsScrollable();
|
2018-04-15 07:38:45 +03:00
|
|
|
|
if (sf) {
|
|
|
|
|
nsCanvasFrame* canvasFrame = do_QueryFrame(sf->GetScrolledFrame());
|
|
|
|
|
if (canvasFrame) {
|
2018-09-04 23:46:21 +03:00
|
|
|
|
mBuilder.MarkFrameForDisplayIfVisible(canvasFrame,
|
|
|
|
|
mBuilder.RootReferenceFrame());
|
2018-04-15 07:38:45 +03:00
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
2018-09-04 23:46:21 +03:00
|
|
|
|
modifiedDirty.IntersectRect(
|
|
|
|
|
modifiedDirty,
|
|
|
|
|
mBuilder.RootReferenceFrame()->GetVisualOverflowRectRelativeToSelf());
|
2018-01-12 01:43:41 +03:00
|
|
|
|
|
2018-01-12 01:46:23 +03:00
|
|
|
|
PartialUpdateResult result = PartialUpdateResult::NoChange;
|
2018-09-04 23:46:21 +03:00
|
|
|
|
if (!modifiedDirty.IsEmpty() || !framesWithProps.IsEmpty()) {
|
2018-01-12 01:46:23 +03:00
|
|
|
|
result = PartialUpdateResult::Updated;
|
|
|
|
|
}
|
2018-01-12 01:43:41 +03:00
|
|
|
|
|
2018-02-09 01:47:08 +03:00
|
|
|
|
mBuilder.SetDirtyRect(modifiedDirty);
|
|
|
|
|
mBuilder.SetPartialUpdate(true);
|
|
|
|
|
|
2018-01-12 01:43:41 +03:00
|
|
|
|
nsDisplayList modifiedDL;
|
2018-09-04 23:46:21 +03:00
|
|
|
|
mBuilder.RootReferenceFrame()->BuildDisplayListForStackingContext(
|
|
|
|
|
&mBuilder, &modifiedDL);
|
2018-02-09 01:47:08 +03:00
|
|
|
|
if (!modifiedDL.IsEmpty()) {
|
2018-09-04 23:46:21 +03:00
|
|
|
|
nsLayoutUtils::AddExtraBackgroundItems(
|
|
|
|
|
mBuilder,
|
|
|
|
|
modifiedDL,
|
|
|
|
|
mBuilder.RootReferenceFrame(),
|
|
|
|
|
nsRect(nsPoint(0, 0), mBuilder.RootReferenceFrame()->GetSize()),
|
|
|
|
|
mBuilder.RootReferenceFrame()->GetVisualOverflowRectRelativeToSelf(),
|
|
|
|
|
aBackstop);
|
2018-01-12 01:43:41 +03:00
|
|
|
|
}
|
2018-02-09 01:47:08 +03:00
|
|
|
|
mBuilder.SetPartialUpdate(false);
|
|
|
|
|
|
2018-05-10 02:39:12 +03:00
|
|
|
|
if (mBuilder.PartialBuildFailed()) {
|
|
|
|
|
mBuilder.SetPartialBuildFailed(false);
|
|
|
|
|
mBuilder.LeavePresShell(mBuilder.RootReferenceFrame(), List());
|
2018-05-16 03:55:08 +03:00
|
|
|
|
mList.DeleteAll(&mBuilder);
|
|
|
|
|
modifiedDL.DeleteAll(&mBuilder);
|
2018-05-10 02:39:12 +03:00
|
|
|
|
return PartialUpdateResult::Failed;
|
|
|
|
|
}
|
|
|
|
|
|
2018-01-12 01:43:41 +03:00
|
|
|
|
if (aChecker) {
|
|
|
|
|
aChecker->Set(&modifiedDL, "TM");
|
2018-02-12 13:09:21 +03:00
|
|
|
|
}
|
2017-10-18 06:09:07 +03:00
|
|
|
|
|
2018-09-04 23:46:21 +03:00
|
|
|
|
// printf_stderr("Painting --- Modified list (dirty %d,%d,%d,%d):\n",
|
|
|
|
|
// modifiedDirty.x, modifiedDirty.y, modifiedDirty.width,
|
|
|
|
|
// modifiedDirty.height);
|
|
|
|
|
// nsFrame::PrintDisplayList(&mBuilder, modifiedDL);
|
2018-02-09 01:47:08 +03:00
|
|
|
|
|
2018-01-12 01:43:41 +03:00
|
|
|
|
// |modifiedDL| can sometimes be empty here. We still perform the
|
|
|
|
|
// display list merging to prune unused items (for example, items that
|
|
|
|
|
// are not visible anymore) from the old list.
|
|
|
|
|
// TODO: Optimization opportunity. In this case, MergeDisplayLists()
|
|
|
|
|
// unnecessarily creates a hashtable of the old items.
|
2018-01-12 01:46:23 +03:00
|
|
|
|
// TODO: Ideally we could skip this if result is NoChange, but currently when
|
|
|
|
|
// we call RestoreState on nsDisplayWrapList it resets the clip to the base
|
|
|
|
|
// clip, and we need the UpdateBounds call (within MergeDisplayLists) to
|
|
|
|
|
// move it to the correct inner clip.
|
2018-01-12 01:43:41 +03:00
|
|
|
|
Maybe<const ActiveScrolledRoot*> dummy;
|
2018-01-12 01:46:23 +03:00
|
|
|
|
if (MergeDisplayLists(&modifiedDL, &mList, &mList, dummy)) {
|
|
|
|
|
result = PartialUpdateResult::Updated;
|
|
|
|
|
}
|
2018-02-12 13:09:21 +03:00
|
|
|
|
|
2018-09-04 23:46:21 +03:00
|
|
|
|
// printf_stderr("Painting --- Merged list:\n");
|
|
|
|
|
// nsFrame::PrintDisplayList(&mBuilder, mList);
|
2018-02-12 13:09:21 +03:00
|
|
|
|
|
2018-03-23 06:47:37 +03:00
|
|
|
|
mBuilder.LeavePresShell(mBuilder.RootReferenceFrame(), List());
|
2018-01-12 01:46:23 +03:00
|
|
|
|
return result;
|
2017-10-18 06:09:07 +03:00
|
|
|
|
}
|