diff options
| author |  mtklein <mtklein@chromium.org> | 2014-11-24 08:20:57 -0800 |
|---|---|---|
| committer |  Commit bot <commit-bot@chromium.org> | 2014-11-24 08:20:58 -0800 |
| commit | 04c96950554b4e416755c5bc23022674518a6e8b (patch) | |
| tree | 13d004413f53b90d6bcd953d447c989091f51749 /tests | |
| parent | f2fdc8b746acac9daa94b21d3849f60a87064fd4 (diff) | |
Remove Picture deletion listeners.
Looks like we can just have ~SkPicture put the message on the bus directly.
BUG=skia:3144
Review URL: https://codereview.chromium.org/751663002
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/GpuLayerCacheTest.cpp | 2 | ||||
| -rw-r--r-- | tests/PictureTest.cpp | 4 |
2 files changed, 2 insertions, 4 deletions
diff --git a/tests/GpuLayerCacheTest.cpp b/tests/GpuLayerCacheTest.cpp index 277590eb75..1043a208f5 100644 --- a/tests/GpuLayerCacheTest.cpp +++ b/tests/GpuLayerCacheTest.cpp @@ -53,8 +53,6 @@ static void create_layers(skiatest::Reporter* reporter, REPORTER_ASSERT(reporter, NULL == layer->paint()); REPORTER_ASSERT(reporter, !layer->isAtlased()); } - - cache->trackPicture(&picture); } static void lock_layer(skiatest::Reporter* reporter, diff --git a/tests/PictureTest.cpp b/tests/PictureTest.cpp index ce10f56fd6..77fed2ffe3 100644 --- a/tests/PictureTest.cpp +++ b/tests/PictureTest.cpp @@ -1011,7 +1011,7 @@ static void test_savelayer_extraction(skiatest::Reporter* reporter) { kHeight/2.0 == info1.fBounds.height()); REPORTER_ASSERT(reporter, info1.fLocalMat.isIdentity()); REPORTER_ASSERT(reporter, info1.fPreMat.isIdentity()); - REPORTER_ASSERT(reporter, kWidth/2.0 == info1.fBounds.fLeft && + REPORTER_ASSERT(reporter, kWidth/2.0 == info1.fBounds.fLeft && kHeight/2.0 == info1.fBounds.fTop); REPORTER_ASSERT(reporter, NULL == info1.fPaint); REPORTER_ASSERT(reporter, !info1.fIsNested && @@ -1733,7 +1733,7 @@ static void test_bytes_used(skiatest::Reporter* reporter) { sizeof(SkPicture) + sizeof(SkRecord)); // Protect against any unintentional bloat. - REPORTER_ASSERT(reporter, SkPictureUtils::ApproximateBytesUsed(empty.get()) <= 144); + REPORTER_ASSERT(reporter, SkPictureUtils::ApproximateBytesUsed(empty.get()) <= 128); // Sanity check of nested SkPictures. SkPictureRecorder r2; |