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 6, Require a nsContainerFrame* for aParent in nsFrameList methods. r=roc

Browse Source
This commit is contained in:
Mats Palmgren 2014-05-24 22:20:40 +00:00
parent 80071d48fe
commit 9b83734b6f
2 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
layout/generic/nsFrameList.cpp
View File

@ -136,7 +136,7 @@ nsFrameList::DestroyFrame(nsIFrame* aFrame)
}
nsFrameList::Slice
nsFrameList::InsertFrames(nsIFrame* aParent, nsIFrame* aPrevSibling,
nsFrameList::InsertFrames(nsContainerFrame* aParent, nsIFrame* aPrevSibling,
nsFrameList& aFrameList)
{
NS_PRECONDITION(aFrameList.NotEmpty(), "Unexpected empty list");
@ -309,12 +309,12 @@ nsFrameList::GetLength() const
}
void
nsFrameList::ApplySetParent(nsIFrame* aParent) const
nsFrameList::ApplySetParent(nsContainerFrame* aParent) const
{
NS_ASSERTION(aParent, "null ptr");
for (nsIFrame* f = FirstChild(); f; f = f->GetNextSibling()) {
f->SetParent(static_cast<nsContainerFrame*>(aParent)); // XXX static_cast will be removed in a later patch
f->SetParent(aParent);
}
}

11
layout/generic/nsFrameList.h
View File

@ -16,6 +16,7 @@
#define DEBUG_FRAME_DUMP 1
#endif
class nsContainerFrame;
class nsIFrame;
class nsIPresShell;
class nsPresContext;
@ -112,7 +113,7 @@ public:
* reparents the newly added frames. Clears out aFrameList and
* returns a list slice represening the newly-appended frames.
*/
Slice AppendFrames(nsIFrame* aParent, nsFrameList& aFrameList) {
Slice AppendFrames(nsContainerFrame* aParent, nsFrameList& aFrameList) {
return InsertFrames(aParent, LastChild(), aFrameList);
}
@ -121,7 +122,7 @@ public:
* Append aFrame to this list. If aParent is not null,
* reparents the newly added frame.
*/
void AppendFrame(nsIFrame* aParent, nsIFrame* aFrame) {
void AppendFrame(nsContainerFrame* aParent, nsIFrame* aFrame) {
nsFrameList temp(aFrame, aFrame);
AppendFrames(aParent, temp);
}
@ -189,7 +190,7 @@ public:
* reparents newly-added frame. Note that this method always
* sets the frame's nextSibling pointer.
*/
void InsertFrame(nsIFrame* aParent, nsIFrame* aPrevSibling,
void InsertFrame(nsContainerFrame* aParent, nsIFrame* aPrevSibling,
nsIFrame* aFrame) {
nsFrameList temp(aFrame, aFrame);
InsertFrames(aParent, aPrevSibling, temp);
@ -202,7 +203,7 @@ public:
* frames. Clears out aFrameList and returns a list slice representing the
* newly-inserted frames.
*/
Slice InsertFrames(nsIFrame* aParent, nsIFrame* aPrevSibling,
Slice InsertFrames(nsContainerFrame* aParent, nsIFrame* aPrevSibling,
nsFrameList& aFrameList);
class FrameLinkEnumerator;
@ -259,7 +260,7 @@ public:
* Call SetParent(aParent) for each frame in this list.
* @param aParent the new parent frame, must be non-null
*/
void ApplySetParent(nsIFrame* aParent) const;
void ApplySetParent(nsContainerFrame* aParent) const;
/**
* If this frame list is non-empty then append it to aLists as the