diff options
| author |  commit-bot@chromium.org <commit-bot@chromium.org@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2014-01-13 20:23:48 +0000 |
|---|---|---|
| committer | commit-bot@chromium.org <commit-bot@chromium.org@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2014-01-13 20:23:48 +0000 |
| commit | 9b06ba4c91484d09565ff4a572d8c5af15dd429e (patch) | |
| tree | 6ffdbe491bde75147efead8c9d21b5d6ebae045e /tests | |
| parent | dd9ea9262cb61b545fcf414fbde677eb2b62fee4 (diff) | |
Reason for revert: broke tests (compile)
R=scroggo@google.com, halcanary@google.com
TBR=halcanary@google.com, scroggo@google.com
NOTREECHECKS=true
NOTRY=true
BUG=
Author: reed@google.com
Review URL: https://codereview.chromium.org/137133003
git-svn-id: http://skia.googlecode.com/svn/trunk@13056 2bbb7eff-a529-9590-31e7-b0007b416f81
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/MallocPixelRefTest.cpp | 2 | ||||
| -rw-r--r-- | tests/PixelRefTest.cpp | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/tests/MallocPixelRefTest.cpp b/tests/MallocPixelRefTest.cpp index 62d1e9d687..e169763dad 100644 --- a/tests/MallocPixelRefTest.cpp +++ b/tests/MallocPixelRefTest.cpp @@ -23,7 +23,7 @@ static void set_to_one_proc(void*, void* context) { */ DEF_TEST(MallocPixelRef, reporter) { REPORTER_ASSERT(reporter, true); - SkImageInfo info = SkImageInfo::MakePMPremul(10, 13); + SkImageInfo info = {10, 13, kPMColor_SkColorType, kPremul_SkAlphaType}; { SkAutoTUnref<SkMallocPixelRef> pr( SkMallocPixelRef::NewAllocate(info, info.minRowBytes() - 1, NULL)); diff --git a/tests/PixelRefTest.cpp b/tests/PixelRefTest.cpp index 3486898239..e0ffd7a601 100644 --- a/tests/PixelRefTest.cpp +++ b/tests/PixelRefTest.cpp @@ -51,7 +51,7 @@ private: } // namespace DEF_TEST(PixelRef_GenIDChange, r) { - SkImageInfo info = SkImageInfo::MakePMPremul(10, 10); + SkImageInfo info = { 10, 10, kPMColor_SkColorType, kPremul_SkAlphaType }; SkAutoTUnref<SkPixelRef> pixelRef(SkMallocPixelRef::NewAllocate(info, 0, NULL)); |