diff options
| author |  reed <reed@chromium.org> | 2015-05-29 18:36:07 -0700 |
|---|---|---|
| committer |  Commit bot <commit-bot@chromium.org> | 2015-05-29 18:36:07 -0700 |
| commit | 19663e54c017499406036746e7689193aa6417e6 (patch) | |
| tree | 75e4863a6fa83d35c519a3103a9d2c94520dbd1e /tests/PixelRefTest.cpp | |
| parent | 6980f5a96455c8062403c995a64b654a0e9a1319 (diff) | |
Revert of add asserts around results from requestLock (patchset #3 id:40001 of https://codereview.chromium.or… (patchset #1 id:1 of https://codereview.chromium.org/1165583005/)
Reason for revert:
failure in cc_unittests (need to diagnose)
@@@STEP_LOG_LINE@ResourceProviderTests_ResourceProviderTest.TransferInvalidSoftware_1@ResourceProviderTests/ResourceProviderTest.TransferInvalidSoftware/1 (run #1):@@@
@@@STEP_LOG_LINE@ResourceProviderTests_ResourceProviderTest.TransferInvalidSoftware_1@[ RUN ] ResourceProviderTests/ResourceProviderTest.TransferInvalidSoftware/1@@@
@@@STEP_LOG_LINE@ResourceProviderTests_ResourceProviderTest.TransferInvalidSoftware_1@[17114:17114:0529/180822:15336467671:INFO:SkPixelRef.cpp(168)] ../../third_party/skia/src/core/SkPixelRef.cpp:168: failed assertion "pixels"@@@
Original issue's description:
> add asserts around results from requestLock (patchset #3 id:40001 of https://codereview.chromium.org/1155403003/)"
>
> This reverts commit 3953d360417655b8000df0951699121383db45c3.
>
> BUG=skia:
> TBR=
>
> Committed: https://skia.googlesource.com/skia/+/6980f5a96455c8062403c995a64b654a0e9a1319
TBR=
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true
BUG=skia:
Review URL: https://codereview.chromium.org/1151573009
Diffstat (limited to 'tests/PixelRefTest.cpp')
| -rw-r--r-- | tests/PixelRefTest.cpp | 16 |
1 files changed, 0 insertions, 16 deletions
diff --git a/tests/PixelRefTest.cpp b/tests/PixelRefTest.cpp index 30575ba8d5..e13d0e07e5 100644 --- a/tests/PixelRefTest.cpp +++ b/tests/PixelRefTest.cpp @@ -1,22 +1,8 @@ -/* - * Copyright 2015 Google Inc. - * - * Use of this source code is governed by a BSD-style license that can be - * found in the LICENSE file. - */ - #include "Test.h" #include "SkMallocPixelRef.h" #include "SkPixelRef.h" -static void test_install(skiatest::Reporter* reporter) { - SkImageInfo info = SkImageInfo::MakeN32Premul(0, 0); - SkBitmap bm; - // make sure we don't assert on an empty install - bm.installPixels(info, NULL, 0); -} - class TestListener : public SkPixelRef::GenIDChangeListener { public: explicit TestListener(int* ptr) : fPtr(ptr) {} @@ -57,6 +43,4 @@ DEF_TEST(PixelRef_GenIDChange, r) { REPORTER_ASSERT(r, 0 != pixelRef->getGenerationID()); pixelRef->addGenIDChangeListener(NULL); pixelRef->notifyPixelsChanged(); - - test_install(r); } |