diff options
| author |  tomhudson <tomhudson@chromium.org> | 2014-08-20 05:29:41 -0700 |
|---|---|---|
| committer |  Commit bot <commit-bot@chromium.org> | 2014-08-20 05:29:41 -0700 |
| commit | 3a0f27916712bb3226874aeaa268e30f565880de (patch) | |
| tree | ebfd03a22ebe5a22a709ee5cc09ff4c8a74d3e07 /tests/RecordTest.cpp | |
| parent | 5dfe779c2e684e3e1aacfa24aa7be9c9da1598f9 (diff) | |
Move the code over using the same template type approach previously used for willPlayBackBitmaps in http://skbug.com/2702.
Also unifies that flag and this one into a struct so they and others can be computed together. The struct is stored const to enforce lifetime expectations. Adds a few new cases to the unit test.
BUG=skia:2700
R=mtklein@google.com, reed@google.com, robertphillips@google.com, tomhudson@google.com
Committed: https://skia.googlesource.com/skia/+/60c2a79cfa8ceebcbafc243407564dc71f5e3b4f
Author: tomhudson@chromium.org
Review URL: https://codereview.chromium.org/364823009
Diffstat (limited to 'tests/RecordTest.cpp')
| -rw-r--r-- | tests/RecordTest.cpp | 33 |
1 files changed, 0 insertions, 33 deletions
diff --git a/tests/RecordTest.cpp b/tests/RecordTest.cpp index 2fcc1e9c53..2240ae9858 100644 --- a/tests/RecordTest.cpp +++ b/tests/RecordTest.cpp @@ -11,7 +11,6 @@ #include "SkImageInfo.h" #include "SkShader.h" #include "SkRecord.h" -#include "SkRecordAnalysis.h" #include "SkRecords.h" // Sums the area of any DrawRect command it sees. @@ -77,37 +76,5 @@ DEF_TEST(Record, r) { REPORTER_ASSERT(r, summer.area() == 500); } -DEF_TEST(RecordAnalysis, r) { - SkRecord record; - - SkRect rect = SkRect::MakeWH(10, 10); - SkPaint paint; - APPEND(record, SkRecords::DrawRect, paint, rect); - REPORTER_ASSERT(r, !SkRecordWillPlaybackBitmaps(record)); - - SkBitmap bitmap; - APPEND(record, SkRecords::DrawBitmap, &paint, bitmap, 0.0f, 0.0f); - REPORTER_ASSERT(r, SkRecordWillPlaybackBitmaps(record)); - - SkNEW_PLACEMENT_ARGS(record.replace<SkRecords::DrawRect>(1), - SkRecords::DrawRect, (paint, rect)); - REPORTER_ASSERT(r, !SkRecordWillPlaybackBitmaps(record)); - - SkPaint paint2; - // CreateBitmapShader is too smart for us; an empty (or 1x1) bitmap shader - // gets optimized into a non-bitmap form, so we create a 2x2 bitmap here. - SkBitmap bitmap2; - bitmap2.allocPixels(SkImageInfo::MakeN32Premul(2, 2)); - bitmap2.eraseColor(SK_ColorBLUE); - *(bitmap2.getAddr32(0, 0)) = SK_ColorGREEN; - SkShader* shader = SkShader::CreateBitmapShader(bitmap2, SkShader::kClamp_TileMode, - SkShader::kClamp_TileMode); - paint2.setShader(shader)->unref(); - REPORTER_ASSERT(r, shader->asABitmap(NULL, NULL, NULL) == SkShader::kDefault_BitmapType); - - APPEND(record, SkRecords::DrawRect, paint2, rect); - REPORTER_ASSERT(r, SkRecordWillPlaybackBitmaps(record)); -} - #undef APPEND |