Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2025-02-11 01:57:00 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 526882. translateRectsNeedingDisplayInRect isn't exactly what we need so we have to apply it to a larger rectangle than desired, then fix up by invalidating areas that have not been bltted. r=mstange

Browse Source
This commit is contained in:
Robert O'Callahan 2009-11-10 14:00:36 +13:00
parent 3a006fef6a
commit 546e09050f
1 changed files with 31 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
widget/src/cocoa/nsChildView.mm
View File

@ -78,6 +78,7 @@
#include "gfxContext.h"
#include "gfxQuartzSurface.h"
#include "nsRegion.h"
#include <dlfcn.h>
@ -1723,19 +1724,43 @@ void nsChildView::Scroll(const nsIntPoint& aDelta,
if (!mParentView)
return;
#ifndef NS_LEOPARD_AND_LATER
BOOL viewWasDirty = mVisible && [mView needsDisplay];
#endif // NS_LEOPARD_AND_LATER
if (mVisible && !aDestRects.IsEmpty()) {
// Union of all source and destination rects
nsIntRegion destRegion;
NSSize scrollVector = {aDelta.x, aDelta.y};
for (PRUint32 i = 0; i < aDestRects.Length(); ++i) {
NSRect rect;
GeckoRectToNSRect(aDestRects[i] - aDelta, rect);
NSSize scrollVector = {aDelta.x, aDelta.y};
[mView scrollRect:rect by:scrollVector];
#ifdef NS_LEOPARD_AND_LATER
[mView translateRectsNeedingDisplayInRect:rect by:scrollVector];
#endif // NS_LEOPARD_AND_LATER
destRegion.Or(destRegion, aDestRects[i]);
}
#ifdef NS_LEOPARD_AND_LATER
if (viewWasDirty) {
nsIntRect allRects = destRegion.GetBounds();
allRects.UnionRect(allRects, allRects - aDelta);
NSRect all;
GeckoRectToNSRect(allRects, all);
[mView translateRectsNeedingDisplayInRect:all by:scrollVector];
// Areas that could be affected by the
// translateRectsNeedingDisplayInRect but aren't in any destination
// may have had their invalidation moved incorrectly. So just
// invalidate them now. Unfortunately Apple hasn't given us an API
// to do exactly what we need here.
nsIntRegion needsInvalidation;
needsInvalidation.Sub(allRects, destRegion);
nsIntRegionRectIterator iter(needsInvalidation);
const nsIntRect* invalidate;
for (nsIntRegionRectIterator iter(needsInvalidation);
(invalidate = iter.Next()) != nsnull;) {
NSRect rect;
GeckoRectToNSRect(*invalidate, rect);
[mView setNeedsDisplayInRect:rect];
}
}
#endif // NS_LEOPARD_AND_LATER
// Leopard, at least, has a nasty bug where calling scrollRect:by: doesn't
// actually trigger a window update. A window update is only triggered
// if you actually paint something. In some cases Gecko might optimize