Bommels05/Mozilla
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Bug 13058: Tweaks to StatefulFrame interface - and not keeping state for anonymous content

Browse Source 
git-svn-id: svn://10.0.0.236/trunk@47256 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
pollmann%netscape.com
1999-09-14 02:00:20 +00:00
parent 3c53e20a88
commit aa2dc19418
2 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
mozilla/layout/base/nsFrameManager.cpp
View File

@@ -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;

8
mozilla/layout/html/base/src/nsFrameManager.cpp
View File

@@ -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;