From 06dd5c77a6ca6c484c683f1006a7bb6742f8917e Mon Sep 17 00:00:00 2001 From: liyuqian Date: Fri, 11 Nov 2016 13:30:48 -0800 Subject: Revert of Set analytic AA as default. (patchset #8 id:140001 of https://codereview.chromium.org/2471133002/ ) Reason for revert: SkASSERT triggered in some perf tests. Roll back. Original issue's description: > Set analytic AA as default. > > We'll use https://codereview.chromium.org/2471123002/ to keep Chrome from using > analytic AA until we fix all the Chrome tests. > > BUG=skia: > GOLD_TRYBOT_URL= https://gold.skia.org/search?issue=2471133002 > > Committed: https://skia.googlesource.com/skia/+/dca4f6530013cf43a2557ccb07f5cb4fd916b8e8 TBR=fmalita@chromium.org,msarett@google.com,mtklein@google.com,reed@google.com,mtklein@chromium.org # Skipping CQ checks because original CL landed less than 1 days ago. NOPRESUBMIT=true NOTREECHECKS=true NOTRY=true BUG=skia: Review-Url: https://codereview.chromium.org/2499723002 --- tests/ImageFilterTest.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'tests/ImageFilterTest.cpp') diff --git a/tests/ImageFilterTest.cpp b/tests/ImageFilterTest.cpp index 28612e882b..a6961ff46f 100644 --- a/tests/ImageFilterTest.cpp +++ b/tests/ImageFilterTest.cpp @@ -153,7 +153,7 @@ public: sk_sp gradientImage(SkImage::MakeFromBitmap(make_gradient_circle(64, 64))); sk_sp gradientSource(SkImageSource::Make(std::move(gradientImage))); - this->addFilter("displacement map", + this->addFilter("displacement map", SkDisplacementMapEffect::Make(SkDisplacementMapEffect::kR_ChannelSelectorType, SkDisplacementMapEffect::kB_ChannelSelectorType, 20.0f, @@ -1865,7 +1865,7 @@ DEF_TEST(ImageFilterComplexCTM, reporter) { { SkMergeImageFilter::Make(cfif, blif, SkBlendMode::kSrcOver), false }, { SkComposeImageFilter::Make(blif, cfif), false }, }; - + for (const auto& rec : recs) { const bool canHandle = rec.fFilter->canHandleComplexCTM(); REPORTER_ASSERT(reporter, canHandle == rec.fExpectCanHandle); -- cgit v1.2.3