Fixed more issues

src/core/SkXfermode.cpp

Index: src/core/SkXfermode.cpp
diff --git a/src/core/SkXfermode.cpp b/src/core/SkXfermode.cpp
index 8cb79c2dbd29f3682450f4392bb5ff04347ca9cf..51e384e6f70b4c391511aa0253c8063d5cb3ad64 100644
--- a/src/core/SkXfermode.cpp
+++ b/src/core/SkXfermode.cpp
@@ -468,16 +468,17 @@ static inline void clipColor(int* r, int* g, int* b, int a) {
     int L = Lum(*r, *g, *b);
     int n = minimum(*r, *g, *b);
     int x = maximum(*r, *g, *b);
-    if(n < 0) {
-       *r = L + SkMulDiv(*r - L, L, L - n);
-       *g = L + SkMulDiv(*g - L, L, L - n);
-       *b = L + SkMulDiv(*b - L, L, L - n);
+    if((n < 0) && (n = L - n)) { // Store denom in 'n' and make sure it's non zero

[Stephen White, 2013/12/09 21:16:12]

Mike (or Florin? not sure who wrote this) should probably take a look.

[reed1, 2013/12/09 21:20:49]

I don't know who wrote this.
For readability, I'd vote for a local var (int denom;) rather than reusing
either x or n.

[fmalita_google_do_not_use, 2013/12/09 21:29:12]

FWIW, this was added by Rik (https://chromiumcodereview.appspot.com/12393049).

+       *r = L + SkMulDiv(*r - L, L, n);
+       *g = L + SkMulDiv(*g - L, L, n);
+       *b = L + SkMulDiv(*b - L, L, n);
     }
 
-    if (x > a) {
-       *r = L + SkMulDiv(*r - L, a - L, x - L);
-       *g = L + SkMulDiv(*g - L, a - L, x - L);
-       *b = L + SkMulDiv(*b - L, a - L, x - L);
+    if ((x > a) && (x = x - L)) { // Store denom in 'x' and make sure it's non zero
+       n = a - L; // Store numer in 'n'
+       *r = L + SkMulDiv(*r - L, n, x);
+       *g = L + SkMulDiv(*g - L, n, x);
+       *b = L + SkMulDiv(*b - L, n, x);
     }
 }