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

Side by Side Diff: include/core/SkPixelRef.h

Issue 25430005: Fix for potential typedef issue Base URL: https://skia.googlecode.com/svn/trunk
Patch Set: Created 7 years, 2 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 | Annotate | Revision Log
« no previous file with comments | « include/core/SkPathEffect.h ('k') | include/core/SkRasterizer.h » ('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 /* 2 /*
3 * Copyright 2008 The Android Open Source Project 3 * Copyright 2008 The Android Open Source Project
4 * 4 *
5 * Use of this source code is governed by a BSD-style license that can be 5 * Use of this source code is governed by a BSD-style license that can be
6 * found in the LICENSE file. 6 * found in the LICENSE file.
7 */ 7 */
8 8
9 9
10 #ifndef SkPixelRef_DEFINED 10 #ifndef SkPixelRef_DEFINED
(...skipping 27 matching lines...) Expand all
38 38
39 /** \class SkPixelRef 39 /** \class SkPixelRef
40 40
41 This class is the smart container for pixel memory, and is used with 41 This class is the smart container for pixel memory, and is used with
42 SkBitmap. A pixelref is installed into a bitmap, and then the bitmap can 42 SkBitmap. A pixelref is installed into a bitmap, and then the bitmap can
43 access the actual pixel memory by calling lockPixels/unlockPixels. 43 access the actual pixel memory by calling lockPixels/unlockPixels.
44 44
45 This class can be shared/accessed between multiple threads. 45 This class can be shared/accessed between multiple threads.
46 */ 46 */
47 class SK_API SkPixelRef : public SkFlattenable { 47 class SK_API SkPixelRef : public SkFlattenable {
48 typedef SkFlattenable INHERITED;
49
48 public: 50 public:
49 SK_DECLARE_INST_COUNT(SkPixelRef) 51 SK_DECLARE_INST_COUNT(SkPixelRef)
50 52
51 explicit SkPixelRef(SkBaseMutex* mutex = NULL); 53 explicit SkPixelRef(SkBaseMutex* mutex = NULL);
52 54
53 /** Return the pixel memory returned from lockPixels, or null if the 55 /** Return the pixel memory returned from lockPixels, or null if the
54 lockCount is 0. 56 lockCount is 0.
55 */ 57 */
56 void* pixels() const { return fPixels; } 58 void* pixels() const { return fPixels; }
57 59
(...skipping 207 matching lines...) Expand 10 before | Expand all | Expand 10 after
265 friend class SkBitmap; 267 friend class SkBitmap;
266 268
267 SkString fURI; 269 SkString fURI;
268 270
269 // can go from false to true, but never from true to false 271 // can go from false to true, but never from true to false
270 bool fIsImmutable; 272 bool fIsImmutable;
271 // only ever set in constructor, const after that 273 // only ever set in constructor, const after that
272 bool fPreLocked; 274 bool fPreLocked;
273 275
274 void setMutex(SkBaseMutex* mutex); 276 void setMutex(SkBaseMutex* mutex);
275
276 typedef SkFlattenable INHERITED;
277 }; 277 };
278 278
279 #endif 279 #endif
OLDNEW
« no previous file with comments | « include/core/SkPathEffect.h ('k') | include/core/SkRasterizer.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698