commit 66a97349346857503209252b67290a852dccb797
author Robert Phillips <robertphillips@google.com> Thu Oct 04 09:10:29 2018 -0400
committer Skia Commit-Bot <skia-commit-bot@chromium.org> Thu Oct 04 14:14:23 2018 +0000
tree c4c65b9caf7af3e15a993789fd18545805701f0f
parent 4429a4f82cfeb2e63593b81ff373f6f1a5702b7c

Make SkYUVAIndex publicly accessible

Change-Id: I3da7c566cdf9256e57ac7e7f30fee18b9c1a144d
Reviewed-on: https://skia-review.googlesource.com/c/159460
Reviewed-by: Brian Salomon <bsalomon@google.com>
Reviewed-by: Jim Van Verth <jvanverth@google.com>
Commit-Queue: Robert Phillips <robertphillips@google.com>

gm/wacky_yuv_formats.cpp

diff --git a/gm/wacky_yuv_formats.cpp b/gm/wacky_yuv_formats.cpp
index 9fe6dc3..f421e20 100644
--- a/gm/wacky_yuv_formats.cpp
+++ b/gm/wacky_yuv_formats.cpp
@@ -10,8 +10,8 @@
 
 #include "SkColorPriv.h"
 #include "SkImageGenerator.h"
-#include "SkImagePriv.h"
 #include "SkPath.h"
+#include "SkYUVAIndex.h"
 
 static const int kTileWidthHeight = 128;
 static const int kLabelWidth = 64;
@@ -280,13 +280,13 @@
             resultBMs[nextLayer++] = yuvaFull;
 
             yuvaIndices[0].fIndex = 0;
-            yuvaIndices[0].fChannel = kB_SkImageSourceChannel;
+            yuvaIndices[0].fChannel = SkColorChannel::kR;
             yuvaIndices[1].fIndex = 0;
-            yuvaIndices[1].fChannel = kG_SkImageSourceChannel;
+            yuvaIndices[1].fChannel = SkColorChannel::kG;
             yuvaIndices[2].fIndex = 0;
-            yuvaIndices[2].fChannel = kR_SkImageSourceChannel;
+            yuvaIndices[2].fChannel = SkColorChannel::kG;
             yuvaIndices[3].fIndex = 0;
-            yuvaIndices[3].fChannel = kA_SkImageSourceChannel;
+            yuvaIndices[3].fChannel = SkColorChannel::kA;
             break;
         }
         case kNV12_YUVFormat: {
@@ -307,11 +307,11 @@
             resultBMs[nextLayer++] = uvQuarter;
 
             yuvaIndices[0].fIndex = 0;
-            yuvaIndices[0].fChannel = kA_SkImageSourceChannel;
+            yuvaIndices[0].fChannel = SkColorChannel::kA;
             yuvaIndices[1].fIndex = 1;
-            yuvaIndices[1].fChannel = kR_SkImageSourceChannel;
+            yuvaIndices[1].fChannel = SkColorChannel::kR;
             yuvaIndices[2].fIndex = 1;
-            yuvaIndices[2].fChannel = kG_SkImageSourceChannel;
+            yuvaIndices[2].fChannel = SkColorChannel::kG;
             break;
         }
         case kNV21_YUVFormat: {
@@ -332,11 +332,11 @@
             resultBMs[nextLayer++] = vuQuarter;
 
             yuvaIndices[0].fIndex = 0;
-            yuvaIndices[0].fChannel = kA_SkImageSourceChannel;
+            yuvaIndices[0].fChannel = SkColorChannel::kA;
             yuvaIndices[1].fIndex = 1;
-            yuvaIndices[1].fChannel = kG_SkImageSourceChannel;
+            yuvaIndices[1].fChannel = SkColorChannel::kG;
             yuvaIndices[2].fIndex = 1;
-            yuvaIndices[2].fChannel = kR_SkImageSourceChannel;
+            yuvaIndices[2].fChannel = SkColorChannel::kR;
             break;
         }
         case kI420_YUVFormat:
@@ -345,11 +345,11 @@
             resultBMs[nextLayer++] = planes.fVQuarter;
 
             yuvaIndices[0].fIndex = 0;
-            yuvaIndices[0].fChannel = kA_SkImageSourceChannel;
+            yuvaIndices[0].fChannel = SkColorChannel::kA;
             yuvaIndices[1].fIndex = 1;
-            yuvaIndices[1].fChannel = kA_SkImageSourceChannel;
+            yuvaIndices[1].fChannel = SkColorChannel::kA;
             yuvaIndices[2].fIndex = 2;
-            yuvaIndices[2].fChannel = kA_SkImageSourceChannel;
+            yuvaIndices[2].fChannel = SkColorChannel::kA;
             break;
         case kYV12_YUVFormat:
             resultBMs[nextLayer++] = planes.fYFull;
@@ -357,11 +357,11 @@
             resultBMs[nextLayer++] = planes.fUQuarter;
 
             yuvaIndices[0].fIndex = 0;
-            yuvaIndices[0].fChannel = kA_SkImageSourceChannel;
+            yuvaIndices[0].fChannel = SkColorChannel::kA;
             yuvaIndices[1].fIndex = 2;
-            yuvaIndices[1].fChannel = kA_SkImageSourceChannel;
+            yuvaIndices[1].fChannel = SkColorChannel::kA;
             yuvaIndices[2].fIndex = 1;
-            yuvaIndices[2].fChannel = kA_SkImageSourceChannel;
+            yuvaIndices[2].fChannel = SkColorChannel::kA;
             break;
     }
 
@@ -372,7 +372,7 @@
             resultBMs[nextLayer] = planes.fAFull;
 
             yuvaIndices[3].fIndex = nextLayer;
-            yuvaIndices[3].fChannel = kA_SkImageSourceChannel;
+            yuvaIndices[3].fChannel = SkColorChannel::kA;
         }
     }