diff --git a/mozilla/layout/generic/nsContainerFrame.cpp b/mozilla/layout/generic/nsContainerFrame.cpp index 97fccbbae73..f4f22f65c80 100644 --- a/mozilla/layout/generic/nsContainerFrame.cpp +++ b/mozilla/layout/generic/nsContainerFrame.cpp @@ -432,7 +432,7 @@ void nsContainerFrame::SyncFrameViewAfterReflow(nsIPresContext* aPresContext, nsIFrame* aFrame, nsIView* aView, - nsRect* aCombinedArea, + const nsRect* aCombinedArea, PRUint32 aFlags) { if (aView) { diff --git a/mozilla/layout/generic/nsContainerFrame.h b/mozilla/layout/generic/nsContainerFrame.h index 6a7e08f4fe8..64b62dfe20b 100644 --- a/mozilla/layout/generic/nsContainerFrame.h +++ b/mozilla/layout/generic/nsContainerFrame.h @@ -91,12 +91,11 @@ public: // Flags: // NS_FRAME_NO_MOVE_VIEW - don't position the frame's view. Set this if you // don't want to automatically sync the frame and view - // NS_FRAME_NO_MOVE_VIEW - don't move the frame. aX and aY are ignored in this - // case. Also implies NS_FRAME_NO_MOVE_VIEW + // NS_FRAME_NO_SIZE_VIEW - don't size the view static void SyncFrameViewAfterReflow(nsIPresContext* aPresContext, nsIFrame* aFrame, nsIView* aView, - nsRect* aCombinedArea, + const nsRect* aCombinedArea, PRUint32 aFlags = 0); /** diff --git a/mozilla/layout/html/base/src/nsContainerFrame.cpp b/mozilla/layout/html/base/src/nsContainerFrame.cpp index 97fccbbae73..f4f22f65c80 100644 --- a/mozilla/layout/html/base/src/nsContainerFrame.cpp +++ b/mozilla/layout/html/base/src/nsContainerFrame.cpp @@ -432,7 +432,7 @@ void nsContainerFrame::SyncFrameViewAfterReflow(nsIPresContext* aPresContext, nsIFrame* aFrame, nsIView* aView, - nsRect* aCombinedArea, + const nsRect* aCombinedArea, PRUint32 aFlags) { if (aView) { diff --git a/mozilla/layout/html/base/src/nsContainerFrame.h b/mozilla/layout/html/base/src/nsContainerFrame.h index 6a7e08f4fe8..64b62dfe20b 100644 --- a/mozilla/layout/html/base/src/nsContainerFrame.h +++ b/mozilla/layout/html/base/src/nsContainerFrame.h @@ -91,12 +91,11 @@ public: // Flags: // NS_FRAME_NO_MOVE_VIEW - don't position the frame's view. Set this if you // don't want to automatically sync the frame and view - // NS_FRAME_NO_MOVE_VIEW - don't move the frame. aX and aY are ignored in this - // case. Also implies NS_FRAME_NO_MOVE_VIEW + // NS_FRAME_NO_SIZE_VIEW - don't size the view static void SyncFrameViewAfterReflow(nsIPresContext* aPresContext, nsIFrame* aFrame, nsIView* aView, - nsRect* aCombinedArea, + const nsRect* aCombinedArea, PRUint32 aFlags = 0); /**