wine/gecko
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-gecko.git synced 2024-09-13 09:24:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

Back out 65ffdabf1b6b (bug 698656) for orange, and lots of it

Browse Source
This commit is contained in:
Phil Ringnalda 2011-10-31 20:03:26 -07:00
parent 3f1407e7b3
commit 35d743e12f
4 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
docshell/shistory/src/nsSHEntry.cpp
View File

@ -81,7 +81,6 @@ nsSHEntry::nsSHEntry(const nsSHEntry &other)
, mID(other.mID)
, mScrollPositionX(0) // XXX why not copy?
, mScrollPositionY(0) // XXX why not copy?
, mParent(nsnull)
, mURIWasModified(other.mURIWasModified)
, mStateData(other.mStateData)
{
@ -418,7 +417,7 @@ NS_IMETHODIMP
nsSHEntry::GetParent(nsISHEntry ** aResult)
{
NS_ENSURE_ARG_POINTER(aResult);
*aResult = mParent;
*aResult = mShared->mParent;
NS_IF_ADDREF(*aResult);
return NS_OK;
}
@ -431,7 +430,7 @@ nsSHEntry::SetParent(nsISHEntry * aParent)
*
* XXX this method should not be scriptable if this is the case!!
*/
mParent = aParent;
mShared->mParent = aParent;
return NS_OK;
}

1
docshell/shistory/src/nsSHEntry.h
View File

@ -90,7 +90,6 @@ private:
PRUint32 mID;
PRInt32 mScrollPositionX;
PRInt32 mScrollPositionY;
nsISHEntry* mParent;
nsCOMArray<nsISHEntry> mChildren;
bool mURIWasModified;
nsCOMPtr<nsIStructuredCloneContainer> mStateData;

2
docshell/shistory/src/nsSHEntryShared.cpp
View File

@ -93,6 +93,7 @@ nsSHEntryShared::Shutdown()
nsSHEntryShared::nsSHEntryShared()
: mDocShellID(0)
, mParent(nsnull)
, mIsFrameNavigation(false)
, mSaveLayoutState(true)
, mSticky(true)
@ -135,6 +136,7 @@ nsSHEntryShared::Duplicate(nsSHEntryShared *aEntry)
newEntry->mDocShellID = aEntry->mDocShellID;
newEntry->mChildShells.AppendObjects(aEntry->mChildShells);
newEntry->mOwner = aEntry->mOwner;
newEntry->mParent = aEntry->mParent;
newEntry->mContentType.Assign(aEntry->mContentType);
newEntry->mIsFrameNavigation = aEntry->mIsFrameNavigation;
newEntry->mSaveLayoutState = aEntry->mSaveLayoutState;

1
docshell/shistory/src/nsSHEntryShared.h
View File

@ -99,6 +99,7 @@ class nsSHEntryShared : public nsIBFCacheEntry,
PRUint64 mDocShellID;
nsCOMArray<nsIDocShellTreeItem> mChildShells;
nsCOMPtr<nsISupports> mOwner;
nsISHEntry* mParent;
nsCString mContentType;
bool mIsFrameNavigation;
bool mSaveLayoutState;