diff --git a/mozilla/layout/generic/nsFrame.cpp b/mozilla/layout/generic/nsFrame.cpp index 9eea2ccc03d..7e152e5fb60 100644 --- a/mozilla/layout/generic/nsFrame.cpp +++ b/mozilla/layout/generic/nsFrame.cpp @@ -1051,9 +1051,13 @@ nsFrame::MoveInSpaceManager(nsIPresContext& aPresContext, } NS_IMETHODIMP -nsFrame::VerticalAlignFrames(nscoord aLineHeight, - nscoord aDistanceFromTopEdge) +nsFrame::VerticalAlignFrames(nsIPresContext& aPresContext, + const nsHTMLReflowState& aState, + nscoord aLineHeight, + nscoord aDistanceFromTopEdge, + nsRect& aCombinedRect) { + aCombinedRect = mRect; return NS_OK; } diff --git a/mozilla/layout/generic/nsFrame.h b/mozilla/layout/generic/nsFrame.h index 40565315d41..5ef125b8b29 100644 --- a/mozilla/layout/generic/nsFrame.h +++ b/mozilla/layout/generic/nsFrame.h @@ -238,8 +238,11 @@ public: NS_IMETHOD MoveInSpaceManager(nsIPresContext& aPresContext, nsISpaceManager* aSpaceManager, nscoord aDeltaX, nscoord aDeltaY); - NS_IMETHOD VerticalAlignFrames(nscoord aLineHeight, - nscoord aDistanceFromTopEdge); + NS_IMETHOD VerticalAlignFrames(nsIPresContext& aPresContext, + const nsHTMLReflowState& aState, + nscoord aLineHeight, + nscoord aDistanceFromTopEdge, + nsRect& aCombinedRect); // Selection Methods // XXX Doc me... (in nsIFrame.h puhleeze) diff --git a/mozilla/layout/html/base/src/nsFrame.cpp b/mozilla/layout/html/base/src/nsFrame.cpp index 9eea2ccc03d..7e152e5fb60 100644 --- a/mozilla/layout/html/base/src/nsFrame.cpp +++ b/mozilla/layout/html/base/src/nsFrame.cpp @@ -1051,9 +1051,13 @@ nsFrame::MoveInSpaceManager(nsIPresContext& aPresContext, } NS_IMETHODIMP -nsFrame::VerticalAlignFrames(nscoord aLineHeight, - nscoord aDistanceFromTopEdge) +nsFrame::VerticalAlignFrames(nsIPresContext& aPresContext, + const nsHTMLReflowState& aState, + nscoord aLineHeight, + nscoord aDistanceFromTopEdge, + nsRect& aCombinedRect) { + aCombinedRect = mRect; return NS_OK; } diff --git a/mozilla/layout/html/base/src/nsFrame.h b/mozilla/layout/html/base/src/nsFrame.h index 40565315d41..5ef125b8b29 100644 --- a/mozilla/layout/html/base/src/nsFrame.h +++ b/mozilla/layout/html/base/src/nsFrame.h @@ -238,8 +238,11 @@ public: NS_IMETHOD MoveInSpaceManager(nsIPresContext& aPresContext, nsISpaceManager* aSpaceManager, nscoord aDeltaX, nscoord aDeltaY); - NS_IMETHOD VerticalAlignFrames(nscoord aLineHeight, - nscoord aDistanceFromTopEdge); + NS_IMETHOD VerticalAlignFrames(nsIPresContext& aPresContext, + const nsHTMLReflowState& aState, + nscoord aLineHeight, + nscoord aDistanceFromTopEdge, + nsRect& aCombinedRect); // Selection Methods // XXX Doc me... (in nsIFrame.h puhleeze)