From e7365065acfe1fc6abbeb248fd5cc0ca83d9d341 Mon Sep 17 00:00:00 2001 From: fmalita Date: Thu, 7 Apr 2016 19:27:45 -0700 Subject: Revert of For *ToFixed, in debug mode, assert that the value is in range. (patchset #6 id:140001 of https://codereview.chromium.org/1824733002/ ) Reason for revert: Asserts in Blink rolls: https://storage.googleapis.com/chromium-layout-test-archives/linux_blink_rel/84520/layout-test-results/results.html STDERR: [1:1:0407/120919:1455366829:INFO:SkFixed.h(88)] ../../third_party/skia/include/private/SkFixed.h:88: fatal error: ""truncf(x * (1 << 16)) == static_cast Original issue's description: > For *ToFixed, in debug mode, assert that the value is in range. > > Use SkFloatPinToFixed in SkTwoPointConicalGradient.cpp because it is failing in DM. fmalita is working on replacing this code with the 4f version, so I'm not bothering to fix it. (The beginnings of a real fix are in https://codereview.chromium.org/1767163003, which I do not plan to commit.) > > BUG=skia:4632 > GOLD_TRYBOT_URL= https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&issue=1824733002 > > Committed: https://skia.googlesource.com/skia/+/93dc33972cd6a418e84270298b856d2de08d9c1c TBR=mtklein@google.com,reed@google.com,benjaminwagner@google.com # Skipping CQ checks because original CL landed less than 1 days ago. NOPRESUBMIT=true NOTREECHECKS=true NOTRY=true BUG=skia:4632 Review URL: https://codereview.chromium.org/1868933004 --- src/effects/gradients/SkTwoPointConicalGradient.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/effects') diff --git a/src/effects/gradients/SkTwoPointConicalGradient.cpp b/src/effects/gradients/SkTwoPointConicalGradient.cpp index 3c3180c2c5..f33dcc5a75 100644 --- a/src/effects/gradients/SkTwoPointConicalGradient.cpp +++ b/src/effects/gradients/SkTwoPointConicalGradient.cpp @@ -129,7 +129,7 @@ SkFixed TwoPtRadialContext::nextT() { return TwoPtRadial::kDontDrawT; } } - return SkFloatPinToFixed(t); + return SkFloatToFixed(t); } typedef void (*TwoPointConicalProc)(TwoPtRadialContext* rec, SkPMColor* dstC, -- cgit v1.2.3