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

Side by Side Diff: src/core/SkMipMap.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, 9 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/SkMatrixImageFilter.h ('k') | src/core/SkPictureRecord.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 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 SkMipMap_DEFINED 8 #ifndef SkMipMap_DEFINED
9 #define SkMipMap_DEFINED 9 #define SkMipMap_DEFINED
10 10
(...skipping 12 matching lines...) Expand all
23 struct Level { 23 struct Level {
24 void* fPixels; 24 void* fPixels;
25 uint32_t fRowBytes; 25 uint32_t fRowBytes;
26 uint32_t fWidth, fHeight; 26 uint32_t fWidth, fHeight;
27 float fScale; // < 1.0 27 float fScale; // < 1.0
28 }; 28 };
29 29
30 bool extractLevel(SkScalar scale, Level*) const; 30 bool extractLevel(SkScalar scale, Level*) const;
31 31
32 protected: 32 protected:
33 void onDataChange(void* oldData, void* newData) SK_OVERRIDE { 33 void onDataChange(void* oldData, void* newData) override {
34 fLevels = (Level*)newData; // could be NULL 34 fLevels = (Level*)newData; // could be NULL
35 } 35 }
36 36
37 private: 37 private:
38 Level* fLevels; 38 Level* fLevels;
39 int fCount; 39 int fCount;
40 40
41 // we take ownership of levels, and will free it with sk_free() 41 // we take ownership of levels, and will free it with sk_free()
42 SkMipMap(void* malloc, size_t size) : INHERITED(malloc, size) {} 42 SkMipMap(void* malloc, size_t size) : INHERITED(malloc, size) {}
43 SkMipMap(size_t size, SkDiscardableMemory* dm) : INHERITED(size, dm) {} 43 SkMipMap(size_t size, SkDiscardableMemory* dm) : INHERITED(size, dm) {}
44 44
45 static size_t AllocLevelsSize(int levelCount, size_t pixelSize); 45 static size_t AllocLevelsSize(int levelCount, size_t pixelSize);
46 46
47 typedef SkCachedData INHERITED; 47 typedef SkCachedData INHERITED;
48 }; 48 };
49 49
50 #endif 50 #endif
OLDNEW
« no previous file with comments | « src/core/SkMatrixImageFilter.h ('k') | src/core/SkPictureRecord.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698