corysanin/tubestation
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Bug 1393383 - Update webrender binding code to support non-uniform border radius r=kats

Browse Source 
MozReview-Commit-ID: 9YIPRJ9Mzfi
This commit is contained in:
Chih-Yi Leu
2017-10-24 14:44:29 +08:00
parent 5b08bc2f78
commit e839c8be0b
6 changed files with 33 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
layout/forms/nsButtonFrameRenderer.cpp
View File

@@ -160,14 +160,6 @@ nsDisplayButtonBoxShadowOuter::CanBuildWebRenderDisplayItems()
hasBorderRadius = mFrame->GetBorderRadii(sz, sz, Sides(), twipsRadii);
}
if (hasBorderRadius) {
nsCSSRendering::RectCornerRadii borderRadii;
nsCSSRendering::GetBorderRadii(frameRect, borderRect, mFrame, borderRadii);
if (!borderRadii.AreRadiiSame()) {
return false;
}
}
return true;
}
@@ -219,14 +211,21 @@ nsDisplayButtonBoxShadowOuter::CreateWebRenderCommands(
bool hasBorderRadius;
Unused << nsCSSRendering::HasBoxShadowNativeTheme(mFrame, hasBorderRadius);
float borderRadius = 0.0;
LayoutDeviceSize zeroSize;
wr::BorderRadius borderRadius = wr::ToBorderRadius(zeroSize, zeroSize,
zeroSize, zeroSize);
if (hasBorderRadius) {
mozilla::gfx::RectCornerRadii borderRadii;
hasBorderRadius = nsCSSRendering::GetBorderRadii(
shadowRect, shadowRect, mFrame, borderRadii);
// TODO: support non-uniform border radius.
MOZ_ASSERT(borderRadii.AreRadiiSame());
borderRadius = hasBorderRadius ? borderRadii.TopLeft().width : 0.0;
if (hasBorderRadius) {
borderRadius = wr::ToBorderRadius(
LayoutDeviceSize::FromUnknownSize(borderRadii.TopLeft()),
LayoutDeviceSize::FromUnknownSize(borderRadii.TopRight()),
LayoutDeviceSize::FromUnknownSize(borderRadii.BottomLeft()),
LayoutDeviceSize::FromUnknownSize(borderRadii.BottomRight()));
}
}
nsCSSShadowArray* shadows = mFrame->StyleEffects()->mBoxShadow;