commit e3917fd5ca950222facf027a73d95c8339bced54
author Matt Sarett <msarett@google.com> Mon Jan 23 09:41:08 2017 -0500
committer Matt Sarett <msarett@google.com> Tue Jan 24 19:59:16 2017 +0000
tree 289ffd4c283090e8af78655e8e1948fd5e7df5e3
parent 1517224346e9e3e017401ec3f92bf30d98e5e995

Allow conversion from non-opaque to opaque [chrome/m57]

BUG:683787

Change-Id: I1b78cc8d1b5d3917a2a952da036b93022e99e053
Reviewed-on: https://skia-review.googlesource.com/7374
Reviewed-by: Robert Phillips <robertphillips@google.com>
Commit-Queue: Matt Sarett <msarett@google.com>
(cherry picked from commit bfe8dca7dfdd9cafbccba0a637f2fcd58c7a54fb)
Reviewed-on: https://skia-review.googlesource.com/7402

src/core/SkImageInfoPriv.h

diff --git a/src/core/SkImageInfoPriv.h b/src/core/SkImageInfoPriv.h
index 72138ae..151de82 100644
--- a/src/core/SkImageInfoPriv.h
+++ b/src/core/SkImageInfoPriv.h
@@ -69,9 +69,10 @@
         return false;
     }
 
-    if (kOpaque_SkAlphaType == dst.alphaType() && kOpaque_SkAlphaType != src.alphaType()) {
-        return false;
-    }
+    // TODO (msarett): This is diabled for crbug.com/683787.  How should we handle this case?
+    //if (kOpaque_SkAlphaType == dst.alphaType() && kOpaque_SkAlphaType != src.alphaType()) {
+    //    return false;
+    //}
 
     return true;
 }