commit a184d5e49d173dd5b783a2022b28f45f70b665ee
author Chris Craik <ccraik@google.com> Tue May 03 21:17:28 2016 +0000
committer android-build-merger <android-build-merger@google.com> Tue May 03 21:17:28 2016 +0000
tree 9314156e1049edfbf2fc1c47d18f30bd96ed923a
parent 8d7ab4fab9f666efc05f6e836bc2c4e570374b51
parent 0698300cc567384d6c528b5b1757ed8abe930dc5

Simplify LightingFilter in add-free case
am: 0698300cc5

* commit '0698300cc567384d6c528b5b1757ed8abe930dc5':
  Simplify LightingFilter in add-free case

Change-Id: Ic395be971bac84e1d2e6f8b9043c026051c21361

src/effects/SkColorMatrixFilter.cpp

diff --git a/src/effects/SkColorMatrixFilter.cpp b/src/effects/SkColorMatrixFilter.cpp
index e122b6a..6b1fd2f 100644
--- a/src/effects/SkColorMatrixFilter.cpp
+++ b/src/effects/SkColorMatrixFilter.cpp
@@ -17,6 +17,10 @@
 }
 
 SkColorFilter* SkColorMatrixFilter::CreateLightingFilter(SkColor mul, SkColor add) {
+    if (0 == add) {
+        return SkColorFilter::CreateModeFilter(mul | SK_ColorBLACK,
+                                               SkXfermode::Mode::kModulate_Mode);
+    }
     SkColorMatrix matrix;
     matrix.setScale(byte_to_scale(SkColorGetR(mul)),
                     byte_to_scale(SkColorGetG(mul)),