Backed out changeset 636a1f8ef224

This commit is contained in:
Robert O'Callahan 2010-01-14 17:59:22 +13:00
Родитель 40c40a3d2c
Коммит 93aaa3b3c2
2 изменённых файлов: 1 добавлений и 19 удалений

Просмотреть файл

@ -1295,7 +1295,7 @@ AddItemsToRegion(nsDisplayListBuilder* aBuilder, nsDisplayList* aList,
nsRegion clippedOutDestination;
clippedOutDestination.Sub(aUpdateRect, clip);
#ifdef DEBUG
PrintAddedRegion("Adding region for clipped out destination frame %p",
PrintAddedRegion("Adding region for clipped out source frame %p",
clipFrame, clippedOutDestination);
#endif
aRegion->Or(*aRegion, clippedOutDestination);

Просмотреть файл

@ -1755,24 +1755,6 @@ void nsChildView::Scroll(const nsIntPoint& aDelta,
}
}
#endif // NS_LEOPARD_AND_LATER
// Invalidate the area that was scrolled into view from outside the window
// First, compute the destination region whose source was outside the
// window. We do this by subtracting from destRegion the window bounds,
// translated by the scroll amount.
NSView* rootView = [[mView window] contentView];
NSRect rootViewRect = [rootView frame];
rootViewRect.origin = NSMakePoint(0, 0);
rootViewRect = [mView convertRect:rootViewRect fromView: rootView];
nsIntRect windowBounds;
NSRectToGeckoRect(rootViewRect, windowBounds);
destRegion.Sub(destRegion, windowBounds + aDelta);
nsIntRegionRectIterator iter(destRegion);
const nsIntRect* invalidate;
while ((invalidate = iter.Next()) != nsnull) {
NSRect rect;
GeckoRectToNSRect(*invalidate, rect);
[mView setNeedsDisplayInRect:rect];
}
// Leopard, at least, has a nasty bug where calling scrollRect:by: doesn't
// actually trigger a window update. A window update is only triggered