Get rid of nsIFrameManager abstract interface to the frame manager. Bug 233972, r+sr=roc.
git-svn-id: svn://10.0.0.236/trunk@153111 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
@@ -49,7 +49,7 @@
|
||||
#include "nsLineLayout.h"
|
||||
#include "nsPlaceholderFrame.h"
|
||||
#include "nsStyleConsts.h"
|
||||
#include "nsIFrameManager.h"
|
||||
#include "nsFrameManager.h"
|
||||
#include "nsIPresContext.h"
|
||||
#include "nsIPresShell.h"
|
||||
#include "nsReflowPath.h"
|
||||
@@ -897,17 +897,13 @@ nsBlockFrame::Reflow(nsIPresContext* aPresContext,
|
||||
// this is a leak of the space manager, but it's only in debug if verify reflow is enabled, so not a big deal
|
||||
nsIPresShell *shell = aPresContext->GetPresShell();
|
||||
if (shell) {
|
||||
nsCOMPtr<nsIFrameManager> frameManager;
|
||||
shell->GetFrameManager(getter_AddRefs(frameManager));
|
||||
if (frameManager) {
|
||||
nsHTMLReflowState& reflowState = (nsHTMLReflowState&)aReflowState;
|
||||
rv = frameManager->SetFrameProperty(
|
||||
nsHTMLReflowState& reflowState = (nsHTMLReflowState&)aReflowState;
|
||||
rv = shell->FrameManager()->SetFrameProperty(
|
||||
this, nsLayoutAtoms::spaceManagerProperty,
|
||||
reflowState.mSpaceManager,
|
||||
nsnull /* should be nsSpaceManagerDestroyer*/);
|
||||
|
||||
autoSpaceManager.DebugOrphanSpaceManager();
|
||||
}
|
||||
autoSpaceManager.DebugOrphanSpaceManager();
|
||||
}
|
||||
}
|
||||
#endif
|
||||
|
||||
Reference in New Issue
Block a user