SkPaint::FilterLevel -> SkFilterQuality
clone (+rebase) of https://codereview.chromium.org/1009183002/
BUG=skia:
TBR=scroggo@google.com
Review URL: https://codereview.chromium.org/1014533004
diff --git a/src/utils/SkLua.cpp b/src/utils/SkLua.cpp
index ba79933..84932cd 100644
--- a/src/utils/SkLua.cpp
+++ b/src/utils/SkLua.cpp
@@ -927,15 +927,15 @@
return 1;
}
-static int lpaint_getFilterLevel(lua_State* L) {
- SkLua(L).pushU32(get_obj<SkPaint>(L, 1)->getFilterLevel());
+static int lpaint_getFilterQuality(lua_State* L) {
+ SkLua(L).pushU32(get_obj<SkPaint>(L, 1)->getFilterQuality());
return 1;
}
-static int lpaint_setFilterLevel(lua_State* L) {
+static int lpaint_setFilterQuality(lua_State* L) {
int level = lua2int_def(L, 2, -1);
if (level >= 0 && level <= 3) {
- get_obj<SkPaint>(L, 1)->setFilterLevel((SkPaint::FilterLevel)level);
+ get_obj<SkPaint>(L, 1)->setFilterQuality((SkFilterQuality)level);
}
return 0;
}
@@ -1131,8 +1131,8 @@
{ "setAntiAlias", lpaint_setAntiAlias },
{ "isDither", lpaint_isDither },
{ "setDither", lpaint_setDither },
- { "getFilterLevel", lpaint_getFilterLevel },
- { "setFilterLevel", lpaint_setFilterLevel },
+ { "getFilterQuality", lpaint_getFilterQuality },
+ { "setFilterQuality", lpaint_setFilterQuality },
{ "isUnderlineText", lpaint_isUnderlineText },
{ "isStrikeThruText", lpaint_isStrikeThruText },
{ "isFakeBoldText", lpaint_isFakeBoldText },
diff --git a/src/utils/debugger/SkDebugCanvas.cpp b/src/utils/debugger/SkDebugCanvas.cpp
index 6474582..779d695 100644
--- a/src/utils/debugger/SkDebugCanvas.cpp
+++ b/src/utils/debugger/SkDebugCanvas.cpp
@@ -156,20 +156,20 @@
// texture filtering mode
class SkTexOverrideFilter : public SkDrawFilter {
public:
- SkTexOverrideFilter() : fFilterLevel(SkPaint::kNone_FilterLevel) {
+ SkTexOverrideFilter() : fFilterQuality(kNone_SkFilterQuality) {
}
- void setFilterLevel(SkPaint::FilterLevel filterLevel) {
- fFilterLevel = filterLevel;
+ void setFilterQuality(SkFilterQuality filterQuality) {
+ fFilterQuality = filterQuality;
}
bool filter(SkPaint* p, Type) SK_OVERRIDE {
- p->setFilterLevel(fFilterLevel);
+ p->setFilterQuality(fFilterQuality);
return true;
}
protected:
- SkPaint::FilterLevel fFilterLevel;
+ SkFilterQuality fFilterQuality;
private:
typedef SkDrawFilter INHERITED;
@@ -379,13 +379,13 @@
return fCommandVector;
}
-void SkDebugCanvas::overrideTexFiltering(bool overrideTexFiltering, SkPaint::FilterLevel level) {
+void SkDebugCanvas::overrideTexFiltering(bool overrideTexFiltering, SkFilterQuality quality) {
if (NULL == fTexOverrideFilter) {
fTexOverrideFilter = new SkTexOverrideFilter;
}
fOverrideTexFiltering = overrideTexFiltering;
- fTexOverrideFilter->setFilterLevel(level);
+ fTexOverrideFilter->setFilterQuality(quality);
}
void SkDebugCanvas::onClipPath(const SkPath& path, SkRegion::Op op, ClipEdgeStyle edgeStyle) {
diff --git a/src/utils/debugger/SkDebugCanvas.h b/src/utils/debugger/SkDebugCanvas.h
index 97eb734..5771dd9 100644
--- a/src/utils/debugger/SkDebugCanvas.h
+++ b/src/utils/debugger/SkDebugCanvas.h
@@ -42,7 +42,7 @@
/**
* Enable or disable texure filtering override
*/
- void overrideTexFiltering(bool overrideTexFiltering, SkPaint::FilterLevel level);
+ void overrideTexFiltering(bool overrideTexFiltering, SkFilterQuality);
/**
Executes all draw calls to the canvas.