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

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

Issue 1019493002: Remove uniqueID from all filter serialization. (Closed) Base URL: https://skia.googlesource.com/skia.git@master
Patch Set: Null out fUniqueID deserialization 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 | « include/effects/SkDisplacementMapEffect.h ('k') | include/effects/SkLightingImageFilter.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 #include "SkColor.h" 8 #include "SkColor.h"
9 #include "SkImageFilter.h" 9 #include "SkImageFilter.h"
10 #include "SkScalar.h" 10 #include "SkScalar.h"
11 11
12 class SK_API SkDropShadowImageFilter : public SkImageFilter { 12 class SK_API SkDropShadowImageFilter : public SkImageFilter {
13 public: 13 public:
14 enum ShadowMode { 14 enum ShadowMode {
15 kDrawShadowAndForeground_ShadowMode, 15 kDrawShadowAndForeground_ShadowMode,
16 kDrawShadowOnly_ShadowMode, 16 kDrawShadowOnly_ShadowMode,
17 17
18 kLast_ShadowMode = kDrawShadowOnly_ShadowMode 18 kLast_ShadowMode = kDrawShadowOnly_ShadowMode
19 }; 19 };
20 20
21 static const int kShadowModeCount = kLast_ShadowMode+1; 21 static const int kShadowModeCount = kLast_ShadowMode+1;
22 22
23 /** @deprecated use another Create function below instead */ 23 /** @deprecated use another Create function below instead */
24 static SkDropShadowImageFilter* Create(SkScalar dx, SkScalar dy, 24 static SkDropShadowImageFilter* Create(SkScalar dx, SkScalar dy,
25 SkScalar sigmaX, SkScalar sigmaY, SkC olor color, 25 SkScalar sigmaX, SkScalar sigmaY, SkC olor color,
26 SkImageFilter* input = NULL, 26 SkImageFilter* input = NULL,
27 const CropRect* cropRect = NULL, 27 const CropRect* cropRect = NULL) {
28 uint32_t uniqueID = 0) {
29 return SkNEW_ARGS(SkDropShadowImageFilter, (dx, dy, sigmaX, sigmaY, colo r, 28 return SkNEW_ARGS(SkDropShadowImageFilter, (dx, dy, sigmaX, sigmaY, colo r,
30 kDrawShadowAndForeground_Sha dowMode, 29 kDrawShadowAndForeground_Sha dowMode,
31 input, cropRect, uniqueID)); 30 input, cropRect));
32 } 31 }
33 32
34 static SkDropShadowImageFilter* Create(SkScalar dx, SkScalar dy, 33 static SkDropShadowImageFilter* Create(SkScalar dx, SkScalar dy,
35 SkScalar sigmaX, SkScalar sigmaY, SkC olor color, 34 SkScalar sigmaX, SkScalar sigmaY, SkC olor color,
36 ShadowMode shadowMode, 35 ShadowMode shadowMode,
37 SkImageFilter* input, 36 SkImageFilter* input,
38 const CropRect* cropRect, 37 const CropRect* cropRect,
39 uint32_t uniqueID) { 38 uint32_t = 0) {
40 return SkNEW_ARGS(SkDropShadowImageFilter, (dx, dy, sigmaX, sigmaY, colo r, 39 return SkNEW_ARGS(SkDropShadowImageFilter, (dx, dy, sigmaX, sigmaY, colo r,
41 shadowMode, input, cropRect, uniqueID)); 40 shadowMode, input, cropRect) );
42 } 41 }
43 42
44 static SkDropShadowImageFilter* Create(SkScalar dx, SkScalar dy, 43 static SkDropShadowImageFilter* Create(SkScalar dx, SkScalar dy,
45 SkScalar sigmaX, SkScalar sigmaY, SkC olor color, 44 SkScalar sigmaX, SkScalar sigmaY, SkC olor color,
46 ShadowMode shadowMode) { 45 ShadowMode shadowMode) {
47 return SkNEW_ARGS(SkDropShadowImageFilter, (dx, dy, sigmaX, sigmaY, colo r, 46 return SkNEW_ARGS(SkDropShadowImageFilter, (dx, dy, sigmaX, sigmaY, colo r,
48 shadowMode, NULL, NULL, 0)); 47 shadowMode, NULL, NULL));
49 } 48 }
50 49
51 void computeFastBounds(const SkRect&, SkRect*) const SK_OVERRIDE; 50 void computeFastBounds(const SkRect&, SkRect*) const SK_OVERRIDE;
52 SK_TO_STRING_OVERRIDE() 51 SK_TO_STRING_OVERRIDE()
53 SK_DECLARE_PUBLIC_FLATTENABLE_DESERIALIZATION_PROCS(SkDropShadowImageFilter) 52 SK_DECLARE_PUBLIC_FLATTENABLE_DESERIALIZATION_PROCS(SkDropShadowImageFilter)
54 53
55 protected: 54 protected:
56 SkDropShadowImageFilter(SkScalar dx, SkScalar dy, SkScalar sigmaX, SkScalar sigmaY, SkColor, 55 SkDropShadowImageFilter(SkScalar dx, SkScalar dy, SkScalar sigmaX, SkScalar sigmaY, SkColor,
57 ShadowMode shadowMode, SkImageFilter* input, const C ropRect* cropRect, 56 ShadowMode shadowMode, SkImageFilter* input, const C ropRect* cropRect);
58 uint32_t uniqueID);
59 void flatten(SkWriteBuffer&) const SK_OVERRIDE; 57 void flatten(SkWriteBuffer&) const SK_OVERRIDE;
60 bool onFilterImage(Proxy*, const SkBitmap& source, const Context&, SkBitmap* result, SkIPoint* loc) const SK_OVERRIDE; 58 bool onFilterImage(Proxy*, const SkBitmap& source, const Context&, SkBitmap* result, SkIPoint* loc) const SK_OVERRIDE;
61 virtual bool onFilterBounds(const SkIRect& src, const SkMatrix&, 59 virtual bool onFilterBounds(const SkIRect& src, const SkMatrix&,
62 SkIRect* dst) const SK_OVERRIDE; 60 SkIRect* dst) const SK_OVERRIDE;
63 61
64 private: 62 private:
65 SkScalar fDx, fDy, fSigmaX, fSigmaY; 63 SkScalar fDx, fDy, fSigmaX, fSigmaY;
66 SkColor fColor; 64 SkColor fColor;
67 ShadowMode fShadowMode; 65 ShadowMode fShadowMode;
68 typedef SkImageFilter INHERITED; 66 typedef SkImageFilter INHERITED;
69 }; 67 };
OLDNEW
« no previous file with comments | « include/effects/SkDisplacementMapEffect.h ('k') | include/effects/SkLightingImageFilter.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698