Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-10 11:55:49 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 523911. Cocoa 'scrollRect' method doesn't actually update the window if we don't also invalidate something. Sometimes our scroll optimizations are so smart we don't actually need to repaint anything, so just invalidate one pixel in that case. r=josh

Browse Source
This commit is contained in:
Robert O'Callahan 2009-11-04 07:39:42 +13:00
parent bbc584bbb1
commit e3f770f808
1 changed files with 29 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1700,6 +1700,19 @@ nsresult nsChildView::ConfigureChildren(const nsTArray<Configuration>& aConfigur
return NS_OK;
}
static PRInt32
PickValueForSign(PRInt32 aSign, PRInt32 aLessThanZero, PRInt32 aZero,
PRInt32 aGreaterThanZero)
{
if (aSign < 0) {
return aLessThanZero;
}
if (aSign > 0) {
return aGreaterThanZero;
}
return aZero;
}
void nsChildView::Scroll(const nsIntPoint& aDelta,
const nsTArray<nsIntRect>& aDestRects,
const nsTArray<Configuration>& aConfigurations)
@ -1713,7 +1726,7 @@ void nsChildView::Scroll(const nsIntPoint& aDelta,
#ifndef NS_LEOPARD_AND_LATER
BOOL viewWasDirty = mVisible && [mView needsDisplay];
#endif // NS_LEOPARD_AND_LATER
if (mVisible) {
if (mVisible && !aDestRects.IsEmpty()) {
for (PRUint32 i = 0; i < aDestRects.Length(); ++i) {
NSRect rect;
GeckoRectToNSRect(aDestRects[i] - aDelta, rect);
@ -1723,6 +1736,21 @@ void nsChildView::Scroll(const nsIntPoint& aDelta,
[mView translateRectsNeedingDisplayInRect:rect by:scrollVector];
#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
// scrolling in such a way that nothing actually gets repainted.
// So let's invalidate one pixel. We'll pick a pixel on the trailing edge
// of the last destination rectangle, since in most situations that's going
// to be invalidated anyway.
nsIntRect lastRect = aDestRects[aDestRects.Length() - 1] + aDelta;
nsIntPoint pointToInvalidate(
PickValueForSign(aDelta.x, lastRect.XMost(), lastRect.x, lastRect.x - 1),
PickValueForSign(aDelta.y, lastRect.YMost(), lastRect.y, lastRect.y - 1));
if (!nsIntRect(0,0,mBounds.width,mBounds.height).Contains(pointToInvalidate)) {
pointToInvalidate = nsIntPoint(0, 0);
}
Invalidate(nsIntRect(pointToInvalidate, nsIntSize(1,1)), PR_FALSE);
}
// Don't force invalidation of the child if it's moving by the scroll