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

Side by Side Diff: include/effects/SkMergeImageFilter.h

Issue 26371002: Change SkImageFilter's cropRect from SkIRect to a CropRect struct (Closed) Base URL: https://skia.googlecode.com/svn/trunk
Patch Set: Alternate version, using a single fFlags member. Created 7 years, 2 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 | Annotate | Revision Log
« no previous file with comments | « include/effects/SkLightingImageFilter.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
11 #include "SkImageFilter.h" 11 #include "SkImageFilter.h"
12 12
13 #include "SkXfermode.h" 13 #include "SkXfermode.h"
14 14
15 class SK_API SkMergeImageFilter : public SkImageFilter { 15 class SK_API SkMergeImageFilter : public SkImageFilter {
16 public: 16 public:
17 SkMergeImageFilter(SkImageFilter* first, SkImageFilter* second, 17 SkMergeImageFilter(SkImageFilter* first, SkImageFilter* second,
18 SkXfermode::Mode = SkXfermode::kSrcOver_Mode, 18 SkXfermode::Mode = SkXfermode::kSrcOver_Mode,
19 const SkIRect* cropRect = NULL); 19 const CropRect* cropRect = NULL);
20 SkMergeImageFilter(SkImageFilter* filters[], int count, 20 SkMergeImageFilter(SkImageFilter* filters[], int count,
21 const SkXfermode::Mode modes[] = NULL, 21 const SkXfermode::Mode modes[] = NULL,
22 const SkIRect* cropRect = NULL); 22 const CropRect* cropRect = NULL);
23 virtual ~SkMergeImageFilter(); 23 virtual ~SkMergeImageFilter();
24 24
25 SK_DECLARE_PUBLIC_FLATTENABLE_DESERIALIZATION_PROCS(SkMergeImageFilter) 25 SK_DECLARE_PUBLIC_FLATTENABLE_DESERIALIZATION_PROCS(SkMergeImageFilter)
26 26
27 protected: 27 protected:
28 SkMergeImageFilter(SkFlattenableReadBuffer& buffer); 28 SkMergeImageFilter(SkFlattenableReadBuffer& buffer);
29 virtual void flatten(SkFlattenableWriteBuffer&) const SK_OVERRIDE; 29 virtual void flatten(SkFlattenableWriteBuffer&) const SK_OVERRIDE;
30 30
31 virtual bool onFilterImage(Proxy*, const SkBitmap& src, const SkMatrix&, 31 virtual bool onFilterImage(Proxy*, const SkBitmap& src, const SkMatrix&,
32 SkBitmap* result, SkIPoint* loc) SK_OVERRIDE; 32 SkBitmap* result, SkIPoint* loc) SK_OVERRIDE;
33 virtual bool onFilterBounds(const SkIRect&, const SkMatrix&, SkIRect*) SK_OV ERRIDE; 33 virtual bool onFilterBounds(const SkIRect&, const SkMatrix&, SkIRect*) SK_OV ERRIDE;
34 34
35 private: 35 private:
36 uint8_t* fModes; // SkXfermode::Mode 36 uint8_t* fModes; // SkXfermode::Mode
37 37
38 // private storage, to avoid dynamically allocating storage for our copy 38 // private storage, to avoid dynamically allocating storage for our copy
39 // of the modes (unless the count is so large we can't fit). 39 // of the modes (unless the count is so large we can't fit).
40 intptr_t fStorage[16]; 40 intptr_t fStorage[16];
41 41
42 void initAllocModes(); 42 void initAllocModes();
43 void initModes(const SkXfermode::Mode []); 43 void initModes(const SkXfermode::Mode []);
44 44
45 typedef SkImageFilter INHERITED; 45 typedef SkImageFilter INHERITED;
46 }; 46 };
47 47
48 #endif 48 #endif
OLDNEW
« no previous file with comments | « include/effects/SkLightingImageFilter.h ('k') | include/effects/SkMorphologyImageFilter.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698