From 4bdc84ba5d99657a79d28e9bd328dd7e67fd1d4e Mon Sep 17 00:00:00 2001 From: "Olli.Pettay%helsinki.fi" Date: Fri, 13 Apr 2007 14:07:40 +0000 Subject: [PATCH] Bug 374090, Crash [@ nsGfxScrollFrameInner::GetScrollPortSize] with noframes and setting binding on root element, r+sr=roc git-svn-id: svn://10.0.0.236/trunk@224486 18797224-902f-48f8-a5cc-f745e15eee43 --- mozilla/layout/generic/nsGfxScrollFrame.cpp | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/mozilla/layout/generic/nsGfxScrollFrame.cpp b/mozilla/layout/generic/nsGfxScrollFrame.cpp index 929be9aa42c..68148cec77a 100644 --- a/mozilla/layout/generic/nsGfxScrollFrame.cpp +++ b/mozilla/layout/generic/nsGfxScrollFrame.cpp @@ -1514,12 +1514,6 @@ nsresult nsGfxScrollFrameInner::FireScrollPortEvent() { mAsyncScrollPortEvent.Forget(); - mOuter->PresContext()->GetPresShell()-> - FlushPendingNotifications(Flush_OnlyReflow); - if (mAsyncScrollPortEvent.IsPending()) { - return NS_OK; - } - nsSize scrollportSize = GetScrollPortSize(); nsSize childSize = GetScrolledRect(scrollportSize).Size(); @@ -1892,6 +1886,10 @@ nsGfxScrollFrameInner::PostScrollEvent() NS_IMETHODIMP nsGfxScrollFrameInner::AsyncScrollPortEvent::Run() { + if (mInner) { + mInner->mOuter->PresContext()->GetPresShell()-> + FlushPendingNotifications(Flush_OnlyReflow); + } return mInner ? mInner->FireScrollPortEvent() : NS_OK; }