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

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

Issue 1037793002: C++11 override should now be supported by all of {bots,Chrome,Android,Mozilla} (Closed) Base URL: https://skia.googlesource.com/skia@master
Patch Set: git cl web Created 5 years, 8 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/images/SkScaledBitmapSampler.cpp ('k') | src/lazy/SkDiscardableMemoryPool.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 SkCachingPixelRef_DEFINED 8 #ifndef SkCachingPixelRef_DEFINED
9 #define SkCachingPixelRef_DEFINED 9 #define SkCachingPixelRef_DEFINED
10 10
(...skipping 24 matching lines...) Expand all
35 * 35 *
36 * If Install fails or when the SkCachingPixelRef that is 36 * If Install fails or when the SkCachingPixelRef that is
37 * installed into destination is destroyed, it will call 37 * installed into destination is destroyed, it will call
38 * SkDELETE() on the generator. Therefore, generator should be 38 * SkDELETE() on the generator. Therefore, generator should be
39 * allocated with SkNEW() or SkNEW_ARGS(). 39 * allocated with SkNEW() or SkNEW_ARGS().
40 */ 40 */
41 static bool Install(SkImageGenerator* gen, SkBitmap* dst); 41 static bool Install(SkImageGenerator* gen, SkBitmap* dst);
42 42
43 protected: 43 protected:
44 virtual ~SkCachingPixelRef(); 44 virtual ~SkCachingPixelRef();
45 bool onNewLockPixels(LockRec*) SK_OVERRIDE; 45 bool onNewLockPixels(LockRec*) override;
46 void onUnlockPixels() SK_OVERRIDE; 46 void onUnlockPixels() override;
47 bool onLockPixelsAreWritable() const SK_OVERRIDE { return false; } 47 bool onLockPixelsAreWritable() const override { return false; }
48 48
49 SkData* onRefEncodedData() SK_OVERRIDE { 49 SkData* onRefEncodedData() override {
50 return fImageGenerator->refEncodedData(); 50 return fImageGenerator->refEncodedData();
51 } 51 }
52 52
53 private: 53 private:
54 SkImageGenerator* const fImageGenerator; 54 SkImageGenerator* const fImageGenerator;
55 bool fErrorInDecoding; 55 bool fErrorInDecoding;
56 const size_t fRowBytes; 56 const size_t fRowBytes;
57 57
58 SkBitmap fLockedBitmap; 58 SkBitmap fLockedBitmap;
59 59
60 SkCachingPixelRef(const SkImageInfo&, SkImageGenerator*, size_t rowBytes); 60 SkCachingPixelRef(const SkImageInfo&, SkImageGenerator*, size_t rowBytes);
61 61
62 typedef SkPixelRef INHERITED; 62 typedef SkPixelRef INHERITED;
63 }; 63 };
64 64
65 #endif // SkCachingPixelRef_DEFINED 65 #endif // SkCachingPixelRef_DEFINED
OLDNEW
« no previous file with comments | « src/images/SkScaledBitmapSampler.cpp ('k') | src/lazy/SkDiscardableMemoryPool.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698