Bug 396185 - Make nsIFrame derivatives and helper abstract classes use a different dynamic-cast system than nsISupports:
* we know all types frames may be cast to at compile time, so instead of extensible GUID IIDs, use a big enum (see nsQueryFrame::FrameIID) * eliminate all vestiges of refcounting, since frames aren't refcounted Some frames (SVG frames in particular) still implement nsISupports-derived interfaces, for example nsISVGValue. There is a FrameIID for nsISVGValue that lets you go from a frame to the XPCOM interface, but you can't query back. r+sr=roc nsITextControlFrame didn't have an IID the first time around, but this wasn't a compile error because nsITextControlFrame::kFrameIID inherited from nsIFormControlFrame::kFrameIID. I've added a static analysis pass to verify the correct behavior, since I can't figure out a way to make the compiler do it.
This commit is contained in:
@@ -1117,12 +1117,9 @@ nsNSElementTearoff::GetScrollInfo(nsIScrollableView **aScrollableView,
|
||||
}
|
||||
|
||||
// Get the scrollable frame
|
||||
nsIScrollableFrame *scrollFrame = nsnull;
|
||||
CallQueryInterface(frame, &scrollFrame);
|
||||
|
||||
nsIScrollableFrame *scrollFrame = do_QueryFrame(frame);
|
||||
if (!scrollFrame) {
|
||||
nsIScrollableViewProvider *scrollProvider = nsnull;
|
||||
CallQueryInterface(frame, &scrollProvider);
|
||||
nsIScrollableViewProvider *scrollProvider = do_QueryFrame(frame);
|
||||
// menu frames implement nsIScrollableViewProvider but we don't want
|
||||
// to use it here.
|
||||
if (scrollProvider && frame->GetType() != nsGkAtoms::menuFrame) {
|
||||
@@ -1151,7 +1148,7 @@ nsNSElementTearoff::GetScrollInfo(nsIScrollableView **aScrollableView,
|
||||
break;
|
||||
}
|
||||
|
||||
CallQueryInterface(frame, &scrollFrame);
|
||||
scrollFrame = do_QueryFrame(frame);
|
||||
} while (!scrollFrame);
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user