diff --git a/flow/display_list.cc b/flow/display_list.cc index b219c4f4c7de3cf972738c75fd1fe99024cda248..0e45f3574f8f16ff47cb0bd18af66514e5002723 100644 --- a/flow/display_list.cc +++ b/flow/display_list.cc @@ -162,19 +162,6 @@ struct SetBlendModeOp final : DLOp { void dispatch(Dispatcher& dispatcher) const { dispatcher.setBlendMode(mode); } }; -// 4 byte header + 4 byte payload packs into minimum 8 bytes -struct SetFilterQualityOp final : DLOp { - static const auto kType = DisplayListOpType::kSetFilterQuality; - - SetFilterQualityOp(SkFilterQuality quality) : quality(quality) {} - - const SkFilterQuality quality; - - void dispatch(Dispatcher& dispatcher) const { - dispatcher.setFilterQuality(quality); - } -}; - // Clear: 4 byte header + unused 4 byte payload uses 8 bytes // (4 bytes unused) // Set: 4 byte header + an sk_sp (ptr) uses 16 bytes due to the @@ -1072,9 +1059,6 @@ void DisplayListBuilder::setColor(SkColor color) { void DisplayListBuilder::setBlendMode(SkBlendMode mode) { Push(0, mode); } -void DisplayListBuilder::setFilterQuality(SkFilterQuality quality) { - Push(0, quality); -} void DisplayListBuilder::setShader(sk_sp shader) { shader // ? Push(0, std::move(shader)) diff --git a/flow/display_list.h b/flow/display_list.h index bbfafa7a5081095469293c4766544633c8a1b486..2388e27821c82c68047924c7be0406aa2c2c91eb 100644 --- a/flow/display_list.h +++ b/flow/display_list.h @@ -77,8 +77,6 @@ namespace flutter { V(SetColor) \ V(SetBlendMode) \ \ - V(SetFilterQuality) \ - \ V(SetShader) \ V(ClearShader) \ V(SetColorFilter) \ @@ -232,7 +230,6 @@ class Dispatcher { virtual void setMiterLimit(SkScalar limit) = 0; virtual void setColor(SkColor color) = 0; virtual void setBlendMode(SkBlendMode mode) = 0; - virtual void setFilterQuality(SkFilterQuality quality) = 0; virtual void setShader(sk_sp shader) = 0; virtual void setImageFilter(sk_sp filter) = 0; virtual void setColorFilter(sk_sp filter) = 0; @@ -344,7 +341,6 @@ class DisplayListBuilder final : public virtual Dispatcher, public SkRefCnt { void setMiterLimit(SkScalar limit) override; void setColor(SkColor color) override; void setBlendMode(SkBlendMode mode) override; - void setFilterQuality(SkFilterQuality quality) override; void setShader(sk_sp shader) override; void setImageFilter(sk_sp filter) override; void setColorFilter(sk_sp filter) override; diff --git a/flow/display_list_canvas.cc b/flow/display_list_canvas.cc index d97325aab7eda7f0384691b120a536c7479350ee..1da919fba0edc0fc41e2bf2436e5183c3a5d554e 100644 --- a/flow/display_list_canvas.cc +++ b/flow/display_list_canvas.cc @@ -453,10 +453,6 @@ void DisplayListCanvasRecorder::RecordPaintAttributes(const SkPaint* paint, builder_->setMiterLimit(current_miter_limit_ = paint->getStrokeMiter()); } } - if ((dataNeeded & kFilterQualityNeeded_) != 0 && - current_fq_ != paint->getFilterQuality()) { - builder_->setFilterQuality(current_fq_ = paint->getFilterQuality()); - } if ((dataNeeded & kShaderNeeded_) != 0 && current_shader_.get() != paint->getShader()) { builder_->setShader(current_shader_ = sk_ref_sp(paint->getShader())); diff --git a/flow/display_list_canvas.h b/flow/display_list_canvas.h index c2234104a28e5a63bef1b5c7b5a59ffded48eca8..f118c345cb945500c77d8894b49b9803b88ef483 100644 --- a/flow/display_list_canvas.h +++ b/flow/display_list_canvas.h @@ -259,15 +259,14 @@ class DisplayListCanvasRecorder static constexpr int kColorNeeded_ = 1 << 1; static constexpr int kBlendNeeded_ = 1 << 2; static constexpr int kInvertColorsNeeded_ = 1 << 3; - static constexpr int kFilterQualityNeeded_ = 1 << 4; - static constexpr int kPaintStyleNeeded_ = 1 << 5; - static constexpr int kStrokeStyleNeeded_ = 1 << 6; - static constexpr int kShaderNeeded_ = 1 << 7; - static constexpr int kColorFilterNeeded_ = 1 << 8; - static constexpr int kImageFilterNeeded_ = 1 << 9; - static constexpr int kPathEffectNeeded_ = 1 << 10; - static constexpr int kMaskFilterNeeded_ = 1 << 11; - static constexpr int kDitherNeeded_ = 1 << 12; + static constexpr int kPaintStyleNeeded_ = 1 << 4; + static constexpr int kStrokeStyleNeeded_ = 1 << 5; + static constexpr int kShaderNeeded_ = 1 << 6; + static constexpr int kColorFilterNeeded_ = 1 << 7; + static constexpr int kImageFilterNeeded_ = 1 << 8; + static constexpr int kPathEffectNeeded_ = 1 << 9; + static constexpr int kMaskFilterNeeded_ = 1 << 10; + static constexpr int kDitherNeeded_ = 1 << 11; // clang-format on // Combinations of the above mask bits that are common to typical "draw" @@ -283,10 +282,10 @@ class DisplayListCanvasRecorder kMaskFilterNeeded_ | kPathEffectNeeded_; static constexpr int kStrokeMask_ = kPaintMask_ | kStrokeStyleNeeded_ | kMaskFilterNeeded_ | kPathEffectNeeded_; - static constexpr int kImageMask_ = - kColorNeeded_ | kBlendNeeded_ | kInvertColorsNeeded_ | - kColorFilterNeeded_ | kDitherNeeded_ | kImageFilterNeeded_ | - kFilterQualityNeeded_ | kMaskFilterNeeded_; + static constexpr int kImageMask_ = kColorNeeded_ | kBlendNeeded_ | + kInvertColorsNeeded_ | + kColorFilterNeeded_ | kDitherNeeded_ | + kImageFilterNeeded_ | kMaskFilterNeeded_; static constexpr int kImageRectMask_ = kImageMask_ | kAaNeeded_; static constexpr int kSaveLayerMask_ = kColorNeeded_ | kBlendNeeded_ | kInvertColorsNeeded_ | @@ -301,7 +300,6 @@ class DisplayListCanvasRecorder SkScalar current_miter_limit_ = 4.0; SkPaint::Cap current_cap_ = SkPaint::Cap::kButt_Cap; SkPaint::Join current_join_ = SkPaint::Join::kMiter_Join; - SkFilterQuality current_fq_ = SkFilterQuality::kNone_SkFilterQuality; sk_sp current_shader_; sk_sp current_color_filter_; sk_sp current_image_filter_; diff --git a/flow/display_list_canvas_unittests.cc b/flow/display_list_canvas_unittests.cc index 148ef428b4e79b3f9df2c20ac11f865b45c873f8..41eb47f635a9e7d5eddcbc0051b88c8a61d1462f 100644 --- a/flow/display_list_canvas_unittests.cc +++ b/flow/display_list_canvas_unittests.cc @@ -137,8 +137,6 @@ class CanvasCompareTester { RenderWithStrokes(cv_renderer, dl_renderer); - // Not testing FilterQuality here because there is no SkPaint version - { // half opaque cyan SkColor blendableColor = SkColorSetARGB(0x7f, 0x00, 0xff, 0xff); diff --git a/flow/display_list_unittests.cc b/flow/display_list_unittests.cc index 738a7d7147a1f50feb4082b352cc0f8e3eb398b1..465663579e505158b4cca1871d7f3292a3ad47c0 100644 --- a/flow/display_list_unittests.cc +++ b/flow/display_list_unittests.cc @@ -295,13 +295,6 @@ std::vector allGroups = { {1, 8, 0, 0, [](DisplayListBuilder& b) {b.setBlendMode(SkBlendMode::kDstIn);}}, } }, - { "SetFilterQuality", { - {1, 8, 0, 0, [](DisplayListBuilder& b) {b.setFilterQuality(kNone_SkFilterQuality);}}, - {1, 8, 0, 0, [](DisplayListBuilder& b) {b.setFilterQuality(kLow_SkFilterQuality);}}, - {1, 8, 0, 0, [](DisplayListBuilder& b) {b.setFilterQuality(kMedium_SkFilterQuality);}}, - {1, 8, 0, 0, [](DisplayListBuilder& b) {b.setFilterQuality(kHigh_SkFilterQuality);}}, - } - }, { "SetShader", { {1, 8, 0, 0, [](DisplayListBuilder& b) {b.setShader(nullptr);}}, {1, 16, 0, 0, [](DisplayListBuilder& b) {b.setShader(TestShader1);}}, diff --git a/flow/display_list_utils.cc b/flow/display_list_utils.cc index b1c718e9c8bb139cdfba7fe6f73d1f9564675dad..c8282bf1ef3a259fed816a8d8950f959ba1ca772 100644 --- a/flow/display_list_utils.cc +++ b/flow/display_list_utils.cc @@ -57,9 +57,6 @@ void SkPaintDispatchHelper::setColor(SkColor color) { void SkPaintDispatchHelper::setBlendMode(SkBlendMode mode) { paint_.setBlendMode(mode); } -void SkPaintDispatchHelper::setFilterQuality(SkFilterQuality quality) { - paint_.setFilterQuality(quality); -} void SkPaintDispatchHelper::setShader(sk_sp shader) { paint_.setShader(shader); } diff --git a/flow/display_list_utils.h b/flow/display_list_utils.h index bac3cca8dc1014e015669daef5210594937134fd..f399bfa5de22a8f18fe0f02efb72af339d3dc21a 100644 --- a/flow/display_list_utils.h +++ b/flow/display_list_utils.h @@ -49,7 +49,6 @@ class IgnoreAttributeDispatchHelper : public virtual Dispatcher { void setMiterLimit(SkScalar limit) override {} void setColor(SkColor color) override {} void setBlendMode(SkBlendMode mode) override {} - void setFilterQuality(SkFilterQuality quality) override {} void setShader(sk_sp shader) override {} void setImageFilter(sk_sp filter) override {} void setColorFilter(sk_sp filter) override {} @@ -106,7 +105,6 @@ class SkPaintDispatchHelper : public virtual Dispatcher { void setMiterLimit(SkScalar limit) override; void setColor(SkColor color) override; void setBlendMode(SkBlendMode mode) override; - void setFilterQuality(SkFilterQuality quality) override; void setShader(sk_sp shader) override; void setImageFilter(sk_sp filter) override; void setColorFilter(sk_sp filter) override; diff --git a/flow/layers/texture_layer.h b/flow/layers/texture_layer.h index d784ecd79ed48c675374dfdfde6f12e638870fe3..61f7149f7b4c4700673254f138d8fd29a068187e 100644 --- a/flow/layers/texture_layer.h +++ b/flow/layers/texture_layer.h @@ -6,7 +6,6 @@ #define FLUTTER_FLOW_LAYERS_TEXTURE_LAYER_H_ #include "flutter/flow/layers/layer.h" -#include "third_party/skia/include/core/SkFilterQuality.h" #include "third_party/skia/include/core/SkPoint.h" #include "third_party/skia/include/core/SkSize.h" diff --git a/flow/layers/texture_layer_unittests.cc b/flow/layers/texture_layer_unittests.cc index 8e68c69ae7b2f89b05c755bd4a81daf0691fe102..4f6adf9944fd5b8a1197b9ac64619c8ecf1fcc7f 100644 --- a/flow/layers/texture_layer_unittests.cc +++ b/flow/layers/texture_layer_unittests.cc @@ -68,7 +68,7 @@ TEST_F(TextureLayerTest, PaintBeforePrerollDies) { } #endif -TEST_F(TextureLayerTest, PaintingWithLowFilterQuality) { +TEST_F(TextureLayerTest, PaintingWithLinearSampling) { const SkPoint layer_offset = SkPoint::Make(0.0f, 0.0f); const SkSize layer_size = SkSize::Make(8.0f, 8.0f); const int64_t texture_id = 0; diff --git a/flow/testing/mock_texture_unittests.cc b/flow/testing/mock_texture_unittests.cc index 16a3dfb4b1824cbf61aa50c545b66bba5120760c..5968928b6cd2c77a528b9f55fa391bdd91114ca6 100644 --- a/flow/testing/mock_texture_unittests.cc +++ b/flow/testing/mock_texture_unittests.cc @@ -40,7 +40,7 @@ TEST(MockTextureTest, PaintCalls) { EXPECT_EQ(texture->paint_calls(), expected_paint_calls); } -TEST(MockTextureTest, PaintCallsWithLowFilterQuality) { +TEST(MockTextureTest, PaintCallsWithLinearSampling) { SkCanvas canvas; const SkRect paint_bounds1 = SkRect::MakeWH(1.0f, 1.0f); const SkRect paint_bounds2 = SkRect::MakeWH(2.0f, 2.0f);