diff --git a/layout/base/nsIPresShell.h b/layout/base/nsIPresShell.h index 33354bd14482..7dfe22905bcd 100644 --- a/layout/base/nsIPresShell.h +++ b/layout/base/nsIPresShell.h @@ -121,10 +121,10 @@ typedef struct CapturingContentInfo { nsIContent* mContent; } CapturingContentInfo; -// bf539e0a-c314-4ea7-ba7c-ebd34e8a4065 +// fac033dd-938d-45bc-aaa5-dc2fa7ef5a40 #define NS_IPRESSHELL_IID \ -{ 0xbf539e0a, 0xc314, 0x4ea7, \ - { 0xba, 0x7c, 0xeb, 0xd3, 0x4e, 0x8a, 0x40, 0x65 } } +{ 0xfac033dd, 0x938d, 0x45bc, \ + { 0xaa, 0xa5, 0xdc, 0x2f, 0xa7, 0xef, 0x5a, 0x40 } } // debug VerifyReflow flags #define VERIFY_REFLOW_ON 0x01 @@ -411,11 +411,6 @@ public: */ virtual bool IsLayoutFlushObserver() = 0; - /** - * Reflow the frame model with a reflow reason of eReflowReason_StyleChange - */ - virtual NS_HIDDEN_(void) StyleChangeReflow() = 0; - /** * This calls through to the frame manager to get the root frame. */ diff --git a/layout/base/nsPresShell.cpp b/layout/base/nsPresShell.cpp index 0e25882a2549..20609b6126f2 100644 --- a/layout/base/nsPresShell.cpp +++ b/layout/base/nsPresShell.cpp @@ -2314,19 +2314,6 @@ PresShell::CheckVisibilityContent(nsIContent* aNode, int16_t aStartOffset, //end implementations nsISelectionController - -void -PresShell::StyleChangeReflow() -{ - nsIFrame* rootFrame = mFrameConstructor->GetRootFrame(); - // At the moment at least, we don't have a root frame before the initial - // reflow; it's safe to just ignore the request in that case - if (!rootFrame) - return; - - FrameNeedsReflow(rootFrame, eStyleChange, NS_FRAME_IS_DIRTY); -} - nsIFrame* nsIPresShell::GetRootFrameExternal() const { diff --git a/layout/base/nsPresShell.h b/layout/base/nsPresShell.h index 7af438bf5a43..2ab9a369d42d 100644 --- a/layout/base/nsPresShell.h +++ b/layout/base/nsPresShell.h @@ -89,7 +89,6 @@ public: virtual NS_HIDDEN_(nsresult) Initialize(nscoord aWidth, nscoord aHeight); virtual NS_HIDDEN_(nsresult) ResizeReflow(nscoord aWidth, nscoord aHeight); virtual NS_HIDDEN_(nsresult) ResizeReflowOverride(nscoord aWidth, nscoord aHeight); - virtual NS_HIDDEN_(void) StyleChangeReflow(); virtual NS_HIDDEN_(nsIPageSequenceFrame*) GetPageSequenceFrame() const; virtual NS_HIDDEN_(nsIFrame*) GetRealPrimaryFrameFor(nsIContent* aContent) const;