AuroraMiddleware/skia2
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

SK_SUPPORT_LEGACY_DRAWFLTER typo

Browse Source 
s/FLTER/FILTER/

R=reed@google.com
GOLD_TRYBOT_URL= https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&issue=1634573002

Review URL: https://codereview.chromium.org/1634573002
This commit is contained in:
fmalita 2016-01-25 06:23:54 -08:00 committed by Commit bot
parent 1517f93439
commit 53d9f1cfbd
5 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
gyp/skia_for_android_framework_defines.gypi
View File

@ -18,7 +18,7 @@
'SK_SUPPORT_LEGACY_CLIPTOLAYERFLAG', 'SK_SUPPORT_LEGACY_CLIPTOLAYERFLAG',
'SK_IGNORE_LINEONLY_AA_CONVEX_PATH_OPTS', 'SK_IGNORE_LINEONLY_AA_CONVEX_PATH_OPTS',
'SK_SUPPORT_LEGACY_GRADIENT_DITHERING', 'SK_SUPPORT_LEGACY_GRADIENT_DITHERING',
'SK_SUPPORT_LEGACY_DRAWFLTER', 'SK_SUPPORT_LEGACY_DRAWFILTER',
], ],
}, },
} }

6
include/core/SkCanvas.h
View File

@ -1150,12 +1150,12 @@ public:
////////////////////////////////////////////////////////////////////////// //////////////////////////////////////////////////////////////////////////
#ifdef SK_INTERNAL #ifdef SK_INTERNAL
#ifndef SK_SUPPORT_LEGACY_DRAWFLTER #ifndef SK_SUPPORT_LEGACY_DRAWFILTER
#define SK_SUPPORT_LEGACY_DRAWFLTER #define SK_SUPPORT_LEGACY_DRAWFILTER
#endif #endif
#endif #endif
#ifdef SK_SUPPORT_LEGACY_DRAWFLTER #ifdef SK_SUPPORT_LEGACY_DRAWFILTER
/** Get the current filter object. The filter's reference count is not /** Get the current filter object. The filter's reference count is not
affected. The filter is saved/restored, just like the matrix and clip. affected. The filter is saved/restored, just like the matrix and clip.
@return the canvas' filter (or NULL). @return the canvas' filter (or NULL).

2
include/utils/SkNWayCanvas.h
View File

@ -24,7 +24,7 @@ public:
/////////////////////////////////////////////////////////////////////////// ///////////////////////////////////////////////////////////////////////////
// These are forwarded to the N canvases we're referencing // These are forwarded to the N canvases we're referencing
#ifdef SK_SUPPORT_LEGACY_DRAWFLTER #ifdef SK_SUPPORT_LEGACY_DRAWFILTER
SkDrawFilter* setDrawFilter(SkDrawFilter*) override; SkDrawFilter* setDrawFilter(SkDrawFilter*) override;
#endif #endif

4
src/core/SkCanvas.cpp
View File

@ -444,7 +444,7 @@ public:
bool skipLayerForImageFilter = false, bool skipLayerForImageFilter = false,
const SkRect* rawBounds = nullptr) : fOrigPaint(paint) { const SkRect* rawBounds = nullptr) : fOrigPaint(paint) {
fCanvas = canvas; fCanvas = canvas;
#ifdef SK_SUPPORT_LEGACY_DRAWFLTER #ifdef SK_SUPPORT_LEGACY_DRAWFILTER
fFilter = canvas->getDrawFilter(); fFilter = canvas->getDrawFilter();
#else #else
fFilter = nullptr; fFilter = nullptr;
@ -782,7 +782,7 @@ SkCanvas::~SkCanvas() {
dec_canvas(); dec_canvas();
} }
#ifdef SK_SUPPORT_LEGACY_DRAWFLTER #ifdef SK_SUPPORT_LEGACY_DRAWFILTER
SkDrawFilter* SkCanvas::getDrawFilter() const { SkDrawFilter* SkCanvas::getDrawFilter() const {
return fMCRec->fFilter; return fMCRec->fFilter;
} }

2
src/utils/SkNWayCanvas.cpp
View File

@ -292,7 +292,7 @@ void SkNWayCanvas::onDrawPatch(const SkPoint cubics[12], const SkColor colors[4]
} }
} }
#ifdef SK_SUPPORT_LEGACY_DRAWFLTER #ifdef SK_SUPPORT_LEGACY_DRAWFILTER
SkDrawFilter* SkNWayCanvas::setDrawFilter(SkDrawFilter* filter) { SkDrawFilter* SkNWayCanvas::setDrawFilter(SkDrawFilter* filter) {
Iter iter(fList); Iter iter(fList);
while (iter.next()) { while (iter.next()) {