diff --git a/mozilla/layout/generic/nsTextFrame.cpp b/mozilla/layout/generic/nsTextFrame.cpp index 6934c3de3b8..75a4a960675 100644 --- a/mozilla/layout/generic/nsTextFrame.cpp +++ b/mozilla/layout/generic/nsTextFrame.cpp @@ -389,9 +389,6 @@ public: nsTextFrame(); // nsIFrame - NS_IMETHOD QueryInterface(const nsIID& aIID, - void** aInstancePtrResult); - NS_IMETHOD Paint(nsIPresContext* aPresContext, nsIRenderingContext& aRenderingContext, const nsRect& aDirtyRect, @@ -825,17 +822,6 @@ PRPackedBool nsTextFrame::sWordSelectEatSpaceAfter = PR_TRUE; //----------------------------------------------------------------------------- -NS_IMETHODIMP nsTextFrame::QueryInterface(const nsIID& aIID, - void** aInstancePtrResult) -{ - - NS_PRECONDITION(aInstancePtrResult, "null pointer"); - if (!aInstancePtrResult) - return NS_ERROR_NULL_POINTER; - - return nsFrame::QueryInterface(aIID, aInstancePtrResult); -} - NS_IMETHODIMP nsTextFrame::Destroy(nsIPresContext* aPresContext) { diff --git a/mozilla/layout/html/base/src/nsTextFrame.cpp b/mozilla/layout/html/base/src/nsTextFrame.cpp index 6934c3de3b8..75a4a960675 100644 --- a/mozilla/layout/html/base/src/nsTextFrame.cpp +++ b/mozilla/layout/html/base/src/nsTextFrame.cpp @@ -389,9 +389,6 @@ public: nsTextFrame(); // nsIFrame - NS_IMETHOD QueryInterface(const nsIID& aIID, - void** aInstancePtrResult); - NS_IMETHOD Paint(nsIPresContext* aPresContext, nsIRenderingContext& aRenderingContext, const nsRect& aDirtyRect, @@ -825,17 +822,6 @@ PRPackedBool nsTextFrame::sWordSelectEatSpaceAfter = PR_TRUE; //----------------------------------------------------------------------------- -NS_IMETHODIMP nsTextFrame::QueryInterface(const nsIID& aIID, - void** aInstancePtrResult) -{ - - NS_PRECONDITION(aInstancePtrResult, "null pointer"); - if (!aInstancePtrResult) - return NS_ERROR_NULL_POINTER; - - return nsFrame::QueryInterface(aIID, aInstancePtrResult); -} - NS_IMETHODIMP nsTextFrame::Destroy(nsIPresContext* aPresContext) {