Bug 1414036 - Make sure we paint nsDisplayButtonBorder's box shadow before early return of the empty border. r=kats

MozReview-Commit-ID: AWevj7ls5SL
This commit is contained in:
Ethan Lin
2017-11-03 14:15:29 +08:00
parent 47c4ca0cce
commit 0b23b02122

View File

@@ -370,12 +370,6 @@ nsDisplayButtonBorder::CreateWebRenderCommands(mozilla::wr::DisplayListBuilder&
return false;
}
if (!mBorderRenderer) {
// empty border, nothing to do
MOZ_ASSERT(mBorderIsEmpty);
return true;
}
// This is really a combination of paint box shadow inner +
// paint border.
nsRect buttonRect = nsRect(ToReferenceFrame(), mFrame->GetSize());
@@ -386,7 +380,13 @@ nsDisplayButtonBorder::CreateWebRenderCommands(mozilla::wr::DisplayListBuilder&
visible,
mFrame,
buttonRect);
mBorderRenderer->CreateWebRenderCommands(this, aBuilder, aResources, aSc);
if (mBorderRenderer) {
mBorderRenderer->CreateWebRenderCommands(this, aBuilder, aResources, aSc);
} else {
// empty border, nothing to do
MOZ_ASSERT(mBorderIsEmpty);
}
return true;
}