wine/gecko
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-gecko.git synced 2024-09-13 09:24:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

Backout ffcdd896a1fa (bug 787947) for reftest failures

Browse Source
This commit is contained in:
Ed Morley 2012-10-03 13:43:19 +01:00
parent 9738536099
commit 6582dac750
4 changed files with 19 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
layout/base/nsCSSRendering.cpp
View File

@ -2283,7 +2283,6 @@ nsCSSRendering::PaintGradient(nsPresContext* aPresContext,
gfxRect areaToFill =
nsLayoutUtils::RectToGfxRect(aFillArea, appUnitsPerPixel);
gfxMatrix ctm = ctx->CurrentMatrix();
bool isCTMPreservingAxisAlignedRectangles = ctm.PreservesAxisAlignedRectangles();
// xStart/yStart are the top-left corner of the top-left tile.
nscoord xStart = FindTileStart(dirty.x, aOneCellArea.x, aOneCellArea.width);
@ -2303,30 +2302,27 @@ nsCSSRendering::PaintGradient(nsPresContext* aPresContext,
gfxRect fillRect =
pattern->mCoversTile ? areaToFill : tileRect.Intersect(areaToFill);
ctx->NewPath();
// Try snapping the fill rect. Snap its top-left and bottom-right
// independently to preserve the orientation.
gfxPoint snappedFillRectTopLeft = fillRect.TopLeft();
gfxPoint snappedFillRectBottomRight = fillRect.BottomRight();
if (isCTMPreservingAxisAlignedRectangles &&
ctx->UserToDevicePixelSnapped(snappedFillRectTopLeft, true) &&
ctx->UserToDevicePixelSnapped(snappedFillRectBottomRight, true)) {
if (snappedFillRectTopLeft.x == snappedFillRectBottomRight.x ||
snappedFillRectTopLeft.y == snappedFillRectBottomRight.y) {
// Nothing to draw; avoid scaling by zero and other weirdness that
// could put the context in an error state.
continue;
}
// Set the context's transform to the transform that maps fillRect to
// snappedFillRect. The part of the gradient that was going to
// exactly fill fillRect will fill snappedFillRect instead.
// If we can snap the gradient tile and fill rects, do so, but make sure
// that the gradient is scaled precisely to the tile rect.
gfxRect fillRectSnapped = fillRect;
// Don't snap the tileRect directly since that would lose information
// about the orientation of the current transform (i.e. vertical or
// horizontal flipping). Instead snap the corners independently so if
// the CTM has a flip, our Scale() below preserves the flip.
gfxPoint tileRectSnappedTopLeft = tileRect.TopLeft();
gfxPoint tileRectSnappedBottomRight = tileRect.BottomRight();
if (ctx->UserToDevicePixelSnapped(fillRectSnapped, true) &&
ctx->UserToDevicePixelSnapped(tileRectSnappedTopLeft, true) &&
ctx->UserToDevicePixelSnapped(tileRectSnappedBottomRight, true)) {
ctx->IdentityMatrix();
ctx->Translate(snappedFillRectTopLeft);
ctx->Scale((snappedFillRectBottomRight.x - snappedFillRectTopLeft.x)/fillRect.width,
(snappedFillRectBottomRight.y - snappedFillRectTopLeft.y)/fillRect.height);
ctx->Translate(-fillRect.TopLeft());
ctx->Rectangle(fillRectSnapped);
ctx->Translate(tileRectSnappedTopLeft);
ctx->Scale((tileRectSnappedBottomRight.x - tileRectSnappedTopLeft.x)/tileRect.width,
(tileRectSnappedBottomRight.y - tileRectSnappedTopLeft.y)/tileRect.height);
} else {
ctx->Rectangle(fillRect);
ctx->Translate(tileRect.TopLeft());
}
ctx->Rectangle(fillRect);
ctx->Translate(tileRect.TopLeft());
ctx->SetPattern(pattern->mPattern);
ctx->Fill();
ctx->SetMatrix(ctm);

3
layout/reftests/bugs/787947-1-ref.html
View File

@ -1,3 +0,0 @@
<!DOCTYPE HTML>
<div style="position:absolute; left:10px; top:10px; width:100px; height:100px; border:1px solid black; background-image:linear-gradient(white, black);"></div>
<p style="position:absolute; left:10px; z-index:2">Hello

3
layout/reftests/bugs/787947-1.html
View File

@ -1,3 +0,0 @@
<!DOCTYPE HTML>
<div style="position:absolute; left:10px; top:10px; width:100px; height:100px; border:1px solid black; background-image:linear-gradient(white, black); background-size:0.3px 100px;"></div>
<p style="position:absolute; left:10px; z-index:2">Hello

1
layout/reftests/bugs/reftest.list
View File

@ -1719,4 +1719,3 @@ fuzzy-if(true,17,5859) == 759036-2.html 759036-2-ref.html
== 776265-2b.html 776265-2-ref.html
== 776265-2c.html 776265-2-ref.html
== 776265-2d.html 776265-2-ref.html
== 787947-1.html 787947-1-ref.html