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

Bug 463217. Don't let nsLayoutUtils::DrawSingleImage/DrawSingleUnscaledImage do any tiling, restrict their drawing to the single tile. r+sr=dbaron

Browse Source
This commit is contained in:
Robert O'Callahan 2008-11-10 20:24:21 +13:00
parent 40c2786f59
commit 687210c214
4 changed files with 22 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
layout/base/nsLayoutUtils.cpp
View File

@ -2805,6 +2805,10 @@ nsLayoutUtils::DrawSingleUnscaledImage(nsIRenderingContext* aRenderingContext,
nsRect dest(aDest - source.TopLeft(),
nsSize(size.width*appUnitsPerCSSPixel, size.height*appUnitsPerCSSPixel));
nsRect fill(aDest, source.Size());
// Ensure that only a single image tile is drawn. If aSourceArea extends
// outside the image bounds, we want to honor the aSourceArea-to-aDest
// translation but we don't want to actually tile the image.
fill.IntersectRect(fill, dest);
return DrawImage(aRenderingContext, aImage, dest, fill, aDest, aDirty);
}
@ -2831,7 +2835,12 @@ nsLayoutUtils::DrawSingleImage(nsIRenderingContext* aRenderingContext,
}
nsRect dest = GetWholeImageDestination(size, source, aDest);
return DrawImage(aRenderingContext, aImage, dest, aDest, aDest.TopLeft(), aDirty);
// Ensure that only a single image tile is drawn. If aSourceArea extends
// outside the image bounds, we want to honor the aSourceArea-to-aDest
// transform but we don't want to actually tile the image.
nsRect fill;
fill.IntersectRect(aDest, dest);
return DrawImage(aRenderingContext, aImage, dest, fill, fill.TopLeft(), aDirty);
}
/* static */ nsRect

7
layout/reftests/bugs/463217-1-ref.xul Normal file
View File

@ -0,0 +1,7 @@
<?xml version="1.0"?>
<window xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
<vbox style="height:204px; border:2px solid blue;" flex="0">
<image style="list-style-image: url(mozilla-banner.gif);"/>
</vbox>
<vbox/>
</window>

4
layout/reftests/bugs/463217-1.xul Normal file
View File

@ -0,0 +1,4 @@
<?xml version="1.0"?>
<window xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
<image style="border:2px solid blue; list-style-image: url(mozilla-banner.gif); -moz-image-region: rect(0 600px 200px 0);"/>
</window>

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

@ -959,3 +959,4 @@ fails-if(MOZ_WIDGET_TOOLKIT=="cocoa") == 456147.xul 456147-ref.html # bug 456147
== 461266-1.html 461266-1-ref.html
fails == 461512-1.html 461512-1-ref.html # Bug 461512
== 463204-1.html 463204-1-ref.html
== 463217-1.xul 463217-1-ref.xul