From 5dd391d38697caa4d7e428cae7a0f659ea47ecef Mon Sep 17 00:00:00 2001 From: "roc+%cs.cmu.edu" Date: Tue, 19 Dec 2006 20:11:27 +0000 Subject: [PATCH] Bug 363848. Scrollframes CAN TOO have an nsIScrollbarMediator scrolled frame. r=enndeaking,sr=mats git-svn-id: svn://10.0.0.236/trunk@217209 18797224-902f-48f8-a5cc-f745e15eee43 --- mozilla/layout/generic/nsGfxScrollFrame.cpp | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/mozilla/layout/generic/nsGfxScrollFrame.cpp b/mozilla/layout/generic/nsGfxScrollFrame.cpp index 2f075d04394..de2cb58f2da 100644 --- a/mozilla/layout/generic/nsGfxScrollFrame.cpp +++ b/mozilla/layout/generic/nsGfxScrollFrame.cpp @@ -2605,13 +2605,10 @@ nsGfxScrollFrameInner::SaveState(nsIStatefulFrame::SpecialStateID aStateID) return nsnull; } - // XXX can this actually get hit? I don't think so - nsCOMPtr mediator; - nsIFrame* first = GetScrolledFrame(); - mediator = do_QueryInterface(first); + nsIScrollbarMediator* mediator; + CallQueryInterface(GetScrolledFrame(), &mediator); if (mediator) { - // Child manages its own scrolling. Bail. - NS_ERROR("This code shouldn't be hit; alert robert@ocallahan.org"); + // child handles its own scroll state, so don't bother saving state here return nsnull; }