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 740067: Make nsCSSFrameConstructor::CreateNeededTablePseudos return void. r=bz

Browse Source
This commit is contained in:
Daniel Holbert 2012-03-28 12:43:15 -07:00
parent 8dd521e600
commit 032e66c4c1
2 changed files with 8 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
layout/base/nsCSSFrameConstructor.cpp
View File

@ -9237,7 +9237,7 @@ nsCSSFrameConstructor::sPseudoParentData[eParentTypeCount] = {
* around everything else. At the end of this method, aItems is guaranteed to
* contain only items for frames that can be direct kids of aParentFrame.
*/
nsresult
void
nsCSSFrameConstructor::CreateNeededTablePseudos(nsFrameConstructorState& aState,
FrameConstructionItemList& aItems,
nsIFrame* aParentFrame)
@ -9245,14 +9245,14 @@ nsCSSFrameConstructor::CreateNeededTablePseudos(nsFrameConstructorState& aState,
ParentType ourParentType = GetParentType(aParentFrame);
if (aItems.AllWantParentType(ourParentType)) {
// Nothing to do here
return NS_OK;
return;
}
FCItemIterator iter(aItems);
do {
if (iter.SkipItemsWantingParentType(ourParentType)) {
// Nothing else to do here; we're finished
return NS_OK;
return;
}
// Now we're pointing to the first child that wants a different parent
@ -9434,8 +9434,6 @@ nsCSSFrameConstructor::CreateNeededTablePseudos(nsFrameConstructorState& aState,
// loop and see whether we need to skip it or wrap it in something
// different.
} while (!iter.IsDone());
return NS_OK;
}
inline nsresult
@ -9446,8 +9444,7 @@ nsCSSFrameConstructor::ConstructFramesFromItemList(nsFrameConstructorState& aSta
{
aItems.SetTriedConstructingFrames();
nsresult rv = CreateNeededTablePseudos(aState, aItems, aParentFrame);
NS_ENSURE_SUCCESS(rv, rv);
CreateNeededTablePseudos(aState, aItems, aParentFrame);
#ifdef DEBUG
for (FCItemIterator iter(aItems); !iter.IsDone(); iter.Next()) {
@ -9457,7 +9454,7 @@ nsCSSFrameConstructor::ConstructFramesFromItemList(nsFrameConstructorState& aSta
#endif
for (FCItemIterator iter(aItems); !iter.IsDone(); iter.Next()) {
rv = ConstructFramesFromItem(aState, iter, aParentFrame, aFrameItems);
nsresult rv = ConstructFramesFromItem(aState, iter, aParentFrame, aFrameItems);
NS_ENSURE_SUCCESS(rv, rv);
}

6
layout/base/nsCSSFrameConstructor.h
View File

@ -1139,9 +1139,9 @@ private:
* @param aItems the child frame construction items before pseudo creation
* @param aParentFrame the parent frame we're creating pseudos for
*/
inline nsresult CreateNeededTablePseudos(nsFrameConstructorState& aState,
FrameConstructionItemList& aItems,
nsIFrame* aParentFrame);
inline void CreateNeededTablePseudos(nsFrameConstructorState& aState,
FrameConstructionItemList& aItems,
nsIFrame* aParentFrame);
/**
* Function to adjust aParentFrame to deal with captions.