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

Side by Side Diff: include/effects/SkComposeImageFilter.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/SkColorMatrixFilter.h ('k') | include/effects/SkCornerPathEffect.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 SkComposeImageFilter_DEFINED 8 #ifndef SkComposeImageFilter_DEFINED
9 #define SkComposeImageFilter_DEFINED 9 #define SkComposeImageFilter_DEFINED
10 10
(...skipping 17 matching lines...) Expand all
28 SK_TO_STRING_OVERRIDE() 28 SK_TO_STRING_OVERRIDE()
29 SK_DECLARE_PUBLIC_FLATTENABLE_DESERIALIZATION_PROCS(SkComposeImageFilter) 29 SK_DECLARE_PUBLIC_FLATTENABLE_DESERIALIZATION_PROCS(SkComposeImageFilter)
30 30
31 protected: 31 protected:
32 explicit SkComposeImageFilter(SkImageFilter* inputs[2]) : INHERITED(2, input s) { 32 explicit SkComposeImageFilter(SkImageFilter* inputs[2]) : INHERITED(2, input s) {
33 SkASSERT(inputs[0]); 33 SkASSERT(inputs[0]);
34 SkASSERT(inputs[1]); 34 SkASSERT(inputs[1]);
35 } 35 }
36 virtual bool onFilterImage(Proxy*, const SkBitmap& src, const Context&, 36 virtual bool onFilterImage(Proxy*, const SkBitmap& src, const Context&,
37 SkBitmap* result, SkIPoint* loc) const SK_OVERRID E; 37 SkBitmap* result, SkIPoint* loc) const SK_OVERRID E;
38 virtual bool onFilterBounds(const SkIRect&, const SkMatrix&, SkIRect*) const SK_OVERRIDE; 38 bool onFilterBounds(const SkIRect&, const SkMatrix&, SkIRect*) const SK_OVER RIDE;
39 39
40 private: 40 private:
41 typedef SkImageFilter INHERITED; 41 typedef SkImageFilter INHERITED;
42 }; 42 };
43 43
44 #endif 44 #endif
OLDNEW
« no previous file with comments | « include/effects/SkColorMatrixFilter.h ('k') | include/effects/SkCornerPathEffect.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698