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 852501 part 16. Make ConstructFrame infallible. r=dholbert

Browse Source
This commit is contained in:
Boris Zbarsky 2013-03-19 21:47:53 -04:00
parent e449bf4fb7
commit f4a1faf65e
2 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
layout/base/nsCSSFrameConstructor.cpp
View File

@ -4964,7 +4964,7 @@ nsCSSFrameConstructor::AddPageBreakItem(nsIContent* aContent,
kNameSpaceID_None, nullptr, pseudoStyle.forget(), true);
}
nsresult
void
nsCSSFrameConstructor::ConstructFrame(nsFrameConstructorState& aState,
nsIContent* aContent,
nsIFrame* aParentFrame,
@ -4993,8 +4993,6 @@ nsCSSFrameConstructor::ConstructFrame(nsFrameConstructorState& aState,
"This is not going to work");
ConstructFramesFromItem(aState, iter, aParentFrame, aFrameItems);
}
return NS_OK;
}
void

8
layout/base/nsCSSFrameConstructor.h
View File

@ -422,10 +422,10 @@ private:
// Construct a frame for aContent and put it in aFrameItems. This should
// only be used in cases when it's known that the frame won't need table
// pseudo-frame construction and the like.
nsresult ConstructFrame(nsFrameConstructorState& aState,
nsIContent* aContent,
nsIFrame* aParentFrame,
nsFrameItems& aFrameItems);
void ConstructFrame(nsFrameConstructorState& aState,
nsIContent* aContent,
nsIFrame* aParentFrame,
nsFrameItems& aFrameItems);
// Add the frame construction items for the given aContent and aParentFrame
// to the list. This might add more than one item in some rare cases.