diff options
| author |  liyuqian <liyuqian@google.com> | 2016-11-11 13:30:48 -0800 |
|---|---|---|
| committer |  Commit bot <commit-bot@chromium.org> | 2016-11-11 13:30:48 -0800 |
| commit | 06dd5c77a6ca6c484c683f1006a7bb6742f8917e (patch) | |
| tree | 68224e23d46fc1ca32ad30d51106911da6085ffc /src/core/SkXfermode.cpp | |
| parent | 7ef4b74e57a143e4e586e577e9b7c11c3aab472d (diff) | |
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
Diffstat (limited to 'src/core/SkXfermode.cpp')
| -rw-r--r-- | src/core/SkXfermode.cpp | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/src/core/SkXfermode.cpp b/src/core/SkXfermode.cpp index 64ce04d851..6894b84238 100644 --- a/src/core/SkXfermode.cpp +++ b/src/core/SkXfermode.cpp @@ -949,8 +949,7 @@ template <Sk4f (blend)(const Sk4f&, const Sk4f&)> SkPM4f proc_4f(const SkPM4f& s assert_unit(s); assert_unit(d); SkPM4f r = as_pm4f(blend(as_4f(s), as_4f(d))); - // Turn this assert off for now because srgb conversions may end up in rgb > a - // assert_unit(r); + assert_unit(r); return r; } |