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/samplecode/SampleAll.cpp b/samplecode/SampleAll.cpp
index 16c79c9..39f7722 100644
--- a/samplecode/SampleAll.cpp
+++ b/samplecode/SampleAll.cpp
@@ -393,7 +393,7 @@
canvas->save();
canvas->translate(SkIntToScalar(0), SkIntToScalar(5));
paint.setAntiAlias(true);
- paint.setFilterLevel(SkPaint::kLow_FilterLevel);
+ paint.setFilterQuality(kLow_SkFilterQuality);
// !!! draw through a clip
paint.setColor(SK_ColorLTGRAY);
paint.setStyle(SkPaint::kFill_Style);
diff --git a/samplecode/SampleApp.cpp b/samplecode/SampleApp.cpp
index 2b31830..ae30479 100644
--- a/samplecode/SampleApp.cpp
+++ b/samplecode/SampleApp.cpp
@@ -451,30 +451,30 @@
{SkPaint::kFull_Hinting, "Full", "Hf " },
};
-struct FilterLevelState {
- SkPaint::FilterLevel fLevel;
- const char* fName;
- const char* fLabel;
+struct FilterQualityState {
+ SkFilterQuality fQuality;
+ const char* fName;
+ const char* fLabel;
};
-static FilterLevelState gFilterLevelStates[] = {
- { SkPaint::kNone_FilterLevel, "Mixed", NULL },
- { SkPaint::kNone_FilterLevel, "None", "F0 " },
- { SkPaint::kLow_FilterLevel, "Low", "F1 " },
- { SkPaint::kMedium_FilterLevel, "Medium", "F2 " },
- { SkPaint::kHigh_FilterLevel, "High", "F3 " },
+static FilterQualityState gFilterQualityStates[] = {
+ { kNone_SkFilterQuality, "Mixed", NULL },
+ { kNone_SkFilterQuality, "None", "F0 " },
+ { kLow_SkFilterQuality, "Low", "F1 " },
+ { kMedium_SkFilterQuality, "Medium", "F2 " },
+ { kHigh_SkFilterQuality, "High", "F3 " },
};
class FlagsDrawFilter : public SkDrawFilter {
public:
FlagsDrawFilter(SkOSMenu::TriState lcd, SkOSMenu::TriState aa,
- SkOSMenu::TriState subpixel, int hinting, int filterlevel)
+ SkOSMenu::TriState subpixel, int hinting, int filterQuality)
: fLCDState(lcd)
, fAAState(aa)
, fSubpixelState(subpixel)
, fHintingState(hinting)
- , fFilterLevelIndex(filterlevel)
+ , fFilterQualityIndex(filterQuality)
{
- SkASSERT((unsigned)filterlevel < SK_ARRAY_COUNT(gFilterLevelStates));
+ SkASSERT((unsigned)filterQuality < SK_ARRAY_COUNT(gFilterQualityStates));
}
virtual bool filter(SkPaint* paint, Type t) {
@@ -484,8 +484,8 @@
if (SkOSMenu::kMixedState != fAAState) {
paint->setAntiAlias(SkOSMenu::kOnState == fAAState);
}
- if (0 != fFilterLevelIndex) {
- paint->setFilterLevel(gFilterLevelStates[fFilterLevelIndex].fLevel);
+ if (0 != fFilterQualityIndex) {
+ paint->setFilterQuality(gFilterQualityStates[fFilterQualityIndex].fQuality);
}
if (SkOSMenu::kMixedState != fSubpixelState) {
paint->setSubpixelText(SkOSMenu::kOnState == fSubpixelState);
@@ -501,7 +501,7 @@
SkOSMenu::TriState fAAState;
SkOSMenu::TriState fSubpixelState;
int fHintingState;
- int fFilterLevelIndex;
+ int fFilterQualityIndex;
};
//////////////////////////////////////////////////////////////////////////////
@@ -804,7 +804,7 @@
fAAState = SkOSMenu::kMixedState;
fSubpixelState = SkOSMenu::kMixedState;
fHintingState = 0;
- fFilterLevelIndex = 0;
+ fFilterQualityIndex = 0;
fFlipAxis = 0;
fScrollTestX = fScrollTestY = 0;
@@ -839,12 +839,12 @@
fAppMenu->assignKeyEquivalentToItem(itemID, 'b');
itemID = fAppMenu->appendTriState("LCD", "LCD", sinkID, fLCDState);
fAppMenu->assignKeyEquivalentToItem(itemID, 'l');
- itemID = fAppMenu->appendList("FilterLevel", "FilterLevel", sinkID, fFilterLevelIndex,
- gFilterLevelStates[0].fName,
- gFilterLevelStates[1].fName,
- gFilterLevelStates[2].fName,
- gFilterLevelStates[3].fName,
- gFilterLevelStates[4].fName,
+ itemID = fAppMenu->appendList("FilterQuality", "FilterQuality", sinkID, fFilterQualityIndex,
+ gFilterQualityStates[0].fName,
+ gFilterQualityStates[1].fName,
+ gFilterQualityStates[2].fName,
+ gFilterQualityStates[3].fName,
+ gFilterQualityStates[4].fName,
NULL);
fAppMenu->assignKeyEquivalentToItem(itemID, 'n');
itemID = fAppMenu->appendTriState("Subpixel", "Subpixel", sinkID, fSubpixelState);
@@ -1423,7 +1423,7 @@
void SampleWindow::installDrawFilter(SkCanvas* canvas) {
canvas->setDrawFilter(new FlagsDrawFilter(fLCDState, fAAState, fSubpixelState,
- fHintingState, fFilterLevelIndex))->unref();
+ fHintingState, fFilterQualityIndex))->unref();
}
void SampleWindow::postAnimatingEvent() {
@@ -1473,7 +1473,7 @@
}
if (SkOSMenu::FindTriState(evt, "AA", &fAAState) ||
SkOSMenu::FindTriState(evt, "LCD", &fLCDState) ||
- SkOSMenu::FindListIndex(evt, "FilterLevel", &fFilterLevelIndex) ||
+ SkOSMenu::FindListIndex(evt, "FilterQuality", &fFilterQualityIndex) ||
SkOSMenu::FindTriState(evt, "Subpixel", &fSubpixelState) ||
SkOSMenu::FindListIndex(evt, "Hinting", &fHintingState) ||
SkOSMenu::FindSwitchState(evt, "Clip", &fUseClip) ||
@@ -1905,7 +1905,7 @@
title.prepend(trystate_str(fLCDState, "LCD ", "lcd "));
title.prepend(trystate_str(fAAState, "AA ", "aa "));
- title.prepend(gFilterLevelStates[fFilterLevelIndex].fLabel);
+ title.prepend(gFilterQualityStates[fFilterQualityIndex].fLabel);
title.prepend(trystate_str(fSubpixelState, "S ", "s "));
title.prepend(fFlipAxis & kFlipAxis_X ? "X " : NULL);
title.prepend(fFlipAxis & kFlipAxis_Y ? "Y " : NULL);
diff --git a/samplecode/SampleApp.h b/samplecode/SampleApp.h
index 2385fc0..990ad0b 100644
--- a/samplecode/SampleApp.h
+++ b/samplecode/SampleApp.h
@@ -202,7 +202,7 @@
SkOSMenu::TriState fAAState;
SkOSMenu::TriState fSubpixelState;
int fHintingState;
- int fFilterLevelIndex;
+ int fFilterQualityIndex;
unsigned fFlipAxis;
int fMSAASampleCount;
diff --git a/samplecode/SampleBitmapRect.cpp b/samplecode/SampleBitmapRect.cpp
index 82d1098..3c700ec 100644
--- a/samplecode/SampleBitmapRect.cpp
+++ b/samplecode/SampleBitmapRect.cpp
@@ -130,7 +130,7 @@
canvas->drawRect(srcR, paint);
for (int i = 0; i < 2; ++i) {
- paint.setFilterLevel(1 == i ? SkPaint::kLow_FilterLevel : SkPaint::kNone_FilterLevel);
+ paint.setFilterQuality(1 == i ? kLow_SkFilterQuality : kNone_SkFilterQuality);
canvas->drawBitmapRectToRect(bitmap, &srcR, fDstR[i], &paint);
canvas->drawRect(fDstR[i], paint);
}
@@ -224,7 +224,7 @@
paint.setColor(SK_ColorYELLOW);
for (int i = 0; i < 2; ++i) {
- paint.setFilterLevel(1 == i ? SkPaint::kLow_FilterLevel : SkPaint::kNone_FilterLevel);
+ paint.setFilterQuality(1 == i ? kLow_SkFilterQuality : kNone_SkFilterQuality);
canvas->drawBitmapRectToRect(fBitmap, &fSrcR, fDstR[i], &paint);
canvas->drawRect(fDstR[i], paint);
}
diff --git a/samplecode/SampleCamera.cpp b/samplecode/SampleCamera.cpp
index af9dbe8..c0d4f4f 100644
--- a/samplecode/SampleCamera.cpp
+++ b/samplecode/SampleCamera.cpp
@@ -83,7 +83,7 @@
paint.setAntiAlias(true);
paint.setShader(fShaders[fShaderIndex]);
- paint.setFilterLevel(SkPaint::kLow_FilterLevel);
+ paint.setFilterQuality(kLow_SkFilterQuality);
SkRect r = { -150, -150, 150, 150 };
canvas->drawRoundRect(r, 30, 30, paint);
}
diff --git a/samplecode/SampleFilter.cpp b/samplecode/SampleFilter.cpp
index ae66a0c..3713a72 100644
--- a/samplecode/SampleFilter.cpp
+++ b/samplecode/SampleFilter.cpp
@@ -47,7 +47,7 @@
static SkScalar draw_set(SkCanvas* c, const SkBitmap& bm, SkScalar x, SkPaint* p) {
x += draw_bm(c, bm, x, 0, p);
- p->setFilterLevel(SkPaint::kLow_FilterLevel);
+ p->setFilterQuality(kLow_SkFilterQuality);
x += draw_bm(c, bm, x, 0, p);
p->setDither(true);
return x + draw_bm(c, bm, x, 0, p);
diff --git a/samplecode/SampleFilter2.cpp b/samplecode/SampleFilter2.cpp
index 0c81196..3541e15 100644
--- a/samplecode/SampleFilter2.cpp
+++ b/samplecode/SampleFilter2.cpp
@@ -74,7 +74,7 @@
canvas->scale(SK_Scalar1, scale);
for (int k = 0; k < 2; k++) {
- paint.setFilterLevel(k == 1 ? SkPaint::kLow_FilterLevel : SkPaint::kNone_FilterLevel);
+ paint.setFilterQuality(k == 1 ? kLow_SkFilterQuality : kNone_SkFilterQuality);
for (int j = 0; j < 2; j++) {
paint.setDither(j == 1);
for (int i = 0; i < fBitmapCount; i++) {
@@ -91,7 +91,7 @@
SkString s("dither=");
s.appendS32(paint.isDither());
s.append(" filter=");
- s.appendS32(paint.getFilterLevel() != SkPaint::kNone_FilterLevel);
+ s.appendS32(paint.getFilterQuality() != kNone_SkFilterQuality);
canvas->drawText(s.c_str(), s.size(), x + W/2,
y - p.getTextSize(), p);
}
diff --git a/samplecode/SampleFilterFuzz.cpp b/samplecode/SampleFilterFuzz.cpp
index 894e4fa..b2c15aa 100644
--- a/samplecode/SampleFilterFuzz.cpp
+++ b/samplecode/SampleFilterFuzz.cpp
@@ -311,7 +311,7 @@
break;
case MATRIX:
filter = SkMatrixImageFilter::Create(make_matrix(),
- (SkPaint::FilterLevel)R(4),
+ (SkFilterQuality)R(4),
make_image_filter());
break;
case MATRIX_CONVOLUTION:
diff --git a/samplecode/SampleFilterQuality.cpp b/samplecode/SampleFilterQuality.cpp
index fe94864..79457b8 100644
--- a/samplecode/SampleFilterQuality.cpp
+++ b/samplecode/SampleFilterQuality.cpp
@@ -175,11 +175,11 @@
return this->INHERITED::onQuery(evt);
}
- void drawTheImage(SkCanvas* canvas, const SkISize& size, SkPaint::FilterLevel filter,
+ void drawTheImage(SkCanvas* canvas, const SkISize& size, SkFilterQuality filter,
SkScalar dx, SkScalar dy) {
SkPaint paint;
paint.setAntiAlias(true);
- paint.setFilterLevel(filter);
+ paint.setFilterQuality(filter);
SkAutoCanvasRestore acr(canvas, true);
@@ -197,7 +197,7 @@
}
}
- void drawHere(SkCanvas* canvas, SkPaint::FilterLevel filter, SkScalar dx, SkScalar dy) {
+ void drawHere(SkCanvas* canvas, SkFilterQuality filter, SkScalar dx, SkScalar dy) {
SkCanvas* origCanvas = canvas;
SkAutoCanvasRestore acr(canvas, true);
@@ -253,7 +253,7 @@
SkRect r = SkRect::MakeWH(fCell.width(), fCell.height());
r.inset(4, 4);
canvas->clipRect(r);
- this->drawHere(canvas, SkPaint::FilterLevel(index), trans[0], trans[1]);
+ this->drawHere(canvas, SkFilterQuality(index), trans[0], trans[1]);
}
}
diff --git a/samplecode/SampleIdentityScale.cpp b/samplecode/SampleIdentityScale.cpp
index 073bc7c..84b2bd5 100644
--- a/samplecode/SampleIdentityScale.cpp
+++ b/samplecode/SampleIdentityScale.cpp
@@ -57,7 +57,7 @@
paint.setAntiAlias(true);
paint.setTextSize(48);
- paint.setFilterLevel(SkPaint::kHigh_FilterLevel);
+ paint.setFilterQuality(kHigh_SkFilterQuality);
SkTime::DateTime time;
SkTime::GetDateTime(&time);
diff --git a/samplecode/SamplePatch.cpp b/samplecode/SamplePatch.cpp
index 4153682..478d822 100644
--- a/samplecode/SamplePatch.cpp
+++ b/samplecode/SamplePatch.cpp
@@ -276,7 +276,7 @@
SkPaint paint;
paint.setDither(true);
- paint.setFilterLevel(SkPaint::kLow_FilterLevel);
+ paint.setFilterQuality(kLow_SkFilterQuality);
canvas->translate(DX, DY);
diff --git a/samplecode/SampleSlides.cpp b/samplecode/SampleSlides.cpp
index e115235..b626cdb 100644
--- a/samplecode/SampleSlides.cpp
+++ b/samplecode/SampleSlides.cpp
@@ -438,7 +438,7 @@
SkPaint paint;
paint.setDither(true);
- paint.setFilterLevel(SkPaint::kLow_FilterLevel);
+ paint.setFilterQuality(kLow_SkFilterQuality);
for (size_t i = 0; i < SK_ARRAY_COUNT(fRecs); i++) {
canvas->save();
diff --git a/samplecode/SampleSubpixelTranslate.cpp b/samplecode/SampleSubpixelTranslate.cpp
index 58ad072..fe8062b 100644
--- a/samplecode/SampleSubpixelTranslate.cpp
+++ b/samplecode/SampleSubpixelTranslate.cpp
@@ -62,11 +62,11 @@
void onDrawContent(SkCanvas* canvas) SK_OVERRIDE {
- static const SkPaint::FilterLevel gLevels[] = {
- SkPaint::kNone_FilterLevel,
- SkPaint::kLow_FilterLevel,
- SkPaint::kMedium_FilterLevel,
- SkPaint::kHigh_FilterLevel
+ static const SkFilterQuality gQualitys[] = {
+ kNone_SkFilterQuality,
+ kLow_SkFilterQuality,
+ kMedium_SkFilterQuality,
+ kHigh_SkFilterQuality
};
SkPaint paint;
@@ -74,37 +74,37 @@
paint.setSubpixelText(true);
paint.setAntiAlias(true);
- for (size_t i = 0; i < SK_ARRAY_COUNT(gLevels); ++i) {
- paint.setFilterLevel(gLevels[i]);
+ for (size_t i = 0; i < SK_ARRAY_COUNT(gQualitys); ++i) {
+ paint.setFilterQuality(gQualitys[i]);
SkRect r = SkRect::MakeXYWH( fCurPos.fX + i * (fSize + 10), fCurPos.fY, fSize, fSize );
canvas->drawBitmapRect( fBM, r, &paint );
}
- canvas->drawText( "AA Scaled", strlen("AA Scaled"), fCurPos.fX + SK_ARRAY_COUNT(gLevels) * (fSize + 10), fCurPos.fY + fSize/2, paint );
+ canvas->drawText( "AA Scaled", strlen("AA Scaled"), fCurPos.fX + SK_ARRAY_COUNT(gQualitys) * (fSize + 10), fCurPos.fY + fSize/2, paint );
paint.setAntiAlias(false);
- for (size_t i = 0; i < SK_ARRAY_COUNT(gLevels); ++i) {
- paint.setFilterLevel(gLevels[i]);
+ for (size_t i = 0; i < SK_ARRAY_COUNT(gQualitys); ++i) {
+ paint.setFilterQuality(gQualitys[i]);
SkRect r = SkRect::MakeXYWH( fCurPos.fX + i * (fSize + 10), fCurPos.fY + fSize + 10, fSize, fSize );
canvas->drawBitmapRect( fBM, r, &paint );
}
- canvas->drawText( "Scaled", strlen("Scaled"), fCurPos.fX + SK_ARRAY_COUNT(gLevels) * (fSize + 10), fCurPos.fY + fSize + 10 + fSize/2, paint );
+ canvas->drawText( "Scaled", strlen("Scaled"), fCurPos.fX + SK_ARRAY_COUNT(gQualitys) * (fSize + 10), fCurPos.fY + fSize + 10 + fSize/2, paint );
paint.setAntiAlias(true);
- for (size_t i = 0; i < SK_ARRAY_COUNT(gLevels); ++i) {
- paint.setFilterLevel(gLevels[i]);
+ for (size_t i = 0; i < SK_ARRAY_COUNT(gQualitys); ++i) {
+ paint.setFilterQuality(gQualitys[i]);
canvas->drawBitmap( fBM, fCurPos.fX + i * (fBM.width() + 10), fCurPos.fY + 2*(fSize + 10), &paint );
}
- canvas->drawText( "AA No Scale", strlen("AA No Scale"), fCurPos.fX + SK_ARRAY_COUNT(gLevels) * (fBM.width() + 10), fCurPos.fY + 2*(fSize + 10) + fSize/2, paint );
+ canvas->drawText( "AA No Scale", strlen("AA No Scale"), fCurPos.fX + SK_ARRAY_COUNT(gQualitys) * (fBM.width() + 10), fCurPos.fY + 2*(fSize + 10) + fSize/2, paint );
paint.setAntiAlias(false);
- for (size_t i = 0; i < SK_ARRAY_COUNT(gLevels); ++i) {
- paint.setFilterLevel(gLevels[i]);
+ for (size_t i = 0; i < SK_ARRAY_COUNT(gQualitys); ++i) {
+ paint.setFilterQuality(gQualitys[i]);
canvas->drawBitmap( fBM, fCurPos.fX + i * (fBM.width() + 10), fCurPos.fY + 2*(fSize + 10) + fBM.height() + 10, &paint );
}
- canvas->drawText( "No Scale", strlen("No Scale"), fCurPos.fX + SK_ARRAY_COUNT(gLevels) * (fBM.width() + 10), fCurPos.fY + 2*(fSize + 10) + fBM.height() + 10 + fSize/2, paint );
+ canvas->drawText( "No Scale", strlen("No Scale"), fCurPos.fX + SK_ARRAY_COUNT(gQualitys) * (fBM.width() + 10), fCurPos.fY + 2*(fSize + 10) + fBM.height() + 10 + fSize/2, paint );
fCurPos.fX += fHorizontalVelocity;
diff --git a/samplecode/SampleTextureDomain.cpp b/samplecode/SampleTextureDomain.cpp
index af511c7..2794a06 100644
--- a/samplecode/SampleTextureDomain.cpp
+++ b/samplecode/SampleTextureDomain.cpp
@@ -47,7 +47,7 @@
SkRect srcRect;
SkRect dstRect;
SkPaint paint;
- paint.setFilterLevel(SkPaint::kLow_FilterLevel);
+ paint.setFilterQuality(kLow_SkFilterQuality);
// Test that bitmap draws from malloc-backed bitmaps respect
// the constrained texture domain.
diff --git a/samplecode/SampleTiling.cpp b/samplecode/SampleTiling.cpp
index 4f073bd..5f995e2 100644
--- a/samplecode/SampleTiling.cpp
+++ b/samplecode/SampleTiling.cpp
@@ -44,7 +44,7 @@
SkShader::TileMode tmx, SkShader::TileMode tmy) {
SkShader* shader = SkShader::CreateBitmapShader(bm, tmx, tmy);
paint->setShader(shader)->unref();
- paint->setFilterLevel(filter ? SkPaint::kLow_FilterLevel : SkPaint::kNone_FilterLevel);
+ paint->setFilterQuality(filter ? kLow_SkFilterQuality : kNone_SkFilterQuality);
}
static const SkColorType gColorTypes[] = {
diff --git a/samplecode/SampleVertices.cpp b/samplecode/SampleVertices.cpp
index 6dac0b5..f334a87 100644
--- a/samplecode/SampleVertices.cpp
+++ b/samplecode/SampleVertices.cpp
@@ -90,7 +90,7 @@
void onDrawContent(SkCanvas* canvas) SK_OVERRIDE {
SkPaint paint;
paint.setDither(true);
- paint.setFilterLevel(SkPaint::kLow_FilterLevel);
+ paint.setFilterQuality(kLow_SkFilterQuality);
for (size_t i = 0; i < SK_ARRAY_COUNT(fRecs); i++) {
canvas->save();