Bommels05/Mozilla
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Added unconstrainted reflow optimization methods

Browse Source 
r=kmcclusk bug=12653


git-svn-id: svn://10.0.0.236/trunk@56842 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
rods%netscape.com
2000-01-05 15:15:22 +00:00
parent dba8e9a1b8
commit 18cc797646
4 changed files with 172 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

70
mozilla/layout/forms/nsFormControlFrame.cpp
View File

@@ -71,6 +71,12 @@ nsFormControlFrame::nsFormControlFrame()
mFormFrame = nsnull;
mSuggestedWidth = NS_FORMSIZE_NOTSET;
mSuggestedHeight = NS_FORMSIZE_NOTSET;
// Reflow Optimization
mCacheSize.width = -1;
mCacheSize.height = -1;
mCachedMaxElementSize.width = -1;
mCachedMaxElementSize.height = -1;
}
nsFormControlFrame::~nsFormControlFrame()
@@ -98,6 +104,63 @@ nsFormControlFrame::QueryInterface(const nsIID& aIID, void** aInstancePtr)
return nsLeafFrame::QueryInterface(aIID, aInstancePtr);
}
void nsFormControlFrame::SetupCachedSizes(nsSize& aCacheSize,
nsSize& aCachedMaxElementSize,
nsHTMLReflowMetrics& aDesiredSize)
{
aCacheSize.width = aDesiredSize.width;
aCacheSize.height = aDesiredSize.height;
if (aDesiredSize.maxElementSize != nsnull) {
aCachedMaxElementSize.width = aDesiredSize.maxElementSize->width;
aCachedMaxElementSize.height = aDesiredSize.maxElementSize->height;
}
}
nsresult nsFormControlFrame::SkipResizeReflow(nsSize& aCacheSize,
nsSize& aCachedMaxElementSize,
nsIPresContext* aPresContext,
nsHTMLReflowMetrics& aDesiredSize,
const nsHTMLReflowState& aReflowState,
nsReflowStatus& aStatus)
{
if (aReflowState.reason == eReflowReason_Resize) {
if (NS_UNCONSTRAINEDSIZE == aReflowState.mComputedWidth &&
NS_UNCONSTRAINEDSIZE == aReflowState.mComputedHeight) {
if (aCacheSize.width > -1 && aCacheSize.height > -1) {
aDesiredSize.width = aCacheSize.width;
aDesiredSize.height = aCacheSize.height;
if (aDesiredSize.maxElementSize != nsnull) {
aDesiredSize.maxElementSize->width = aCachedMaxElementSize.width;
aDesiredSize.maxElementSize->height = aCachedMaxElementSize.height;
}
aDesiredSize.ascent = aDesiredSize.height;
aDesiredSize.descent = 0;
aStatus = NS_FRAME_COMPLETE;
return NS_OK;
}
} else {
if (aCacheSize.width == aReflowState.mComputedWidth &&
aCacheSize.height == aReflowState.mComputedHeight) {
aDesiredSize.width = aCacheSize.width;
aDesiredSize.height = aCacheSize.height;
if (aDesiredSize.maxElementSize != nsnull) {
aDesiredSize.maxElementSize->width = aCachedMaxElementSize.width;
aDesiredSize.maxElementSize->height = aCachedMaxElementSize.height;
}
aDesiredSize.ascent = aDesiredSize.height;
aDesiredSize.descent = 0;
aStatus = NS_FRAME_COMPLETE;
return NS_OK;
}
}
}
return NS_ERROR_FAILURE;
}
nscoord
nsFormControlFrame::GetScrollbarWidth(float aPixToTwip)
{
@@ -244,6 +307,12 @@ nsFormControlFrame::Reflow(nsIPresContext* aPresContext,
nsFormFrame::AddFormControlFrame(aPresContext, *NS_STATIC_CAST(nsIFrame*, this));
}
nsresult skiprv = SkipResizeReflow(mCacheSize, mCachedMaxElementSize, aPresContext,
aDesiredSize, aReflowState, aStatus);
if (NS_SUCCEEDED(skiprv)) {
return skiprv;
}
nsWidgetRendering mode;
aPresContext->GetWidgetRenderingMode(&mode);
if (eWidgetRendering_Native == mode) {
@@ -267,6 +336,7 @@ nsFormControlFrame::Reflow(nsIPresContext* aPresContext,
}
aStatus = NS_FRAME_COMPLETE;
SetupCachedSizes(mCacheSize, mCachedMaxElementSize, aDesiredSize);
return NS_OK;
}