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

Side by Side Diff: src/effects/SkBlurMaskFilter.cpp

Issue 25430005: Fix for potential typedef issue Base URL: https://skia.googlecode.com/svn/trunk
Patch Set: 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 | « src/core/SkXfermode.cpp ('k') | src/effects/SkColorFilters.cpp » ('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 /* 2 /*
3 * Copyright 2006 The Android Open Source Project 3 * Copyright 2006 The Android Open Source Project
4 * 4 *
5 * Use of this source code is governed by a BSD-style license that can be 5 * Use of this source code is governed by a BSD-style license that can be
6 * found in the LICENSE file. 6 * found in the LICENSE file.
7 */ 7 */
8 8
9 #include "SkBlurMaskFilter.h" 9 #include "SkBlurMaskFilter.h"
10 #include "SkBlurMask.h" 10 #include "SkBlurMask.h"
11 #include "SkGpuBlurUtils.h" 11 #include "SkGpuBlurUtils.h"
12 #include "SkFlattenableBuffers.h" 12 #include "SkFlattenableBuffers.h"
13 #include "SkMaskFilter.h" 13 #include "SkMaskFilter.h"
14 #include "SkRTConf.h" 14 #include "SkRTConf.h"
15 #include "SkStringUtils.h" 15 #include "SkStringUtils.h"
16 #include "SkStrokeRec.h" 16 #include "SkStrokeRec.h"
17 17
18 #if SK_SUPPORT_GPU 18 #if SK_SUPPORT_GPU
19 #include "GrContext.h" 19 #include "GrContext.h"
20 #include "GrTexture.h" 20 #include "GrTexture.h"
21 #include "effects/GrSimpleTextureEffect.h" 21 #include "effects/GrSimpleTextureEffect.h"
22 #include "SkGrPixelRef.h" 22 #include "SkGrPixelRef.h"
23 #endif 23 #endif
24 24
25 class SkBlurMaskFilterImpl : public SkMaskFilter { 25 class SkBlurMaskFilterImpl : public SkMaskFilter {
26 typedef SkMaskFilter INHERITED;
27
26 public: 28 public:
27 SkBlurMaskFilterImpl(SkScalar sigma, SkBlurMaskFilter::BlurStyle, uint32_t f lags); 29 SkBlurMaskFilterImpl(SkScalar sigma, SkBlurMaskFilter::BlurStyle, uint32_t f lags);
28 30
29 // overrides from SkMaskFilter 31 // overrides from SkMaskFilter
30 virtual SkMask::Format getFormat() const SK_OVERRIDE; 32 virtual SkMask::Format getFormat() const SK_OVERRIDE;
31 virtual bool filterMask(SkMask* dst, const SkMask& src, const SkMatrix&, 33 virtual bool filterMask(SkMask* dst, const SkMask& src, const SkMatrix&,
32 SkIPoint* margin) const SK_OVERRIDE; 34 SkIPoint* margin) const SK_OVERRIDE;
33 35
34 #if SK_SUPPORT_GPU 36 #if SK_SUPPORT_GPU
35 virtual bool canFilterMaskGPU(const SkRect& devBounds, 37 virtual bool canFilterMaskGPU(const SkRect& devBounds,
(...skipping 31 matching lines...) Expand 10 before | Expand all | Expand 10 after
67 69
68 SkBlurMaskFilterImpl(SkFlattenableReadBuffer&); 70 SkBlurMaskFilterImpl(SkFlattenableReadBuffer&);
69 virtual void flatten(SkFlattenableWriteBuffer&) const SK_OVERRIDE; 71 virtual void flatten(SkFlattenableWriteBuffer&) const SK_OVERRIDE;
70 72
71 SkScalar computeXformedSigma(const SkMatrix& ctm) const { 73 SkScalar computeXformedSigma(const SkMatrix& ctm) const {
72 bool ignoreTransform = SkToBool(fBlurFlags & SkBlurMaskFilter::kIgnoreTr ansform_BlurFlag); 74 bool ignoreTransform = SkToBool(fBlurFlags & SkBlurMaskFilter::kIgnoreTr ansform_BlurFlag);
73 75
74 SkScalar xformedSigma = ignoreTransform ? fSigma : ctm.mapRadius(fSigma) ; 76 SkScalar xformedSigma = ignoreTransform ? fSigma : ctm.mapRadius(fSigma) ;
75 return SkMinScalar(xformedSigma, kMAX_BLUR_SIGMA); 77 return SkMinScalar(xformedSigma, kMAX_BLUR_SIGMA);
76 } 78 }
77
78 typedef SkMaskFilter INHERITED;
79 }; 79 };
80 80
81 const SkScalar SkBlurMaskFilterImpl::kMAX_BLUR_SIGMA = SkIntToScalar(128); 81 const SkScalar SkBlurMaskFilterImpl::kMAX_BLUR_SIGMA = SkIntToScalar(128);
82 82
83 SkMaskFilter* SkBlurMaskFilter::Create(SkScalar radius, 83 SkMaskFilter* SkBlurMaskFilter::Create(SkScalar radius,
84 SkBlurMaskFilter::BlurStyle style, 84 SkBlurMaskFilter::BlurStyle style,
85 uint32_t flags) { 85 uint32_t flags) {
86 // use !(radius > 0) instead of radius <= 0 to reject NaN values 86 // use !(radius > 0) instead of radius <= 0 to reject NaN values
87 if (!(radius > 0) || (unsigned)style >= SkBlurMaskFilter::kBlurStyleCount 87 if (!(radius > 0) || (unsigned)style >= SkBlurMaskFilter::kBlurStyleCount
88 || flags > SkBlurMaskFilter::kAll_BlurFlag) { 88 || flags > SkBlurMaskFilter::kAll_BlurFlag) {
(...skipping 384 matching lines...) Expand 10 before | Expand all | Expand 10 after
473 } else { 473 } else {
474 str->append("None"); 474 str->append("None");
475 } 475 }
476 str->append("))"); 476 str->append("))");
477 } 477 }
478 #endif 478 #endif
479 479
480 SK_DEFINE_FLATTENABLE_REGISTRAR_GROUP_START(SkBlurMaskFilter) 480 SK_DEFINE_FLATTENABLE_REGISTRAR_GROUP_START(SkBlurMaskFilter)
481 SK_DEFINE_FLATTENABLE_REGISTRAR_ENTRY(SkBlurMaskFilterImpl) 481 SK_DEFINE_FLATTENABLE_REGISTRAR_ENTRY(SkBlurMaskFilterImpl)
482 SK_DEFINE_FLATTENABLE_REGISTRAR_GROUP_END 482 SK_DEFINE_FLATTENABLE_REGISTRAR_GROUP_END
OLDNEW
« no previous file with comments | « src/core/SkXfermode.cpp ('k') | src/effects/SkColorFilters.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698