commit 9854583ca7c38d5b0fd4e8e6941190a2f17044c3
author Skia_Android Canary Bot <31977622648@project.gserviceaccount.com> Wed Jan 18 13:46:24 2017 +0000
committer Skia_Android Canary Bot <31977622648@project.gserviceaccount.com> Wed Jan 18 13:46:24 2017 +0000
tree 452050b7aa79cf5b02b559bf40eef942072338b8
parent c12c047eab878678be5eb452ddfa0cded89df7d4
parent 8dadd9e8936a1c8f44fccdfde7f883dfe2d89c96

Merge latest Skia into master (1 commits)

https://skia.googlesource.com/skia.git/+log/d4bdee5..8dadd9e

Test: Presubmit checks will test this change.
Change-Id: I7ffc13e7c8ef0ea7d26e3461e00b742a60788ab4

src/core/SkImageInfoPriv.h

diff --git a/src/core/SkImageInfoPriv.h b/src/core/SkImageInfoPriv.h
index 72138ae..029aa93 100644
--- a/src/core/SkImageInfoPriv.h
+++ b/src/core/SkImageInfoPriv.h
@@ -69,9 +69,11 @@
         return false;
     }
 
-    if (kOpaque_SkAlphaType == dst.alphaType() && kOpaque_SkAlphaType != src.alphaType()) {
-        return false;
-    }
+    // FIXME (msarett): This is commented out until a fix to Chrome's gfx_unittest lands.
+    // In those tests, they write kPremul pixels to a kOpaque canvas.
+    //if (kOpaque_SkAlphaType == dst.alphaType() && kOpaque_SkAlphaType != src.alphaType()) {
+    //    return false;
+    //}
 
     return true;
 }