3 files changed, 36 insertions, 51 deletions
diff --git a/docs/SkImageInfo_Reference.bmh b/docs/SkImageInfo_Reference.bmh
index c877f7ff30..963bcd4181 100644
--- a/docs/SkImageInfo_Reference.bmh
+++ b/docs/SkImageInfo_Reference.bmh
@@ -1037,21 +1037,6 @@ with studio range of 16 to 235 range for components.
 
 # ------------------------------------------------------------------------------
 
-#Struct SkYUVAIndex
-
-Describes which image source and which channel to read for each YUVA planes.
-
-#Member int fIndex
-Describes which image source to be reading from. The Alpha plane is optional and could be set to -1.
-##
-
-#Member SkImageSourceChannel fChannel
-Describes which of the RGBA channel to read from.
-##
-
-#Struct SkYUVAIndex ##
-
-# ------------------------------------------------------------------------------
 
 #Struct SkImageInfo
 
diff --git a/include/core/SkImageInfo.h b/include/core/SkImageInfo.h
index cb0e6dbbee..eb96f19723 100644
--- a/include/core/SkImageInfo.h
+++ b/include/core/SkImageInfo.h
@@ -219,42 +219,6 @@ enum SkYUVColorSpace {
     kLastEnum_SkYUVColorSpace = kRec709_SkYUVColorSpace,
 };
 
-/** \enum SkImageInfo::SkImageSourceChannel
-    Describes different channels we could read from image source.
-*/
-enum SkImageSourceChannel {
-    /** Describes the red channel; */
-    kR_SkImageSourceChannel,
-
-    /** Describes the green channel; */
-    kG_SkImageSourceChannel,
-
-    /** Describes the blue channel; */
-    kB_SkImageSourceChannel,
-
-    /** Describes the alpha channel; */
-    kA_SkImageSourceChannel,
-
-    /** Describes the alpha channel; */
-    kLastEnum_SkImageSourceChannel = kA_SkImageSourceChannel,
-};
-
-/** \struct SkYUVAIndex
-    Describes from which image source and which channel to read each individual YUVA plane.
-
-    SkYUVAIndex contains a index for which image source to read from and a enum for which channel
-    to read from.
-*/
-struct SK_API SkYUVAIndex {
-    /** The index is a number between -1..3 which definies which image source to read from, where -1
-     * means the image source doesn't exist. The assumption is we will always have image sources for
-     * each of YUV planes, but optionally have image source for A plane. */
-    int fIndex;
-    /** The channel describes from which channel to read the info from. Currently we only deal with
-     * YUV and NV12 and channel info is ignored. */
-    SkImageSourceChannel fChannel;
-};
-
 /** \struct SkImageInfo
     Describes pixel dimensions and encoding. SkBitmap, SkImage, PixMap, and SkSurface
     can be created from SkImageInfo. SkImageInfo can be retrieved from SkBitmap and
diff --git a/src/core/SkImagePriv.h b/src/core/SkImagePriv.h
index b0bc85efaf..7848bf4035 100644
--- a/src/core/SkImagePriv.h
+++ b/src/core/SkImagePriv.h
@@ -83,4 +83,40 @@ void SkImage_unpinAsTexture(const SkImage*, GrContext*);
  */
 sk_sp<SkImage> SkImageMakeRasterCopyAndAssignColorSpace(const SkImage*, SkColorSpace*);
 
+/** \enum SkImageInfo::SkImageSourceChannel
+    Describes different channels we could read from image source.
+*/
+enum SkImageSourceChannel {
+    /** Describes the red channel; */
+    kR_SkImageSourceChannel,
+
+    /** Describes the green channel; */
+    kG_SkImageSourceChannel,
+
+    /** Describes the blue channel; */
+    kB_SkImageSourceChannel,
+
+    /** Describes the alpha channel; */
+    kA_SkImageSourceChannel,
+
+    /** Describes the alpha channel; */
+    kLastEnum_SkImageSourceChannel = kA_SkImageSourceChannel,
+};
+
+/** \struct SkYUVAIndex
+    Describes from which image source and which channel to read each individual YUVA plane.
+
+    SkYUVAIndex contains a index for which image source to read from and a enum for which channel
+    to read from.
+*/
+struct SK_API SkYUVAIndex {
+    /** The index is a number between -1..3 which definies which image source to read from, where -1
+     * means the image source doesn't exist. The assumption is we will always have image sources for
+     * each of YUV planes, but optionally have image source for A plane. */
+    int fIndex;
+    /** The channel describes from which channel to read the info from. Currently we only deal with
+     * YUV and NV12 and channel info is ignored. */
+    SkImageSourceChannel fChannel;
+};
+
 #endif