From aa2dc194185e9e9483dd01d43697b6da696d889c Mon Sep 17 00:00:00 2001 From: "pollmann%netscape.com" Date: Tue, 14 Sep 1999 02:00:20 +0000 Subject: [PATCH] Bug 13058: Tweaks to StatefulFrame interface - and not keeping state for anonymous content git-svn-id: svn://10.0.0.236/trunk@47256 18797224-902f-48f8-a5cc-f745e15eee43 --- mozilla/layout/base/nsFrameManager.cpp | 8 ++++---- mozilla/layout/html/base/src/nsFrameManager.cpp | 8 ++++---- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/mozilla/layout/base/nsFrameManager.cpp b/mozilla/layout/base/nsFrameManager.cpp index 8cb5f466ff7..479120f5bd2 100644 --- a/mozilla/layout/base/nsFrameManager.cpp +++ b/mozilla/layout/base/nsFrameManager.cpp @@ -650,8 +650,8 @@ FrameManager::CaptureFrameState(nsIFrame* aFrame, nsILayoutHistoryState* aState) if (NS_SUCCEEDED(rv)) { PRUint32 ID; rv = content->GetContentID(&ID); - if (NS_SUCCEEDED(rv)) { - PRInt32 type = NS_HISTORY_STATE_TYPE_NONE; + if (NS_SUCCEEDED(rv) && ID) { // Must have ID (don't do anonymous content) + StateType type = eNoType; rv = statefulFrame->GetStateType(&type); if (NS_SUCCEEDED(rv)) { nsISupports* frameState; @@ -702,8 +702,8 @@ FrameManager::RestoreFrameState(nsIFrame* aFrame, nsILayoutHistoryState* aState) if (NS_SUCCEEDED(rv)) { PRUint32 ID; rv = content->GetContentID(&ID); - if (NS_SUCCEEDED(rv)) { - PRInt32 type = NS_HISTORY_STATE_TYPE_NONE; + if (NS_SUCCEEDED(rv) && ID) { // Must have ID (don't do anonymous content) + StateType type = eNoType; rv = statefulFrame->GetStateType(&type); if (NS_SUCCEEDED(rv)) { nsISupports* frameState = nsnull; diff --git a/mozilla/layout/html/base/src/nsFrameManager.cpp b/mozilla/layout/html/base/src/nsFrameManager.cpp index 8cb5f466ff7..479120f5bd2 100644 --- a/mozilla/layout/html/base/src/nsFrameManager.cpp +++ b/mozilla/layout/html/base/src/nsFrameManager.cpp @@ -650,8 +650,8 @@ FrameManager::CaptureFrameState(nsIFrame* aFrame, nsILayoutHistoryState* aState) if (NS_SUCCEEDED(rv)) { PRUint32 ID; rv = content->GetContentID(&ID); - if (NS_SUCCEEDED(rv)) { - PRInt32 type = NS_HISTORY_STATE_TYPE_NONE; + if (NS_SUCCEEDED(rv) && ID) { // Must have ID (don't do anonymous content) + StateType type = eNoType; rv = statefulFrame->GetStateType(&type); if (NS_SUCCEEDED(rv)) { nsISupports* frameState; @@ -702,8 +702,8 @@ FrameManager::RestoreFrameState(nsIFrame* aFrame, nsILayoutHistoryState* aState) if (NS_SUCCEEDED(rv)) { PRUint32 ID; rv = content->GetContentID(&ID); - if (NS_SUCCEEDED(rv)) { - PRInt32 type = NS_HISTORY_STATE_TYPE_NONE; + if (NS_SUCCEEDED(rv) && ID) { // Must have ID (don't do anonymous content) + StateType type = eNoType; rv = statefulFrame->GetStateType(&type); if (NS_SUCCEEDED(rv)) { nsISupports* frameState = nsnull;