aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorGravatar reed <reed@google.com>2015-03-16 10:26:13 -0700
committerGravatar Commit bot <commit-bot@chromium.org>2015-03-16 10:26:13 -0700
commite7903c7397c694e343c2c0fcc5cabea351212f23 (patch)
tree60b24f752606a60f81fc87eabfcf4f8a29f2d03b
parent93a1215fe0ab007ce941c721f1fd3e9dcb5d4754 (diff)
FilterLevel -> SkFilterQuality
BUG=skia: TBR= NOTREECHECKS=True NOTRY=True Review URL: https://codereview.chromium.org/1010023002
-rw-r--r--debugger/QT/SkDebuggerGUI.cpp6
-rw-r--r--debugger/QT/SkSettingsWidget.h4
-rw-r--r--debugger/SkDebugger.h4
-rw-r--r--include/core/SkGraphics.h2
4 files changed, 8 insertions, 8 deletions
diff --git a/debugger/QT/SkDebuggerGUI.cpp b/debugger/QT/SkDebuggerGUI.cpp
index 01d8c665e3..a8d8f14c21 100644
--- a/debugger/QT/SkDebuggerGUI.cpp
+++ b/debugger/QT/SkDebuggerGUI.cpp
@@ -292,9 +292,9 @@ void SkDebuggerGUI::actionVisualizationsChanged() {
}
void SkDebuggerGUI::actionTextureFilter() {
- SkPaint::FilterLevel level;
- bool enabled = fSettingsWidget.getFilterOverride(&level);
- fDebugger.setTexFilterOverride(enabled, level);
+ SkFilterQuality quality;
+ bool enabled = fSettingsWidget.getFilterOverride(&quality);
+ fDebugger.setTexFilterOverride(enabled, quality);
fCanvasWidget.update();
}
diff --git a/debugger/QT/SkSettingsWidget.h b/debugger/QT/SkSettingsWidget.h
index 70e8965341..012abc0d12 100644
--- a/debugger/QT/SkSettingsWidget.h
+++ b/debugger/QT/SkSettingsWidget.h
@@ -51,9 +51,9 @@ public:
#endif
- bool getFilterOverride(SkPaint::FilterLevel* filterLevel) const {
+ bool getFilterOverride(SkFilterQuality* filterQuality) const {
int index = fFilterCombo.currentIndex();
- *filterLevel = (SkPaint::FilterLevel)fFilterCombo.itemData(index).toUInt();
+ *filterQuality = (SkFilterQuality)fFilterCombo.itemData(index).toUInt();
return index > 0;
}
diff --git a/debugger/SkDebugger.h b/debugger/SkDebugger.h
index 76bd71ba44..230a1ffc4e 100644
--- a/debugger/SkDebugger.h
+++ b/debugger/SkDebugger.h
@@ -111,9 +111,9 @@ public:
}
}
- void setTexFilterOverride(bool texFilterOverride, SkPaint::FilterLevel level) {
+ void setTexFilterOverride(bool texFilterOverride, SkFilterQuality quality) {
if (fDebugCanvas) {
- fDebugCanvas->overrideTexFiltering(texFilterOverride, level);
+ fDebugCanvas->overrideTexFiltering(texFilterOverride, quality);
}
}
diff --git a/include/core/SkGraphics.h b/include/core/SkGraphics.h
index b2fc365835..ea74c586d2 100644
--- a/include/core/SkGraphics.h
+++ b/include/core/SkGraphics.h
@@ -78,7 +78,7 @@ public:
static void PurgeFontCache();
/**
- * Scaling bitmaps with the SkPaint::kHigh_FilterLevel setting is
+ * Scaling bitmaps with the kHigh_SkFilterQuality setting is
* expensive, so the result is saved in the global Scaled Image
* Cache.
*