Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(89)

Side by Side Diff: src/lazy/SkDiscardablePixelRef.h

Issue 940323003: Revert of Make SkPixelRef::isLocked() debug-only, remove related dead code. (Closed) Base URL: https://skia.googlesource.com/skia.git@master
Patch Set: Created 5 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « src/core/SkPixelRef.cpp ('k') | src/lazy/SkDiscardablePixelRef.cpp » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 /* 1 /*
2 * Copyright 2013 Google Inc. 2 * Copyright 2013 Google Inc.
3 * 3 *
4 * Use of this source code is governed by a BSD-style license that can be 4 * Use of this source code is governed by a BSD-style license that can be
5 * found in the LICENSE file. 5 * found in the LICENSE file.
6 */ 6 */
7 7
8 #ifndef SkDiscardablePixelRef_DEFINED 8 #ifndef SkDiscardablePixelRef_DEFINED
9 #define SkDiscardablePixelRef_DEFINED 9 #define SkDiscardablePixelRef_DEFINED
10 10
(...skipping 23 matching lines...) Expand all
34 } 34 }
35 35
36 private: 36 private:
37 SkImageGenerator* const fGenerator; 37 SkImageGenerator* const fGenerator;
38 SkDiscardableMemory::Factory* const fDMFactory; 38 SkDiscardableMemory::Factory* const fDMFactory;
39 const size_t fRowBytes; 39 const size_t fRowBytes;
40 // These const members should not change over the life of the 40 // These const members should not change over the life of the
41 // PixelRef, since the SkBitmap doesn't expect them to change. 41 // PixelRef, since the SkBitmap doesn't expect them to change.
42 42
43 SkDiscardableMemory* fDiscardableMemory; 43 SkDiscardableMemory* fDiscardableMemory;
44 bool fDiscardableMemoryIsLocked;
45 SkAutoTUnref<SkColorTable> fCTable; 44 SkAutoTUnref<SkColorTable> fCTable;
46 45
47 /* Takes ownership of SkImageGenerator. */ 46 /* Takes ownership of SkImageGenerator. */
48 SkDiscardablePixelRef(const SkImageInfo&, SkImageGenerator*, 47 SkDiscardablePixelRef(const SkImageInfo&, SkImageGenerator*,
49 size_t rowBytes, 48 size_t rowBytes,
50 SkDiscardableMemory::Factory* factory); 49 SkDiscardableMemory::Factory* factory);
51 50
52 virtual bool onGetYUV8Planes(SkISize sizes[3], 51 virtual bool onGetYUV8Planes(SkISize sizes[3],
53 void* planes[3], 52 void* planes[3],
54 size_t rowBytes[3], 53 size_t rowBytes[3],
55 SkYUVColorSpace* colorSpace) SK_OVERRIDE { 54 SkYUVColorSpace* colorSpace) SK_OVERRIDE {
56 return fGenerator->getYUV8Planes(sizes, planes, rowBytes, colorSpace); 55 return fGenerator->getYUV8Planes(sizes, planes, rowBytes, colorSpace);
57 } 56 }
58 57
59 friend bool SkInstallDiscardablePixelRef(SkImageGenerator*, SkBitmap*, 58 friend bool SkInstallDiscardablePixelRef(SkImageGenerator*, SkBitmap*,
60 SkDiscardableMemory::Factory*); 59 SkDiscardableMemory::Factory*);
61 60
62 typedef SkPixelRef INHERITED; 61 typedef SkPixelRef INHERITED;
63 }; 62 };
64 63
65 #endif // SkDiscardablePixelRef_DEFINED 64 #endif // SkDiscardablePixelRef_DEFINED
OLDNEW
« no previous file with comments | « src/core/SkPixelRef.cpp ('k') | src/lazy/SkDiscardablePixelRef.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698