From fd8fe96280ecbeaeeeca5a534eaea4a060740d44 Mon Sep 17 00:00:00 2001 From: "mats.palmgren%bredband.net" Date: Sat, 24 Feb 2007 04:42:53 +0000 Subject: [PATCH] Make nsFileControlFrame, nsIsIndexFrame and nsLegendFrame QI to kBlockFrameCID. b=370933 r+sr=bzbarsky git-svn-id: svn://10.0.0.236/trunk@220859 18797224-902f-48f8-a5cc-f745e15eee43 --- mozilla/layout/forms/nsFileControlFrame.cpp | 19 +++++++++------- mozilla/layout/forms/nsIsIndexFrame.cpp | 25 ++++++++++++--------- mozilla/layout/forms/nsLegendFrame.cpp | 8 +++---- mozilla/layout/forms/nsSelectsAreaFrame.cpp | 15 ------------- mozilla/layout/forms/nsSelectsAreaFrame.h | 3 --- 5 files changed, 29 insertions(+), 41 deletions(-) diff --git a/mozilla/layout/forms/nsFileControlFrame.cpp b/mozilla/layout/forms/nsFileControlFrame.cpp index d9261482b84..4e63ebce8c2 100644 --- a/mozilla/layout/forms/nsFileControlFrame.cpp +++ b/mozilla/layout/forms/nsFileControlFrame.cpp @@ -20,6 +20,7 @@ * the Initial Developer. All Rights Reserved. * * Contributor(s): + * Mats Palmgren * * Alternatively, the contents of this file may be used under the terms of * either of the GNU General Public License Version 2 or later (the "GPL"), @@ -211,17 +212,19 @@ nsFileControlFrame::CreateAnonymousContent(nsTArray& aElements) NS_IMETHODIMP nsFileControlFrame::QueryInterface(const nsIID& aIID, void** aInstancePtr) { - NS_PRECONDITION(0 != aInstancePtr, "null ptr"); - if (NULL == aInstancePtr) { + NS_PRECONDITION(aInstancePtr, "null ptr"); + if (NS_UNLIKELY(!aInstancePtr)) { return NS_ERROR_NULL_POINTER; - } else if (aIID.Equals(NS_GET_IID(nsIAnonymousContentCreator))) { - *aInstancePtr = (void*)(nsIAnonymousContentCreator*) this; - return NS_OK; - } else if (aIID.Equals(NS_GET_IID(nsIFormControlFrame))) { - *aInstancePtr = (void*) ((nsIFormControlFrame*) this); + } + if (aIID.Equals(NS_GET_IID(nsIAnonymousContentCreator))) { + *aInstancePtr = NS_STATIC_CAST(nsIAnonymousContentCreator*, this); return NS_OK; } - return nsHTMLContainerFrame::QueryInterface(aIID, aInstancePtr); + if (aIID.Equals(NS_GET_IID(nsIFormControlFrame))) { + *aInstancePtr = NS_STATIC_CAST(nsIFormControlFrame*, this); + return NS_OK; + } + return nsAreaFrame::QueryInterface(aIID, aInstancePtr); } void diff --git a/mozilla/layout/forms/nsIsIndexFrame.cpp b/mozilla/layout/forms/nsIsIndexFrame.cpp index b3269b0918e..4c4eba8757f 100644 --- a/mozilla/layout/forms/nsIsIndexFrame.cpp +++ b/mozilla/layout/forms/nsIsIndexFrame.cpp @@ -240,20 +240,23 @@ nsIsIndexFrame::CreateAnonymousContent(nsTArray& aElements) NS_IMETHODIMP nsIsIndexFrame::QueryInterface(const nsIID& aIID, void** aInstancePtr) { - NS_PRECONDITION(0 != aInstancePtr, "null ptr"); - if (NULL == aInstancePtr) { + NS_PRECONDITION(aInstancePtr, "null ptr"); + if (NS_UNLIKELY(!aInstancePtr)) { return NS_ERROR_NULL_POINTER; - } else if (aIID.Equals(NS_GET_IID(nsIAnonymousContentCreator))) { - *aInstancePtr = (void*)(nsIAnonymousContentCreator*) this; - return NS_OK; - } else if (aIID.Equals(NS_GET_IID(nsIStatefulFrame))) { - *aInstancePtr = (void*)(nsIStatefulFrame*) this; - return NS_OK; - } else if (aIID.Equals(NS_GET_IID(nsIDOMKeyListener))) { - *aInstancePtr = (void*)(nsIDOMKeyListener*) this; + } + if (aIID.Equals(NS_GET_IID(nsIAnonymousContentCreator))) { + *aInstancePtr = NS_STATIC_CAST(nsIAnonymousContentCreator*, this); return NS_OK; } - return nsHTMLContainerFrame::QueryInterface(aIID, aInstancePtr); + if (aIID.Equals(NS_GET_IID(nsIStatefulFrame))) { + *aInstancePtr = NS_STATIC_CAST(nsIStatefulFrame*, this); + return NS_OK; + } + if (aIID.Equals(NS_GET_IID(nsIDOMKeyListener))) { + *aInstancePtr = NS_STATIC_CAST(nsIDOMKeyListener*, this); + return NS_OK; + } + return nsAreaFrame::QueryInterface(aIID, aInstancePtr); } nscoord diff --git a/mozilla/layout/forms/nsLegendFrame.cpp b/mozilla/layout/forms/nsLegendFrame.cpp index 75dfe7ccc1b..bfe37e793db 100644 --- a/mozilla/layout/forms/nsLegendFrame.cpp +++ b/mozilla/layout/forms/nsLegendFrame.cpp @@ -81,15 +81,15 @@ nsLegendFrame::Destroy() NS_IMETHODIMP nsLegendFrame::QueryInterface(REFNSIID aIID, void** aInstancePtrResult) { - NS_PRECONDITION(nsnull != aInstancePtrResult, "null pointer"); - if (nsnull == aInstancePtrResult) { + NS_PRECONDITION(aInstancePtrResult, "null pointer"); + if (NS_UNLIKELY(!aInstancePtrResult)) { return NS_ERROR_NULL_POINTER; } if (aIID.Equals(kLegendFrameCID)) { - *aInstancePtrResult = (void*) ((nsLegendFrame*)this); + *aInstancePtrResult = this; return NS_OK; } - return nsHTMLContainerFrame::QueryInterface(aIID, aInstancePtrResult); + return nsAreaFrame::QueryInterface(aIID, aInstancePtrResult); } NS_IMETHODIMP diff --git a/mozilla/layout/forms/nsSelectsAreaFrame.cpp b/mozilla/layout/forms/nsSelectsAreaFrame.cpp index 95d4983f3cf..f4a9df5e328 100644 --- a/mozilla/layout/forms/nsSelectsAreaFrame.cpp +++ b/mozilla/layout/forms/nsSelectsAreaFrame.cpp @@ -56,21 +56,6 @@ NS_NewSelectsAreaFrame(nsIPresShell* aShell, nsStyleContext* aContext, PRUint32 return it; } -/*NS_IMETHODIMP -nsSelectsAreaFrame::QueryInterface(const nsIID& aIID, void** aInstancePtr) -{ - if (NULL == aInstancePtr) { - return NS_ERROR_NULL_POINTER; - } - if (aIID.Equals(kAreaFrameIID)) { - nsIAreaFrame* tmp = (nsIAreaFrame*)this; - *aInstancePtr = (void*)tmp; - return NS_OK; - } - return nsAreaFrame::QueryInterface(aIID, aInstancePtr); -} -*/ - //--------------------------------------------------------- PRBool nsSelectsAreaFrame::IsOptionElement(nsIContent* aContent) diff --git a/mozilla/layout/forms/nsSelectsAreaFrame.h b/mozilla/layout/forms/nsSelectsAreaFrame.h index a4001df2b4f..e76431b8ab9 100644 --- a/mozilla/layout/forms/nsSelectsAreaFrame.h +++ b/mozilla/layout/forms/nsSelectsAreaFrame.h @@ -51,9 +51,6 @@ class nsSelectsAreaFrame : public nsAreaFrame public: friend nsIFrame* NS_NewSelectsAreaFrame(nsIPresShell* aShell, nsStyleContext* aContext, PRUint32 aFlags); - // nsISupports - //NS_IMETHOD QueryInterface(const nsIID& aIID, void** aInstancePtr); - NS_IMETHOD BuildDisplayList(nsDisplayListBuilder* aBuilder, const nsRect& aDirtyRect, const nsDisplayListSet& aLists);