diff options
author | win7-7 <win7-7@users.noreply.github.com> | 2020-05-12 19:23:47 +0300 |
---|---|---|
committer | win7-7 <win7-7@users.noreply.github.com> | 2020-05-12 19:23:47 +0300 |
commit | dac57c99f3bfc028859571c489fcb3d425d23f7b (patch) | |
tree | 84871edad991a7dd607ec8f185f6bbb022b6edeb /layout/base | |
parent | b9f14b0d618c63e5938389770c48642bdb57b341 (diff) | |
download | aura-central-dac57c99f3bfc028859571c489fcb3d425d23f7b.tar.gz |
Issue mcp-graveyard/UXP%1545 - Fix border-radius on table row groups, rows, column groups, or columns
Before issue %146, border-radius on row groups, rows, column groups, or columns don't apply to the background of each cell, yet the border-radius on the cell itself does.
After issue %146, the behaviors changed. In this patch, I tried to revert the behaviors of border-radius on table row groups, rows, column groups, or columns back to what happened before issue %146.
Also: Don't override GetBorderRadii in nsBCTableCellFrame.
Diffstat (limited to 'layout/base')
-rw-r--r-- | layout/base/nsCSSRendering.cpp | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/layout/base/nsCSSRendering.cpp b/layout/base/nsCSSRendering.cpp index 119c6c8a2..9a827546f 100644 --- a/layout/base/nsCSSRendering.cpp +++ b/layout/base/nsCSSRendering.cpp @@ -1903,8 +1903,15 @@ nsCSSRendering::GetImageLayerClip(const nsStyleImageLayers::Layer& aLayer, nsRect clipBorderArea = ::BoxDecorationRectForBorder(aForFrame, aBorderArea, skipSides, &aBorder); - bool haveRoundedCorners = GetRadii(aForFrame, aBorder, aBorderArea, - clipBorderArea, aClipState->mRadii); + bool haveRoundedCorners = false; + nsIAtom* fType = aForFrame->GetType(); + if (fType != nsGkAtoms::tableColGroupFrame && + fType != nsGkAtoms::tableColFrame && + fType != nsGkAtoms::tableRowFrame && + fType != nsGkAtoms::tableRowGroupFrame) { + haveRoundedCorners = GetRadii(aForFrame, aBorder, aBorderArea, + clipBorderArea, aClipState->mRadii); + } bool isSolidBorder = aWillPaintBorder && IsOpaqueBorder(aBorder); |