Bug 1008917 - part 15, make RestyleManager::StyleChangeReflow() return type 'void'. r=roc

This commit is contained in:
Mats Palmgren 2014-05-13 00:47:53 +00:00
Родитель ddda9d285c
Коммит 80e4743862
2 изменённых файлов: 4 добавлений и 4 удалений

Просмотреть файл

@ -479,13 +479,13 @@ RestyleManager::RecomputePosition(nsIFrame* aFrame)
return false;
}
nsresult
void
RestyleManager::StyleChangeReflow(nsIFrame* aFrame, nsChangeHint aHint)
{
// If the frame hasn't even received an initial reflow, then don't
// send it a style-change reflow!
if (aFrame->GetStateBits() & NS_FRAME_FIRST_REFLOW)
return NS_OK;
return;
nsIPresShell::IntrinsicDirty dirtyType;
if (aHint & nsChangeHint_ClearDescendantIntrinsics) {
@ -510,7 +510,7 @@ RestyleManager::StyleChangeReflow(nsIFrame* aFrame, nsChangeHint aHint)
aFrame = nsLayoutUtils::GetNextContinuationOrIBSplitSibling(aFrame);
} while (aFrame);
return NS_OK;
return;
}
NS_DECLARE_FRAME_PROPERTY(ChangeListProperty, nullptr)

Просмотреть файл

@ -242,7 +242,7 @@ private:
RestyleTracker& aRestyleTracker,
bool aRestyleDescendants);
nsresult StyleChangeReflow(nsIFrame* aFrame, nsChangeHint aHint);
void StyleChangeReflow(nsIFrame* aFrame, nsChangeHint aHint);
// Returns true if this function managed to successfully move a frame, and
// false if it could not process the position change, and a reflow should