b=724966 make sure to set sRetryGrabTime for retrying grabs r=roc

--HG--
extra : transplant_source : v%A5qVLv%7E%D8%0D%0C%8F%7F%C3%40%AEV%86%E5%BDT
This commit is contained in:
Karl Tomlinson 2012-02-08 09:51:15 +13:00
parent 7c3d9ba62b
commit 98545dde78

View File

@ -4907,9 +4907,11 @@ nsWindow::UpdateTranslucentWindowAlphaInternal(const nsIntRect& aRect,
void
nsWindow::GrabPointer(guint32 aTime)
{
LOG(("GrabPointer %d\n", mRetryPointerGrab));
LOG(("GrabPointer time=0x%08x retry=%d\n",
(unsigned int)aTime, mRetryPointerGrab));
mRetryPointerGrab = false;
sRetryGrabTime = aTime;
// If the window isn't visible, just set the flag to retry the
// grab. When this window becomes visible, the grab will be
@ -4938,7 +4940,6 @@ nsWindow::GrabPointer(guint32 aTime)
if (retval == GDK_GRAB_NOT_VIEWABLE) {
LOG(("GrabPointer: window not viewable; will retry\n"));
mRetryPointerGrab = true;
sRetryGrabTime = aTime;
} else if (retval != GDK_GRAB_SUCCESS) {
LOG(("GrabPointer: pointer grab failed: %i\n", retval));
// A failed grab indicates that another app has grabbed the pointer.