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

Bug 508665 - part 7, Require a nsContainerFrame* for aParent in nsFrameManager methods. r=roc

Browse Source
This commit is contained in:
Mats Palmgren 2014-05-24 22:20:40 +00:00
parent 24bc461da1
commit 3de0e9001d
3 changed files with 18 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
layout/base/nsCSSFrameConstructor.cpp
View File

@ -1254,7 +1254,7 @@ nsFrameConstructorState::ProcessFrameInsertions(nsAbsoluteItems& aFrameItems,
return;
}
nsIFrame* containingBlock = aFrameItems.containingBlock;
nsContainerFrame* containingBlock = aFrameItems.containingBlock;
NS_ASSERTION(containingBlock,
"Child list without containing block?");

16
layout/base/nsFrameManager.cpp
View File

@ -349,9 +349,9 @@ nsFrameManager::ClearAllUndisplayedContentIn(nsIContent* aParentContent)
//----------------------------------------------------------------------
nsresult
nsFrameManager::AppendFrames(nsIFrame* aParentFrame,
ChildListID aListID,
nsFrameList& aFrameList)
nsFrameManager::AppendFrames(nsContainerFrame* aParentFrame,
ChildListID aListID,
nsFrameList& aFrameList)
{
if (aParentFrame->IsAbsoluteContainer() &&
aListID == aParentFrame->GetAbsoluteListID()) {
@ -363,10 +363,10 @@ nsFrameManager::AppendFrames(nsIFrame* aParentFrame,
}
nsresult
nsFrameManager::InsertFrames(nsIFrame* aParentFrame,
ChildListID aListID,
nsIFrame* aPrevFrame,
nsFrameList& aFrameList)
nsFrameManager::InsertFrames(nsContainerFrame* aParentFrame,
ChildListID aListID,
nsIFrame* aPrevFrame,
nsFrameList& aFrameList)
{
NS_PRECONDITION(!aPrevFrame || (!aPrevFrame->GetNextContinuation()
|| (((aPrevFrame->GetNextContinuation()->GetStateBits() & NS_FRAME_IS_OVERFLOW_CONTAINER))
@ -405,7 +405,7 @@ nsFrameManager::RemoveFrame(ChildListID aListID,
GetPlaceholderFrameFor(aOldFrame)),
"Must call RemoveFrame on placeholder for out-of-flows.");
nsresult rv = NS_OK;
nsIFrame* parentFrame = aOldFrame->GetParent();
nsContainerFrame* parentFrame = aOldFrame->GetParent();
if (parentFrame->IsAbsoluteContainer() &&
aListID == parentFrame->GetAbsoluteListID()) {
parentFrame->GetAbsoluteContainingBlock()->

16
layout/base/nsFrameManager.h
View File

@ -23,6 +23,8 @@
#include "nsFrameManagerBase.h"
#include "nsIContent.h"
class nsContainerFrame;
namespace mozilla {
/**
* Node in a linked list, containing the style for an element that
@ -112,14 +114,14 @@ public:
NS_HIDDEN_(void) ClearAllUndisplayedContentIn(nsIContent* aParentContent);
// Functions for manipulating the frame model
NS_HIDDEN_(nsresult) AppendFrames(nsIFrame* aParentFrame,
ChildListID aListID,
nsFrameList& aFrameList);
NS_HIDDEN_(nsresult) AppendFrames(nsContainerFrame* aParentFrame,
ChildListID aListID,
nsFrameList& aFrameList);
NS_HIDDEN_(nsresult) InsertFrames(nsIFrame* aParentFrame,
ChildListID aListID,
nsIFrame* aPrevFrame,
nsFrameList& aFrameList);
NS_HIDDEN_(nsresult) InsertFrames(nsContainerFrame* aParentFrame,
ChildListID aListID,
nsIFrame* aPrevFrame,
nsFrameList& aFrameList);
NS_HIDDEN_(nsresult) RemoveFrame(ChildListID aListID,
nsIFrame* aOldFrame);