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

Side by Side Diff: include/effects/SkMergeImageFilter.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/effects/SkMatrixImageFilter.h ('k') | include/effects/SkMorphologyImageFilter.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 2012 The Android Open Source Project 2 * Copyright 2012 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 #ifndef SkMergeImageFilter_DEFINED 8 #ifndef SkMergeImageFilter_DEFINED
9 #define SkMergeImageFilter_DEFINED 9 #define SkMergeImageFilter_DEFINED
10 10
(...skipping 21 matching lines...) Expand all
32 } 32 }
33 33
34 SK_TO_STRING_OVERRIDE() 34 SK_TO_STRING_OVERRIDE()
35 SK_DECLARE_PUBLIC_FLATTENABLE_DESERIALIZATION_PROCS(SkMergeImageFilter) 35 SK_DECLARE_PUBLIC_FLATTENABLE_DESERIALIZATION_PROCS(SkMergeImageFilter)
36 36
37 protected: 37 protected:
38 SkMergeImageFilter(SkImageFilter* filters[], int count, 38 SkMergeImageFilter(SkImageFilter* filters[], int count,
39 const SkXfermode::Mode modes[], 39 const SkXfermode::Mode modes[],
40 const CropRect* cropRect, 40 const CropRect* cropRect,
41 uint32_t uniqueID); 41 uint32_t uniqueID);
42 virtual void flatten(SkWriteBuffer&) const SK_OVERRIDE; 42 void flatten(SkWriteBuffer&) const SK_OVERRIDE;
43 43
44 virtual bool onFilterImage(Proxy*, const SkBitmap& src, const Context&, 44 virtual bool onFilterImage(Proxy*, const SkBitmap& src, const Context&,
45 SkBitmap* result, SkIPoint* loc) const SK_OVERRID E; 45 SkBitmap* result, SkIPoint* loc) const SK_OVERRID E;
46 46
47 private: 47 private:
48 uint8_t* fModes; // SkXfermode::Mode 48 uint8_t* fModes; // SkXfermode::Mode
49 49
50 // private storage, to avoid dynamically allocating storage for our copy 50 // private storage, to avoid dynamically allocating storage for our copy
51 // of the modes (unless the count is so large we can't fit). 51 // of the modes (unless the count is so large we can't fit).
52 intptr_t fStorage[16]; 52 intptr_t fStorage[16];
53 53
54 void initAllocModes(); 54 void initAllocModes();
55 void initModes(const SkXfermode::Mode []); 55 void initModes(const SkXfermode::Mode []);
56 56
57 typedef SkImageFilter INHERITED; 57 typedef SkImageFilter INHERITED;
58 }; 58 };
59 59
60 #endif 60 #endif
OLDNEW
« no previous file with comments | « include/effects/SkMatrixImageFilter.h ('k') | include/effects/SkMorphologyImageFilter.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698