Bug 1333482 part 2 - [css-ui] Change all consumers of StyleDisplay::mAppearance to use the accessor UsedAppearance() instead, and make mAppearance/mMozAppearance private. r=dholbert
MozReview-Commit-ID: 8JwLsY1CLDJ
This commit is contained in:
committed by
Bobby Holley
parent
8297bf43a1
commit
4729a520a5
@@ -50,7 +50,7 @@ nsFormControlFrame::GetMinISize(nsRenderingContext *aRenderingContext)
|
||||
nscoord result;
|
||||
DISPLAY_MIN_WIDTH(this, result);
|
||||
#if !defined(MOZ_WIDGET_ANDROID) && !defined(MOZ_WIDGET_GONK)
|
||||
result = StyleDisplay()->mAppearance == NS_THEME_NONE ? 0 : DefaultSize();
|
||||
result = StyleDisplay()->UsedAppearance() == NS_THEME_NONE ? 0 : DefaultSize();
|
||||
#else
|
||||
result = DefaultSize();
|
||||
#endif
|
||||
@@ -63,7 +63,7 @@ nsFormControlFrame::GetPrefISize(nsRenderingContext *aRenderingContext)
|
||||
nscoord result;
|
||||
DISPLAY_PREF_WIDTH(this, result);
|
||||
#if !defined(MOZ_WIDGET_ANDROID) && !defined(MOZ_WIDGET_GONK)
|
||||
result = StyleDisplay()->mAppearance == NS_THEME_NONE ? 0 : DefaultSize();
|
||||
result = StyleDisplay()->UsedAppearance() == NS_THEME_NONE ? 0 : DefaultSize();
|
||||
#else
|
||||
result = DefaultSize();
|
||||
#endif
|
||||
@@ -83,7 +83,7 @@ nsFormControlFrame::ComputeAutoSize(nsRenderingContext* aRC,
|
||||
{
|
||||
LogicalSize size(aWM, 0, 0);
|
||||
#if !defined(MOZ_WIDGET_ANDROID) && !defined(MOZ_WIDGET_GONK)
|
||||
if (StyleDisplay()->mAppearance == NS_THEME_NONE) {
|
||||
if (StyleDisplay()->UsedAppearance() == NS_THEME_NONE) {
|
||||
return size;
|
||||
}
|
||||
#endif
|
||||
@@ -107,7 +107,7 @@ nsFormControlFrame::GetLogicalBaseline(WritingMode aWritingMode) const
|
||||
#if !defined(MOZ_WIDGET_ANDROID)
|
||||
// For appearance:none we use a standard CSS baseline, i.e. synthesized from
|
||||
// our margin-box.
|
||||
if (StyleDisplay()->mAppearance == NS_THEME_NONE) {
|
||||
if (StyleDisplay()->UsedAppearance() == NS_THEME_NONE) {
|
||||
return nsAtomicContainerFrame::GetLogicalBaseline(aWritingMode);
|
||||
}
|
||||
#endif
|
||||
|
||||
Reference in New Issue
Block a user