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 /include | |
| 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 'include')
| -rw-r--r-- | include/core/SkPixelRef.h | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/include/core/SkPixelRef.h b/include/core/SkPixelRef.h index 3898269ef4..7c3156ee74 100644 --- a/include/core/SkPixelRef.h +++ b/include/core/SkPixelRef.h @@ -75,8 +75,6 @@ public: * Calling lockPixels returns a LockRec struct (on success). */ struct LockRec { - LockRec() : fPixels(NULL), fColorTable(NULL) {} - void* fPixels; SkColorTable* fColorTable; size_t fRowBytes; @@ -201,13 +199,11 @@ public: }; struct LockResult { - LockResult() : fPixels(NULL), fCTable(NULL) {} - void (*fUnlockProc)(void* ctx); void* fUnlockContext; - const void* fPixels; SkColorTable* fCTable; // should be NULL unless colortype is kIndex8 + const void* fPixels; size_t fRowBytes; SkISize fSize; @@ -349,7 +345,7 @@ private: LockRec fRec; int fLockCount; - bool lockPixelsInsideMutex(); + bool lockPixelsInsideMutex(LockRec* rec); // Bottom bit indicates the Gen ID is unique. bool genIDIsUnique() const { return SkToBool(fTaggedGenID.load() & 1); } |