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 5. Make InitAndRestoreFrame infallible. r=dholbert

Browse Source
This commit is contained in:
Boris Zbarsky 2013-03-19 21:47:50 -04:00
parent f75d10efbe
commit a71aa4e129
2 changed files with 16 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
layout/base/nsCSSFrameConstructor.cpp
View File

@ -3220,13 +3220,7 @@ nsCSSFrameConstructor::ConstructTextFrame(const FrameConstructionData* aData,
if (MOZ_UNLIKELY(!newFrame))
return NS_ERROR_OUT_OF_MEMORY;
nsresult rv = InitAndRestoreFrame(aState, aContent, aParentFrame,
nullptr, newFrame);
if (NS_FAILED(rv)) {
newFrame->Destroy();
return rv;
}
InitAndRestoreFrame(aState, aContent, aParentFrame, nullptr, newFrame);
// We never need to create a view for a text frame.
@ -3250,7 +3244,7 @@ nsCSSFrameConstructor::ConstructTextFrame(const FrameConstructionData* aData,
if (!aState.mCreatingExtraFrames)
aContent->SetPrimaryFrame(newFrame);
return rv;
return NS_OK;
}
/* static */
@ -3625,9 +3619,7 @@ nsCSSFrameConstructor::ConstructFrameFromItemInternal(FrameConstructionItem& aIt
BuildScrollFrame(aState, content, styleContext, newFrame,
geometricParent, frameToAddToList);
} else {
rv = InitAndRestoreFrame(aState, content, geometricParent, nullptr,
newFrame);
NS_ASSERTION(NS_SUCCEEDED(rv), "InitAndRestoreFrame failed");
InitAndRestoreFrame(aState, content, geometricParent, nullptr, newFrame);
// See whether we need to create a view
nsContainerFrame::CreateViewForFrame(newFrame, false);
frameToAddToList = newFrame;
@ -3656,12 +3648,7 @@ nsCSSFrameConstructor::ConstructFrameFromItemInternal(FrameConstructionItem& aIt
return NS_ERROR_OUT_OF_MEMORY;
}
rv = InitAndRestoreFrame(aState, content, newFrame, nullptr, blockFrame);
if (NS_FAILED(rv)) {
blockFrame->Destroy();
primaryFrame->Destroy();
return rv;
}
InitAndRestoreFrame(aState, content, newFrame, nullptr, blockFrame);
SetInitialSingleChild(newFrame, blockFrame);
@ -4500,7 +4487,7 @@ nsCSSFrameConstructor::ConstructNonScrollableBlock(nsFrameConstructorState& aSta
}
nsresult
void
nsCSSFrameConstructor::InitAndRestoreFrame(const nsFrameConstructorState& aState,
nsIContent* aContent,
nsIFrame* aParentFrame,
@ -4511,9 +4498,7 @@ nsCSSFrameConstructor::InitAndRestoreFrame(const nsFrameConstructorState& aState
NS_PRECONDITION(mUpdateCount != 0,
"Should be in an update while creating frames");
NS_ASSERTION(aNewFrame, "Null frame cannot be initialized");
if (!aNewFrame)
return NS_ERROR_NULL_POINTER;
MOZ_ASSERT(aNewFrame, "Null frame cannot be initialized");
// Initialize the frame
aNewFrame->Init(aContent, aParentFrame, aPrevInFlow);
@ -4528,8 +4513,6 @@ nsCSSFrameConstructor::InitAndRestoreFrame(const nsFrameConstructorState& aState
mCounterManager.AddCounterResetsAndIncrements(aNewFrame)) {
CountersDirty();
}
return NS_OK;
}
already_AddRefed<nsStyleContext>
@ -10183,8 +10166,8 @@ nsCSSFrameConstructor::WrapFramesInFirstLineFrame(
aLineFrame = NS_NewFirstLineFrame(mPresShell, firstLineStyle);
// Initialize the line frame
rv = InitAndRestoreFrame(aState, aBlockContent, aBlockFrame, nullptr,
aLineFrame);
InitAndRestoreFrame(aState, aBlockContent, aBlockFrame, nullptr,
aLineFrame);
// The lineFrame will be the block's first child; the rest of the
// frame list (after lastInlineFrame) will be the second and
@ -10307,8 +10290,8 @@ nsCSSFrameConstructor::InsertFirstLineFrames(
GetFirstLineStyle(aContent, parentStyle);
// Initialize the line frame
rv = InitAndRestoreFrame(aState, aContent, aBlockFrame,
nullptr, lineFrame);
InitAndRestoreFrame(aState, aContent, aBlockFrame,
nullptr, lineFrame);
// Make sure the caller inserts the lineFrame into the
// blocks list of children.

12
layout/base/nsCSSFrameConstructor.h
View File

@ -401,12 +401,12 @@ private:
RestyleTracker& aRestyleTracker,
bool aRestyleDescendants);
nsresult InitAndRestoreFrame (const nsFrameConstructorState& aState,
nsIContent* aContent,
nsIFrame* aParentFrame,
nsIFrame* aPrevInFlow,
nsIFrame* aNewFrame,
bool aAllowCounters = true);
void InitAndRestoreFrame (const nsFrameConstructorState& aState,
nsIContent* aContent,
nsIFrame* aParentFrame,
nsIFrame* aPrevInFlow,
nsIFrame* aNewFrame,
bool aAllowCounters = true);
// aState can be null if not available; it's used as an optimization.
// XXXbz IsValidSibling is the only caller that doesn't pass a state here!