wine/gecko
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-gecko.git synced 2024-09-13 09:24:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

Bug 800287 - Optimize display list processing. r=roc

Browse Source
This commit is contained in:
Matt Woodrow 2012-10-12 12:38:25 +13:00
parent 15482dcc1f
commit 640446a3b7
2 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
layout/base/FrameLayerBuilder.cpp
View File

@ -2005,6 +2005,10 @@ ContainerState::ProcessDisplayItems(const nsDisplayList& aList,
uint32_t aFlags)
{
SAMPLE_LABEL("ContainerState", "ProcessDisplayItems");
const nsIFrame* lastActiveScrolledRoot = nullptr;
nsPoint topLeft;
for (nsDisplayItem* item = aList.GetBottom(); item; item = item->GetAbove()) {
nsDisplayItem::Type type = item->GetType();
if (type == nsDisplayItem::TYPE_CLIP ||
@ -2035,7 +2039,6 @@ ContainerState::ProcessDisplayItems(const nsDisplayList& aList,
bool isFixed;
bool forceInactive;
const nsIFrame* activeScrolledRoot;
nsPoint topLeft;
if (aFlags & NO_COMPONENT_ALPHA) {
// When NO_COMPONENT_ALPHA is set, items will be flattened onto the
// reference frame. In this case, force the active scrolled root to
@ -2047,7 +2050,10 @@ ContainerState::ProcessDisplayItems(const nsDisplayList& aList,
} else {
forceInactive = false;
isFixed = mBuilder->IsFixedItem(item, &activeScrolledRoot);
topLeft = activeScrolledRoot->GetOffsetToCrossDoc(mContainerReferenceFrame);
if (activeScrolledRoot != lastActiveScrolledRoot) {
lastActiveScrolledRoot = activeScrolledRoot;
topLeft = activeScrolledRoot->GetOffsetToCrossDoc(mContainerReferenceFrame);
}
}
nsAutoPtr<nsDisplayItemGeometry> geometry(item->AllocateGeometry(mBuilder));

2
layout/base/nsDisplayList.h
View File

@ -663,7 +663,7 @@ public:
{
if (aFrame) {
mReferenceFrame = aBuilder->FindReferenceFrameFor(aFrame);
mToReferenceFrame = aFrame->GetOffsetToCrossDoc(mReferenceFrame);
mToReferenceFrame = aBuilder->ToReferenceFrame(aFrame);
}
}
nsDisplayItem(nsDisplayListBuilder* aBuilder, nsIFrame* aFrame,