зеркало из 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);
|
kNameSpaceID_None, nullptr, pseudoStyle.forget(), true);
|
||||||
}
|
}
|
||||||
|
|
||||||
nsresult
|
void
|
||||||
nsCSSFrameConstructor::ConstructFrame(nsFrameConstructorState& aState,
|
nsCSSFrameConstructor::ConstructFrame(nsFrameConstructorState& aState,
|
||||||
nsIContent* aContent,
|
nsIContent* aContent,
|
||||||
nsIFrame* aParentFrame,
|
nsIFrame* aParentFrame,
|
||||||
|
@ -4993,8 +4993,6 @@ nsCSSFrameConstructor::ConstructFrame(nsFrameConstructorState& aState,
|
||||||
"This is not going to work");
|
"This is not going to work");
|
||||||
ConstructFramesFromItem(aState, iter, aParentFrame, aFrameItems);
|
ConstructFramesFromItem(aState, iter, aParentFrame, aFrameItems);
|
||||||
}
|
}
|
||||||
|
|
||||||
return NS_OK;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
void
|
void
|
||||||
|
|
|
@ -422,10 +422,10 @@ private:
|
||||||
// Construct a frame for aContent and put it in aFrameItems. This should
|
// 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
|
// only be used in cases when it's known that the frame won't need table
|
||||||
// pseudo-frame construction and the like.
|
// pseudo-frame construction and the like.
|
||||||
nsresult ConstructFrame(nsFrameConstructorState& aState,
|
void ConstructFrame(nsFrameConstructorState& aState,
|
||||||
nsIContent* aContent,
|
nsIContent* aContent,
|
||||||
nsIFrame* aParentFrame,
|
nsIFrame* aParentFrame,
|
||||||
nsFrameItems& aFrameItems);
|
nsFrameItems& aFrameItems);
|
||||||
|
|
||||||
// Add the frame construction items for the given aContent and aParentFrame
|
// 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.
|
// to the list. This might add more than one item in some rare cases.
|
||||||
|
|
Загрузка…
Ссылка в новой задаче