Bug 1272983 part 2: Use more forgiving margin/padding getters in nsButtonFrameRenderer, for better behavior when percent or auto values are encountered. r=dbaron

MozReview-Commit-ID: 4vIehNg2vND
This commit is contained in:
Daniel Holbert
2016-05-20 15:05:33 -07:00
parent 6117b314eb
commit bff0a63687
6 changed files with 240 additions and 3 deletions

View File

@@ -386,7 +386,7 @@ nsButtonFrameRenderer::GetButtonOuterFocusBorderAndPadding()
nsMargin result(0,0,0,0);
if (mOuterFocusStyle) {
mOuterFocusStyle->StylePadding()->GetPaddingNoPercentage(result);
mOuterFocusStyle->StylePadding()->GetPadding(result);
result += mOuterFocusStyle->StyleBorder()->GetComputedBorder();
}
@@ -409,7 +409,7 @@ nsButtonFrameRenderer::GetButtonInnerFocusMargin()
if (mInnerFocusStyle) {
const nsStyleMargin* margin = mInnerFocusStyle->StyleMargin();
margin->GetMarginNoPercentage(innerFocusMargin);
margin->GetMargin(innerFocusMargin);
}
return innerFocusMargin;
@@ -421,7 +421,7 @@ nsButtonFrameRenderer::GetButtonInnerFocusBorderAndPadding()
nsMargin result(0,0,0,0);
if (mInnerFocusStyle) {
mInnerFocusStyle->StylePadding()->GetPaddingNoPercentage(result);
mInnerFocusStyle->StylePadding()->GetPadding(result);
result += mInnerFocusStyle->StyleBorder()->GetComputedBorder();
}