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 1008917 - part 8, make nsLeafFrame::DoRewflow() return type 'void'. r=roc

Browse Source
This commit is contained in:
Mats Palmgren 2014-05-12 17:40:29 +00:00
parent afeea09f92
commit 372d6a6e99
3 changed files with 6 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
layout/generic/nsLeafFrame.cpp
View File

@ -60,7 +60,7 @@ nsLeafFrame::Reflow(nsPresContext* aPresContext,
FinishAndStoreOverflow(&aMetrics);
}
nsresult
void
nsLeafFrame::DoReflow(nsPresContext* aPresContext,
nsHTMLReflowMetrics& aMetrics,
const nsHTMLReflowState& aReflowState,
@ -85,8 +85,6 @@ nsLeafFrame::DoReflow(nsPresContext* aPresContext,
NS_FRAME_SET_TRUNCATION(aStatus, aReflowState, aMetrics);
aMetrics.SetOverflowAreasToDesiredBounds();
return NS_OK;
}
nscoord

8
layout/generic/nsLeafFrame.h
View File

@ -59,10 +59,10 @@ public:
/**
* This method does most of the work that Reflow() above need done.
*/
virtual nsresult DoReflow(nsPresContext* aPresContext,
nsHTMLReflowMetrics& aDesiredSize,
const nsHTMLReflowState& aReflowState,
nsReflowStatus& aStatus);
virtual void DoReflow(nsPresContext* aPresContext,
nsHTMLReflowMetrics& aDesiredSize,
const nsHTMLReflowState& aReflowState,
nsReflowStatus& aStatus);
virtual bool IsFrameOfType(uint32_t aFlags) const MOZ_OVERRIDE
{

6
layout/generic/nsSubDocumentFrame.cpp
View File

@ -707,11 +707,7 @@ nsSubDocumentFrame::Reflow(nsPresContext* aPresContext,
"Shouldn't happen");
// XUL <iframe> or <browser>, or HTML <iframe>, <object> or <embed>
nsresult rv = nsLeafFrame::DoReflow(aPresContext, aDesiredSize, aReflowState,
aStatus);
if (NS_FAILED(rv)) {
return;
}
nsLeafFrame::DoReflow(aPresContext, aDesiredSize, aReflowState, aStatus);
// "offset" is the offset of our content area from our frame's
// top-left corner.