From 8a5b5bbe43dc973f6d2f2f0ee636d5f8da127fd6 Mon Sep 17 00:00:00 2001 From: "bzbarsky%mit.edu" Date: Thu, 19 Feb 2004 23:04:51 +0000 Subject: [PATCH] Don't lie about our scrollable view, and don't claim to have one if we're not scrollable. Bug 209807, r+sr=roc git-svn-id: svn://10.0.0.236/trunk@152983 18797224-902f-48f8-a5cc-f745e15eee43 --- mozilla/layout/forms/nsTextControlFrame.cpp | 16 ++-------------- .../layout/html/forms/src/nsTextControlFrame.cpp | 16 ++-------------- 2 files changed, 4 insertions(+), 28 deletions(-) diff --git a/mozilla/layout/forms/nsTextControlFrame.cpp b/mozilla/layout/forms/nsTextControlFrame.cpp index 9ba62dde012..f3663bedfa3 100644 --- a/mozilla/layout/forms/nsTextControlFrame.cpp +++ b/mozilla/layout/forms/nsTextControlFrame.cpp @@ -1127,7 +1127,7 @@ nsTextControlFrame::QueryInterface(const nsIID& aIID, void** aInstancePtr) *aInstancePtr = (void*)(nsITextControlFrame*) this; return NS_OK; } - if (aIID.Equals(NS_GET_IID(nsIScrollableViewProvider))) { + if (aIID.Equals(NS_GET_IID(nsIScrollableViewProvider)) && IsScrollable()) { *aInstancePtr = (void*)(nsIScrollableViewProvider*) this; return NS_OK; } @@ -3093,20 +3093,8 @@ NS_IMETHODIMP nsTextControlFrame::GetScrollableView(nsIPresContext* aPresContext, nsIScrollableView** aView) { - nsresult rv = NS_OK; *aView = mScrollableView; - if (mScrollableView && !IsScrollable()) { - nsIView *view = 0; - nsIScrollableView* scrollableView = 0; - rv = mScrollableView->QueryInterface(NS_GET_IID(nsIView), (void**)&view); - while (view) { - rv = view->QueryInterface(NS_GET_IID(nsIScrollableView), (void **)&scrollableView); - if (NS_SUCCEEDED(rv) && scrollableView) - *aView = scrollableView; - view = view->GetParent(); - } - } - return rv; + return NS_OK; } PRBool diff --git a/mozilla/layout/html/forms/src/nsTextControlFrame.cpp b/mozilla/layout/html/forms/src/nsTextControlFrame.cpp index 9ba62dde012..f3663bedfa3 100644 --- a/mozilla/layout/html/forms/src/nsTextControlFrame.cpp +++ b/mozilla/layout/html/forms/src/nsTextControlFrame.cpp @@ -1127,7 +1127,7 @@ nsTextControlFrame::QueryInterface(const nsIID& aIID, void** aInstancePtr) *aInstancePtr = (void*)(nsITextControlFrame*) this; return NS_OK; } - if (aIID.Equals(NS_GET_IID(nsIScrollableViewProvider))) { + if (aIID.Equals(NS_GET_IID(nsIScrollableViewProvider)) && IsScrollable()) { *aInstancePtr = (void*)(nsIScrollableViewProvider*) this; return NS_OK; } @@ -3093,20 +3093,8 @@ NS_IMETHODIMP nsTextControlFrame::GetScrollableView(nsIPresContext* aPresContext, nsIScrollableView** aView) { - nsresult rv = NS_OK; *aView = mScrollableView; - if (mScrollableView && !IsScrollable()) { - nsIView *view = 0; - nsIScrollableView* scrollableView = 0; - rv = mScrollableView->QueryInterface(NS_GET_IID(nsIView), (void**)&view); - while (view) { - rv = view->QueryInterface(NS_GET_IID(nsIScrollableView), (void **)&scrollableView); - if (NS_SUCCEEDED(rv) && scrollableView) - *aView = scrollableView; - view = view->GetParent(); - } - } - return rv; + return NS_OK; } PRBool