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 820541 - Only call ProcessRemovedDisplayItems once per transaction. r=roc

Browse Source
This commit is contained in:
Matt Woodrow 2012-12-13 09:47:05 +13:00
parent c2a16387f2
commit 43871121e3
2 changed files with 15 additions and 45 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

54
layout/base/FrameLayerBuilder.cpp
View File

@ -977,52 +977,29 @@ FrameLayerBuilder::WillEndTransaction()
(mRetainingManager->GetUserData(&gLayerManagerUserData));
NS_ASSERTION(data, "Must have data!");
// Update all the frames that used to have layers.
data->mDisplayItems.EnumerateEntries(UpdateDisplayItemDataForFrame, nullptr);
data->mDisplayItems.EnumerateEntries(ProcessRemovedDisplayItems, this);
data->mInvalidateAllLayers = false;
}
struct ProcessRemovedDisplayItemsData
{
ProcessRemovedDisplayItemsData(Layer* aLayer, FrameLayerBuilder* aLayerBuilder)
: mLayer(aLayer)
, mLayerBuilder(aLayerBuilder)
{}
Layer *mLayer;
FrameLayerBuilder *mLayerBuilder;
};
/* static */ PLDHashOperator
FrameLayerBuilder::ProcessRemovedDisplayItems(nsRefPtrHashKey<DisplayItemData>* aEntry,
void* aUserArg)
{
ProcessRemovedDisplayItemsData *userData =
static_cast<ProcessRemovedDisplayItemsData*>(aUserArg);
Layer* layer = userData->mLayer;
FrameLayerBuilder* layerBuilder = userData->mLayerBuilder;
DisplayItemData* item = aEntry->GetKey();
ThebesLayer* t = item->mLayer->AsThebesLayer();
if (!item->mUsed && t && (t == layer)) {
#ifdef DEBUG_INVALIDATIONS
printf("Invalidating unused display item (%i) belonging to frame %p from layer %p\n", item->mDisplayItemKey, item->mFrameList[0], t);
#endif
InvalidatePostTransformRegion(t,
item->mGeometry->ComputeInvalidationRegion(),
item->mClip,
layerBuilder->GetLastPaintOffset(t));
}
return PL_DHASH_NEXT;
}
/* static */ PLDHashOperator
FrameLayerBuilder::UpdateDisplayItemDataForFrame(nsRefPtrHashKey<DisplayItemData>* aEntry,
void* aUserArg)
{
DisplayItemData* data = aEntry->GetKey();
if (!data->mUsed) {
// This item was visible, but isn't anymore.
FrameLayerBuilder* layerBuilder = static_cast<FrameLayerBuilder*>(aUserArg);
ThebesLayer* t = data->mLayer->AsThebesLayer();
if (t) {
#ifdef DEBUG_INVALIDATIONS
printf("Invalidating unused display item (%i) belonging to frame %p from layer %p\n", data->mDisplayItemKey, data->mFrameList[0], t);
#endif
InvalidatePostTransformRegion(t,
data->mGeometry->ComputeInvalidationRegion(),
data->mClip,
layerBuilder->GetLastPaintOffset(t));
}
return PL_DHASH_REMOVE;
}
@ -2680,11 +2657,6 @@ ContainerState::Finish(uint32_t* aTextContentFlags, LayerManagerData* aData)
Layer* prevChild = i == 0 ? nullptr : mNewChildLayers[i - 1].get();
layer = mNewChildLayers[i];
if (aData) {
ProcessRemovedDisplayItemsData data(layer, mLayerBuilder);
aData->mDisplayItems.EnumerateEntries(FrameLayerBuilder::ProcessRemovedDisplayItems, &data);
}
if (!layer->GetVisibleRegion().IsEmpty()) {
textContentFlags |= layer->GetContentFlags() & Layer::CONTENT_COMPONENT_ALPHA;
}

6
layout/base/FrameLayerBuilder.h
View File

@ -668,15 +668,13 @@ public:
return mThebesLayerItems.GetEntry(aLayer);
}
static PLDHashOperator ProcessRemovedDisplayItems(nsRefPtrHashKey<DisplayItemData>* aEntry,
void* aUserArg);
protected:
void RemoveThebesItemsAndOwnerDataForLayerSubtree(Layer* aLayer,
bool aRemoveThebesItems,
bool aRemoveOwnerData);
static PLDHashOperator UpdateDisplayItemDataForFrame(nsRefPtrHashKey<DisplayItemData>* aEntry,
void* aUserArg);
static PLDHashOperator ProcessRemovedDisplayItems(nsRefPtrHashKey<DisplayItemData>* aEntry,
void* aUserArg);
static PLDHashOperator RestoreDisplayItemData(nsRefPtrHashKey<DisplayItemData>* aEntry,
void *aUserArg);