зеркало из https://github.com/mozilla/gecko-dev.git
compile sunder windows and not Linux, wierd
This commit is contained in:
Родитель
93d013bd9a
Коммит
92e5a18aad
|
@ -326,11 +326,14 @@ nsGfxButtonControlFrame::Reflow(nsIPresContext* aPresContext,
|
||||||
nsFormFrame::AddFormControlFrame(aPresContext, *NS_STATIC_CAST(nsIFrame*, this));
|
nsFormFrame::AddFormControlFrame(aPresContext, *NS_STATIC_CAST(nsIFrame*, this));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
#if 0
|
||||||
nsresult skiprv = nsFormControlFrame::SkipResizeReflow(mCacheSize, mCachedMaxElementSize, aPresContext,
|
nsresult skiprv = nsFormControlFrame::SkipResizeReflow(mCacheSize, mCachedMaxElementSize, aPresContext,
|
||||||
aDesiredSize, aReflowState, aStatus);
|
aDesiredSize, aReflowState, aStatus);
|
||||||
|
|
||||||
if (NS_SUCCEEDED(skiprv)) {
|
if (NS_SUCCEEDED(skiprv)) {
|
||||||
return skiprv;
|
return skiprv;
|
||||||
}
|
}
|
||||||
|
#endif
|
||||||
|
|
||||||
if ((kSuggestedNotSet != mSuggestedWidth) ||
|
if ((kSuggestedNotSet != mSuggestedWidth) ||
|
||||||
(kSuggestedNotSet != mSuggestedHeight)) {
|
(kSuggestedNotSet != mSuggestedHeight)) {
|
||||||
|
@ -366,7 +369,9 @@ nsGfxButtonControlFrame::Reflow(nsIPresContext* aPresContext,
|
||||||
#endif
|
#endif
|
||||||
aStatus = NS_FRAME_COMPLETE;
|
aStatus = NS_FRAME_COMPLETE;
|
||||||
|
|
||||||
|
#if 0
|
||||||
nsFormControlFrame::SetupCachedSizes(mCacheSize, mCachedMaxElementSize, aDesiredSize);
|
nsFormControlFrame::SetupCachedSizes(mCacheSize, mCachedMaxElementSize, aDesiredSize);
|
||||||
|
#endif
|
||||||
|
|
||||||
return rv;
|
return rv;
|
||||||
}
|
}
|
||||||
|
|
|
@ -326,11 +326,14 @@ nsGfxButtonControlFrame::Reflow(nsIPresContext* aPresContext,
|
||||||
nsFormFrame::AddFormControlFrame(aPresContext, *NS_STATIC_CAST(nsIFrame*, this));
|
nsFormFrame::AddFormControlFrame(aPresContext, *NS_STATIC_CAST(nsIFrame*, this));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
#if 0
|
||||||
nsresult skiprv = nsFormControlFrame::SkipResizeReflow(mCacheSize, mCachedMaxElementSize, aPresContext,
|
nsresult skiprv = nsFormControlFrame::SkipResizeReflow(mCacheSize, mCachedMaxElementSize, aPresContext,
|
||||||
aDesiredSize, aReflowState, aStatus);
|
aDesiredSize, aReflowState, aStatus);
|
||||||
|
|
||||||
if (NS_SUCCEEDED(skiprv)) {
|
if (NS_SUCCEEDED(skiprv)) {
|
||||||
return skiprv;
|
return skiprv;
|
||||||
}
|
}
|
||||||
|
#endif
|
||||||
|
|
||||||
if ((kSuggestedNotSet != mSuggestedWidth) ||
|
if ((kSuggestedNotSet != mSuggestedWidth) ||
|
||||||
(kSuggestedNotSet != mSuggestedHeight)) {
|
(kSuggestedNotSet != mSuggestedHeight)) {
|
||||||
|
@ -366,7 +369,9 @@ nsGfxButtonControlFrame::Reflow(nsIPresContext* aPresContext,
|
||||||
#endif
|
#endif
|
||||||
aStatus = NS_FRAME_COMPLETE;
|
aStatus = NS_FRAME_COMPLETE;
|
||||||
|
|
||||||
|
#if 0
|
||||||
nsFormControlFrame::SetupCachedSizes(mCacheSize, mCachedMaxElementSize, aDesiredSize);
|
nsFormControlFrame::SetupCachedSizes(mCacheSize, mCachedMaxElementSize, aDesiredSize);
|
||||||
|
#endif
|
||||||
|
|
||||||
return rv;
|
return rv;
|
||||||
}
|
}
|
||||||
|
|
Загрузка…
Ссылка в новой задаче