AuroraMiddleware/skia2
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fixing numerical rounding edge case in SkTileGrid

Browse Source 
BUG=https://code.google.com/p/chromium/issues/detail?id=234688
TEST=TileGrid skia unit test

Review URL: https://codereview.chromium.org/13860011

git-svn-id: http://skia.googlecode.com/svn/trunk@8839 2bbb7eff-a529-9590-31e7-b0007b416f81
This commit is contained in:
junov@chromium.org 2013-04-24 15:39:11 +00:00
parent 48821fc31c
commit d5cfdfffc8
2 changed files with 19 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/core/SkTileGrid.cpp
View File

@ -81,9 +81,9 @@ void SkTileGrid::search(const SkIRect& query, SkTDArray<void*>* results) {
fInfo.fTileInterval.height();
tileStartX = SkPin32(tileStartX, 0, fXTileCount - 1);
tileEndX = SkPin32(tileEndX, 1, fXTileCount);
tileEndX = SkPin32(tileEndX, tileStartX+1, fXTileCount);
tileStartY = SkPin32(tileStartY, 0, fYTileCount - 1);
tileEndY = SkPin32(tileEndY, 1, fYTileCount);
tileEndY = SkPin32(tileEndY, tileStartY+1, fYTileCount);
int queryTileCount = (tileEndX - tileStartX) * (tileEndY - tileStartY);
SkASSERT(queryTileCount);

17
tests/TileGridTest.cpp
View File

@ -178,6 +178,9 @@ public:
SkBitmap moreThanATileBitmap;
moreThanATileBitmap.setConfig(SkBitmap::kARGB_8888_Config, 11, 11);
moreThanATileBitmap.allocPixels();
SkBitmap tinyBitmap;
tinyBitmap.setConfig(SkBitmap::kARGB_8888_Config, 2, 2);
tinyBitmap.allocPixels();
// Test parts of top-left tile
{
// The offset should cancel the top and left borders of the top left tile
@ -226,6 +229,20 @@ public:
REPORTER_ASSERT(reporter, rect2 == mockCanvas.fRects[0]);
REPORTER_ASSERT(reporter, rect3 == mockCanvas.fRects[1]);
}
{
// Regression test for crbug.com/234688
// Once the 2x2 device region is inset by margin, it yields an empty
// adjusted region, sitting right on top of the tile boundary.
SkDevice device(tinyBitmap);
MockCanvas mockCanvas(&device);
mockCanvas.translate(SkFloatToScalar(-8.0f), SkFloatToScalar(-8.0f));
picture.draw(&mockCanvas);
// This test passes by not asserting. We do not validate the rects recorded
// because the result is numerically unstable (floating point equality).
// The content of any one of the four tiles of the tilegrid would be a valid
// result since any bbox that covers the center point of the canvas will be
// recorded in all four tiles.
}
}
static void Test(skiatest::Reporter* reporter) {