зеркало из https://github.com/mozilla/gecko-dev.git
Bug 852501 part 16. Make ConstructFrame infallible. r=dholbert
This commit is contained in:
Родитель
ba77815408
Коммит
4b08d55e3f
|
@ -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
|
||||
|
|
|
@ -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.
|
||||
|
|
Загрузка…
Ссылка в новой задаче