Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-08 10:44:56 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix border-radius joins with differing styles adjacent to a zero-width border. (Bug 500141) r=roc a2.0=blocking-final

Browse Source
This commit is contained in:
L. David Baron 2010-10-26 11:30:42 -07:00
parent 2679091b6d
commit 54b6671d25
1 changed files with 17 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
layout/base/nsCSSRenderingBorders.cpp
View File

@ -420,20 +420,30 @@ typedef enum {
SIDE_CLIP_RECTANGLE
} SideClipType;
// Given three points, p0, p1, and midPoint, if p0 and p1 do not form
// a horizontal or vertical line move p1 to the point nearest the
// midpoint, while maintaing the slope of the line.
// Given three points, p0, p1, and midPoint, move p1 to the point
// nearest the midpoint, while maintaing the slope of the line. p0 and
// p1 must be distinct.
static void
MaybeMoveToMidPoint(gfxPoint& aP0, gfxPoint& aP1, const gfxPoint& aMidPoint)
{
gfxPoint ps = aP1 - aP0;
if (ps.x != 0.0 && ps.y != 0.0) {
if (ps.x == 0.0) {
if (ps.y == 0.0) {
NS_NOTREACHED("points should be different");
} else {
aP1.y = aMidPoint.y;
}
} else {
if (ps.y == 0.0) {
aP1.x = aMidPoint.x;
} else {
gfxFloat k = NS_MIN((aMidPoint.x - aP0.x) / ps.x,
(aMidPoint.y - aP1.y) / ps.y);
aP1 = aP0 + ps * k;
}
}
}
void
nsCSSBorderRenderer::DoSideClipSubPath(mozilla::css::Side aSide)