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

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

Issue 806653007: Fix up all the easy virtual ... SK_OVERRIDE cases. (Closed) Base URL: https://skia.googlesource.com/skia.git@master
Patch Set: rebase Created 5 years, 11 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 | « include/core/SkImageFilter.h ('k') | include/core/SkPathEffect.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 * Copyright 2008 The Android Open Source Project 2 * Copyright 2008 The Android Open Source Project
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 8
9 #ifndef SkMallocPixelRef_DEFINED 9 #ifndef SkMallocPixelRef_DEFINED
10 #define SkMallocPixelRef_DEFINED 10 #define SkMallocPixelRef_DEFINED
(...skipping 70 matching lines...) Expand 10 before | Expand all | Expand 10 after
81 size_t rowBytes, 81 size_t rowBytes,
82 SkColorTable*) SK_OVERRIDE; 82 SkColorTable*) SK_OVERRIDE;
83 }; 83 };
84 84
85 protected: 85 protected:
86 // The ownPixels version of this constructor is deprecated. 86 // The ownPixels version of this constructor is deprecated.
87 SkMallocPixelRef(const SkImageInfo&, void* addr, size_t rb, SkColorTable*, 87 SkMallocPixelRef(const SkImageInfo&, void* addr, size_t rb, SkColorTable*,
88 bool ownPixels); 88 bool ownPixels);
89 virtual ~SkMallocPixelRef(); 89 virtual ~SkMallocPixelRef();
90 90
91 virtual bool onNewLockPixels(LockRec*) SK_OVERRIDE; 91 bool onNewLockPixels(LockRec*) SK_OVERRIDE;
92 virtual void onUnlockPixels() SK_OVERRIDE; 92 void onUnlockPixels() SK_OVERRIDE;
93 virtual size_t getAllocatedSizeInBytes() const SK_OVERRIDE; 93 size_t getAllocatedSizeInBytes() const SK_OVERRIDE;
94 94
95 private: 95 private:
96 void* fStorage; 96 void* fStorage;
97 SkColorTable* fCTable; 97 SkColorTable* fCTable;
98 size_t fRB; 98 size_t fRB;
99 ReleaseProc fReleaseProc; 99 ReleaseProc fReleaseProc;
100 void* fReleaseProcContext; 100 void* fReleaseProcContext;
101 101
102 SkMallocPixelRef(const SkImageInfo&, void* addr, size_t rb, SkColorTable*, 102 SkMallocPixelRef(const SkImageInfo&, void* addr, size_t rb, SkColorTable*,
103 ReleaseProc proc, void* context); 103 ReleaseProc proc, void* context);
104 104
105 typedef SkPixelRef INHERITED; 105 typedef SkPixelRef INHERITED;
106 }; 106 };
107 107
108 108
109 #endif 109 #endif
OLDNEW
« no previous file with comments | « include/core/SkImageFilter.h ('k') | include/core/SkPathEffect.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698