diff options
| author |  robertphillips <robertphillips@chromium.org> | 2014-11-12 06:46:08 -0800 |
|---|---|---|
| committer |  Commit bot <commit-bot@chromium.org> | 2014-11-12 06:46:08 -0800 |
| commit | 4e8e3421aa919a82eb1dd287fecbd079f5a320b4 (patch) | |
| tree | eb1a93b4b6bd62299b0092d53f8771a31f5a625a /tests | |
| parent | b103d0c64ae837ac1b6006b952e29347d8377490 (diff) | |
Move SkRecordComputeLayers and CollectLayers into SkRecordDraw.cpp
Rather then exposing parts of FillBounds (as in Expose FillBounds to allow GrPictureUtils::CollectLayers to be layered on top of it - https://codereview.chromium.org/698643002/), this CL moves CollectLayers into SkRecordDraw.cpp to accomplish the layering.
Review URL: https://codereview.chromium.org/716913003
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/PictureTest.cpp | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/tests/PictureTest.cpp b/tests/PictureTest.cpp index 42bd25806c..3cb145e7a4 100644 --- a/tests/PictureTest.cpp +++ b/tests/PictureTest.cpp @@ -1018,11 +1018,12 @@ static void test_gpu_picture_optimization(skiatest::Reporter* reporter, REPORTER_ASSERT(reporter, !info0.fIsNested && !info0.fHasNestedLayers); REPORTER_ASSERT(reporter, NULL == info1.fPicture); - REPORTER_ASSERT(reporter, kWidth == info1.fBounds.width() && - kHeight == info1.fBounds.height()); + REPORTER_ASSERT(reporter, kWidth/2.0 == info1.fBounds.width() && + kHeight/2.0 == info1.fBounds.height()); REPORTER_ASSERT(reporter, info1.fLocalMat.isIdentity()); REPORTER_ASSERT(reporter, info1.fPreMat.isIdentity()); - REPORTER_ASSERT(reporter, 0 == info1.fBounds.fLeft && 0 == info1.fBounds.fTop); + 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 && info1.fHasNestedLayers); // has a nested SL |