From f599ff75ef2687787eeff25f2ee78e815338c0f9 Mon Sep 17 00:00:00 2001 From: "nisheeth%netscape.com" Date: Mon, 6 Dec 1999 09:03:16 +0000 Subject: [PATCH] Enable save/restore for frame state. git-svn-id: svn://10.0.0.236/trunk@55414 18797224-902f-48f8-a5cc-f745e15eee43 --- mozilla/layout/base/nsCSSFrameConstructor.cpp | 5 ++--- mozilla/layout/html/style/src/nsCSSFrameConstructor.cpp | 5 ++--- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/mozilla/layout/base/nsCSSFrameConstructor.cpp b/mozilla/layout/base/nsCSSFrameConstructor.cpp index c2162e30d32..f3bb3a3c0a8 100644 --- a/mozilla/layout/base/nsCSSFrameConstructor.cpp +++ b/mozilla/layout/base/nsCSSFrameConstructor.cpp @@ -4858,7 +4858,7 @@ nsCSSFrameConstructor::InitAndRestoreFrame(nsIPresContext* aPresContext aStyleContext, aPrevInFlow); if (aState.mFrameState && aState.mFrameManager) { - // aState.mFrameManager->RestoreFrameState(aPresContext, aNewFrame, aState.mFrameState); + aState.mFrameManager->RestoreFrameState(aPresContext, aNewFrame, aState.mFrameState); } return rv; @@ -8120,7 +8120,7 @@ nsCSSFrameConstructor::CaptureStateFor(nsIPresContext* aPresContext, nsCOMPtr frameManager; rv = presShell->GetFrameManager(getter_AddRefs(frameManager)); if (NS_SUCCEEDED(rv) && frameManager) { - // rv = frameManager->CaptureFrameState(aPresContext, aFrame, aHistoryState); + rv = frameManager->CaptureFrameState(aPresContext, aFrame, aHistoryState); } } } @@ -9281,7 +9281,6 @@ nsCSSFrameConstructor::CreateTreeWidgetContent(nsIPresContext* aPresContext, nsFrameItems frameItems; nsFrameConstructorState state(aPresContext, mFixedContainingBlock, GetAbsoluteContainingBlock(aPresContext, aParentFrame), - GetFloaterContainingBlock(aPresContext, aParentFrame), aFrameState); diff --git a/mozilla/layout/html/style/src/nsCSSFrameConstructor.cpp b/mozilla/layout/html/style/src/nsCSSFrameConstructor.cpp index c2162e30d32..f3bb3a3c0a8 100644 --- a/mozilla/layout/html/style/src/nsCSSFrameConstructor.cpp +++ b/mozilla/layout/html/style/src/nsCSSFrameConstructor.cpp @@ -4858,7 +4858,7 @@ nsCSSFrameConstructor::InitAndRestoreFrame(nsIPresContext* aPresContext aStyleContext, aPrevInFlow); if (aState.mFrameState && aState.mFrameManager) { - // aState.mFrameManager->RestoreFrameState(aPresContext, aNewFrame, aState.mFrameState); + aState.mFrameManager->RestoreFrameState(aPresContext, aNewFrame, aState.mFrameState); } return rv; @@ -8120,7 +8120,7 @@ nsCSSFrameConstructor::CaptureStateFor(nsIPresContext* aPresContext, nsCOMPtr frameManager; rv = presShell->GetFrameManager(getter_AddRefs(frameManager)); if (NS_SUCCEEDED(rv) && frameManager) { - // rv = frameManager->CaptureFrameState(aPresContext, aFrame, aHistoryState); + rv = frameManager->CaptureFrameState(aPresContext, aFrame, aHistoryState); } } } @@ -9281,7 +9281,6 @@ nsCSSFrameConstructor::CreateTreeWidgetContent(nsIPresContext* aPresContext, nsFrameItems frameItems; nsFrameConstructorState state(aPresContext, mFixedContainingBlock, GetAbsoluteContainingBlock(aPresContext, aParentFrame), - GetFloaterContainingBlock(aPresContext, aParentFrame), aFrameState);