Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2025-02-27 21:00:50 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 1275957 - Part 1. Apply space property to gradient. r=mstange

Browse Source
This commit is contained in:
Ethan Lin 2016-06-02 02:09:00 +02:00
parent 4e54963733
commit 094e16eac7
4 changed files with 15 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
layout/base/nsCSSRendering.cpp
View File

@ -2494,6 +2494,7 @@ nsCSSRendering::PaintGradient(nsPresContext* aPresContext,
const nsRect& aDirtyRect,
const nsRect& aDest,
const nsRect& aFillArea,
const nsSize& aRepeatSize,
const CSSIntRect& aSrc,
const nsSize& aIntrinsicSize)
{
@ -2829,14 +2830,14 @@ nsCSSRendering::PaintGradient(nsPresContext* aPresContext,
bool isCTMPreservingAxisAlignedRectangles = ctm.PreservesAxisAlignedRectangles();
// xStart/yStart are the top-left corner of the top-left tile.
nscoord xStart = FindTileStart(dirty.x, aDest.x, aDest.width);
nscoord yStart = FindTileStart(dirty.y, aDest.y, aDest.height);
nscoord xStart = FindTileStart(dirty.x, aDest.x, aRepeatSize.width);
nscoord yStart = FindTileStart(dirty.y, aDest.y, aRepeatSize.height);
nscoord xEnd = forceRepeatToCoverTiles ? xStart + aDest.width : dirty.XMost();
nscoord yEnd = forceRepeatToCoverTiles ? yStart + aDest.height : dirty.YMost();
// x and y are the top-left corner of the tile to draw
for (nscoord y = yStart; y < yEnd; y += aDest.height) {
for (nscoord x = xStart; x < xEnd; x += aDest.width) {
for (nscoord y = yStart; y < yEnd; y += aRepeatSize.height) {
for (nscoord x = xStart; x < xEnd; x += aRepeatSize.width) {
// The coordinates of the tile
gfxRect tileRect = nsLayoutUtils::RectToGfxRect(
nsRect(x, y, aDest.width, aDest.height),
@ -5285,7 +5286,7 @@ nsImageRenderer::Draw(nsPresContext* aPresContext,
{
nsCSSRendering::PaintGradient(aPresContext, aRenderingContext,
mGradientData, aDirtyRect,
aDest, aFill, aSrc, mSize);
aDest, aFill, aRepeatSize, aSrc, mSize);
break;
}
case eStyleImageType_Element:
@ -5550,7 +5551,7 @@ nsImageRenderer::DrawBorderImageComponent(nsPresContext* aPresContext,
: aFill;
return Draw(aPresContext, aRenderingContext, aDirtyRect, destTile,
aFill, destTile.TopLeft(), nsSize(0, 0), aSrc);
aFill, destTile.TopLeft(), destTile.Size(), aSrc);
}
bool

1
layout/base/nsCSSRendering.h
View File

@ -450,6 +450,7 @@ struct nsCSSRendering {
const nsRect& aDirtyRect,
const nsRect& aDest,
const nsRect& aFill,
const nsSize& aRepeatSize,
const mozilla::CSSIntRect& aSrc,
const nsSize& aIntrinsiceSize);

3
layout/style/nsStyleStruct.cpp
View File

@ -2534,7 +2534,8 @@ nsStyleImageLayers::Layer::RenderingMightDependOnPositioningAreaSizeChange() con
}
return mPosition.DependsOnPositioningAreaSize() ||
mSize.DependsOnPositioningAreaSize(mImage);
mSize.DependsOnPositioningAreaSize(mImage) ||
mRepeat.DependsOnPositioningAreaSize();
}
bool

5
layout/style/nsStyleStruct.h
View File

@ -603,6 +603,11 @@ struct nsStyleImageLayers {
mYRepeat == NS_STYLE_IMAGELAYER_REPEAT_REPEAT;
}
bool DependsOnPositioningAreaSize() const {
return mXRepeat == NS_STYLE_IMAGELAYER_REPEAT_SPACE ||
mYRepeat == NS_STYLE_IMAGELAYER_REPEAT_SPACE;
}
// Initialize to initial values
void SetInitialValues();