diff --git a/layout/base/nsPresShell.cpp b/layout/base/nsPresShell.cpp index 0d99dec0e0f..1d758d064ca 100644 --- a/layout/base/nsPresShell.cpp +++ b/layout/base/nsPresShell.cpp @@ -1185,7 +1185,6 @@ public: NS_IMETHOD HandleDOMEventWithTarget(nsIContent* aTargetContent, nsEvent* aEvent, nsEventStatus* aStatus); - NS_IMETHOD Scrolled(nsIView *aView); NS_IMETHOD ResizeReflow(nsIView *aView, nscoord aWidth, nscoord aHeight); //nsIFocusTracker interface @@ -6434,26 +6433,6 @@ PresShell::HandleDOMEventWithTarget(nsIContent* aTargetContent, nsEvent* aEvent, return NS_OK; } -NS_IMETHODIMP -PresShell::Scrolled(nsIView *aView) -{ - void* clientData; - nsIFrame* frame; - nsresult rv; - - NS_ASSERTION(!(nsnull == aView), "null view"); - - aView->GetClientData(clientData); - frame = (nsIFrame *)clientData; - - if (nsnull != frame) - rv = frame->Scrolled(aView); - else - rv = NS_OK; - - return rv; -} - NS_IMETHODIMP PresShell::ResizeReflow(nsIView *aView, nscoord aWidth, nscoord aHeight) { diff --git a/layout/base/public/nsIFrame.h b/layout/base/public/nsIFrame.h index 9d80bf53338..87878fd522c 100644 --- a/layout/base/public/nsIFrame.h +++ b/layout/base/public/nsIFrame.h @@ -1044,12 +1044,6 @@ public: */ NS_IMETHOD IsPercentageBase(PRBool& aBase) const = 0; - /** - * called when the frame has been scrolled to a new - * position. only called for frames with views. - */ - NS_IMETHOD Scrolled(nsIView *aView) = 0; - /** Selection related calls */ /** diff --git a/layout/generic/nsFrame.cpp b/layout/generic/nsFrame.cpp index 5be4a897223..8e53f3fc357 100644 --- a/layout/generic/nsFrame.cpp +++ b/layout/generic/nsFrame.cpp @@ -2787,11 +2787,6 @@ NS_IMETHODIMP nsFrame::IsPercentageBase(PRBool& aBase) const return NS_OK; } -NS_IMETHODIMP nsFrame::Scrolled(nsIView *aView) -{ - return NS_OK; -} - PRInt32 nsFrame::ContentIndexInContainer(const nsIFrame* aFrame) { PRInt32 result = -1; diff --git a/layout/generic/nsFrame.h b/layout/generic/nsFrame.h index 65bf270b775..2865416919c 100644 --- a/layout/generic/nsFrame.h +++ b/layout/generic/nsFrame.h @@ -247,7 +247,6 @@ public: NS_IMETHOD GetWindow(nsIPresContext* aPresContext, nsIWidget**) const; NS_IMETHOD GetFrameType(nsIAtom** aType) const; NS_IMETHOD IsPercentageBase(PRBool& aBase) const; - NS_IMETHOD Scrolled(nsIView *aView); #ifdef NS_DEBUG NS_IMETHOD List(nsIPresContext* aPresContext, FILE* out, PRInt32 aIndent) const; NS_IMETHOD GetFrameName(nsAString& aResult) const; diff --git a/layout/generic/nsIFrame.h b/layout/generic/nsIFrame.h index 9d80bf53338..87878fd522c 100644 --- a/layout/generic/nsIFrame.h +++ b/layout/generic/nsIFrame.h @@ -1044,12 +1044,6 @@ public: */ NS_IMETHOD IsPercentageBase(PRBool& aBase) const = 0; - /** - * called when the frame has been scrolled to a new - * position. only called for frames with views. - */ - NS_IMETHOD Scrolled(nsIView *aView) = 0; - /** Selection related calls */ /** diff --git a/layout/generic/nsObjectFrame.cpp b/layout/generic/nsObjectFrame.cpp index d245e9a9b72..c065f363ee7 100644 --- a/layout/generic/nsObjectFrame.cpp +++ b/layout/generic/nsObjectFrame.cpp @@ -1914,12 +1914,6 @@ nsObjectFrame::HandleEvent(nsIPresContext* aPresContext, return rv; } -nsresult -nsObjectFrame::Scrolled(nsIView *aView) -{ - return NS_OK; -} - nsresult nsObjectFrame::SetFullURL(nsIURI* aURL) { diff --git a/layout/generic/nsObjectFrame.h b/layout/generic/nsObjectFrame.h index d22c1eae0d7..3e89c4b7bfe 100644 --- a/layout/generic/nsObjectFrame.h +++ b/layout/generic/nsObjectFrame.h @@ -84,7 +84,6 @@ public: nsGUIEvent* aEvent, nsEventStatus* aEventStatus); - NS_IMETHOD Scrolled(nsIView *aView); NS_IMETHOD GetFrameType(nsIAtom** aType) const; virtual PRBool SupportsVisibilityHidden() { return PR_FALSE; } diff --git a/layout/html/base/src/nsFrame.cpp b/layout/html/base/src/nsFrame.cpp index 5be4a897223..8e53f3fc357 100644 --- a/layout/html/base/src/nsFrame.cpp +++ b/layout/html/base/src/nsFrame.cpp @@ -2787,11 +2787,6 @@ NS_IMETHODIMP nsFrame::IsPercentageBase(PRBool& aBase) const return NS_OK; } -NS_IMETHODIMP nsFrame::Scrolled(nsIView *aView) -{ - return NS_OK; -} - PRInt32 nsFrame::ContentIndexInContainer(const nsIFrame* aFrame) { PRInt32 result = -1; diff --git a/layout/html/base/src/nsFrame.h b/layout/html/base/src/nsFrame.h index 65bf270b775..2865416919c 100644 --- a/layout/html/base/src/nsFrame.h +++ b/layout/html/base/src/nsFrame.h @@ -247,7 +247,6 @@ public: NS_IMETHOD GetWindow(nsIPresContext* aPresContext, nsIWidget**) const; NS_IMETHOD GetFrameType(nsIAtom** aType) const; NS_IMETHOD IsPercentageBase(PRBool& aBase) const; - NS_IMETHOD Scrolled(nsIView *aView); #ifdef NS_DEBUG NS_IMETHOD List(nsIPresContext* aPresContext, FILE* out, PRInt32 aIndent) const; NS_IMETHOD GetFrameName(nsAString& aResult) const; diff --git a/layout/html/base/src/nsObjectFrame.cpp b/layout/html/base/src/nsObjectFrame.cpp index d245e9a9b72..c065f363ee7 100644 --- a/layout/html/base/src/nsObjectFrame.cpp +++ b/layout/html/base/src/nsObjectFrame.cpp @@ -1914,12 +1914,6 @@ nsObjectFrame::HandleEvent(nsIPresContext* aPresContext, return rv; } -nsresult -nsObjectFrame::Scrolled(nsIView *aView) -{ - return NS_OK; -} - nsresult nsObjectFrame::SetFullURL(nsIURI* aURL) { diff --git a/layout/html/base/src/nsObjectFrame.h b/layout/html/base/src/nsObjectFrame.h index d22c1eae0d7..3e89c4b7bfe 100644 --- a/layout/html/base/src/nsObjectFrame.h +++ b/layout/html/base/src/nsObjectFrame.h @@ -84,7 +84,6 @@ public: nsGUIEvent* aEvent, nsEventStatus* aEventStatus); - NS_IMETHOD Scrolled(nsIView *aView); NS_IMETHOD GetFrameType(nsIAtom** aType) const; virtual PRBool SupportsVisibilityHidden() { return PR_FALSE; } diff --git a/layout/html/base/src/nsPresShell.cpp b/layout/html/base/src/nsPresShell.cpp index 0d99dec0e0f..1d758d064ca 100644 --- a/layout/html/base/src/nsPresShell.cpp +++ b/layout/html/base/src/nsPresShell.cpp @@ -1185,7 +1185,6 @@ public: NS_IMETHOD HandleDOMEventWithTarget(nsIContent* aTargetContent, nsEvent* aEvent, nsEventStatus* aStatus); - NS_IMETHOD Scrolled(nsIView *aView); NS_IMETHOD ResizeReflow(nsIView *aView, nscoord aWidth, nscoord aHeight); //nsIFocusTracker interface @@ -6434,26 +6433,6 @@ PresShell::HandleDOMEventWithTarget(nsIContent* aTargetContent, nsEvent* aEvent, return NS_OK; } -NS_IMETHODIMP -PresShell::Scrolled(nsIView *aView) -{ - void* clientData; - nsIFrame* frame; - nsresult rv; - - NS_ASSERTION(!(nsnull == aView), "null view"); - - aView->GetClientData(clientData); - frame = (nsIFrame *)clientData; - - if (nsnull != frame) - rv = frame->Scrolled(aView); - else - rv = NS_OK; - - return rv; -} - NS_IMETHODIMP PresShell::ResizeReflow(nsIView *aView, nscoord aWidth, nscoord aHeight) { diff --git a/view/public/nsIViewObserver.h b/view/public/nsIViewObserver.h index 2674193cf55..18c701282aa 100644 --- a/view/public/nsIViewObserver.h +++ b/view/public/nsIViewObserver.h @@ -78,11 +78,6 @@ public: PRBool aForceHandle, PRBool& aHandled) = 0; - /* called when the view has been repositioned due to scrolling - * @return error status - */ - NS_IMETHOD Scrolled(nsIView * aView) = 0; - /* called when the view has been resized and the * content within the view needs to be reflowed. * @param aWidth - new width of view