commit 4f60e540e7b47b3e9df3eb838ae0facea31840dd
author Mike Klein <mtklein@google.com> Thu Nov 29 08:05:07 2018 -0500
committer Skia Commit-Bot <skia-commit-bot@chromium.org> Thu Nov 29 13:36:41 2018 +0000
tree 7cfb198a0760c8b7e7f6110b37814bf3d053c383
parent 6f0778819654704748934fefea2308c154d88700

clean up SK_WALK_DECAL_IN_1616

Change-Id: I6b7ef512235dfc986563a3ae03375423e176713d
Reviewed-on: https://skia-review.googlesource.com/c/173360
Reviewed-by: Mike Klein <mtklein@google.com>
Commit-Queue: Mike Klein <mtklein@google.com>

src/core/SkBitmapProcState_matrix.h

diff --git a/src/core/SkBitmapProcState_matrix.h b/src/core/SkBitmapProcState_matrix.h
index 712a21d..542e5bf 100644
--- a/src/core/SkBitmapProcState_matrix.h
+++ b/src/core/SkBitmapProcState_matrix.h
@@ -43,18 +43,13 @@
 #ifdef CHECK_FOR_DECAL
     // TODO: can_truncate_to_fixed_for_decal() is kind of misnamed now that
     // we're not really stepping in SkFixed (16.16) anymore.
-    SkFixed fixedFx = SkFractionalIntToFixed(fx);
-    const SkFixed fixedDx = SkFractionalIntToFixed(dx);
-    if (can_truncate_to_fixed_for_decal(fixedFx, fixedDx, count, maxX)) {
+    if (can_truncate_to_fixed_for_decal(SkFractionalIntToFixed(fx),
+                                        SkFractionalIntToFixed(dx), count, maxX)) {
         while (count --> 0) {
+            SkFixed fixedFx = SkFractionalIntToFixed(fx);
             SkASSERT((fixedFx >> (16 + 14)) == 0);
             *xy++ = (fixedFx >> 12 << 14) | ((fixedFx >> 16) + 1);
-        #if defined(SK_WALK_DECAL_IN_1616)
-            fixedFx += fixedDx;
-        #else
             fx += dx;
-            fixedFx = SkFractionalIntToFixed(fx);
-        #endif
         }
         return;
     }