Revert of Update Skia's YUV API

src/gpu/GrYUVProvider.h

Index: src/gpu/GrYUVProvider.h
diff --git a/src/gpu/GrYUVProvider.h b/src/gpu/GrYUVProvider.h
index 85b238d098b7377d6fa99cb9252f45423fd27e14..869e1fd00d92c214b6bd58052734001cd2533b07 100644
--- a/src/gpu/GrYUVProvider.h
+++ b/src/gpu/GrYUVProvider.h
@@ -10,7 +10,6 @@
 
 #include "GrTypes.h"
 #include "SkImageInfo.h"
-#include "SkYUVSizeInfo.h"
 
 class GrContext;
 class GrTexture;
@@ -39,29 +38,32 @@
 
     virtual uint32_t onGetID() = 0;
 
+    enum {
+        kY_Index = 0,
+        kU_Index = 1,
+        kV_Index = 2,
+
+        kPlaneCount = 3
+    };
+
     // These are not meant to be called by a client, only by the implementation
 
     /**
-     *  If decoding to YUV is supported, this returns true.  Otherwise, this
-     *  returns false and does not modify any of the parameters.
-     *
-     *  @param sizeInfo   Output parameter indicating the sizes and required
-     *                    allocation widths of the Y, U, and V planes.
-     *  @param colorSpace Output parameter.
+     *  Return the 3 dimensions for each plane and return true. On failure, return false and
+     *  ignore the sizes parameter. Typical failure is that the provider does not contain YUV
+     *  data, and may just be an RGB src.
      */
-    virtual bool onQueryYUV8(SkYUVSizeInfo* sizeInfo, SkYUVColorSpace* colorSpace) const = 0;
+    virtual bool onGetYUVSizes(SkISize sizes[kPlaneCount]) = 0;
 
     /**
-     *  Returns true on success and false on failure.
-     *  This always attempts to perform a full decode.  If the client only
-     *  wants size, it should call onQueryYUV8().
+     *  On success, return true, and set sizes, rowbytes and colorspace to the appropriate values.
+     *  planes[] will have already been allocated by the client (based on the worst-case sizes
+     *  returned by onGetYUVSizes(). This method copies its planar data into those buffers.
      *
-     *  @param sizeInfo   Needs to exactly match the values returned by the
-     *                    query, except the WidthBytes may be larger than the
-     *                    recommendation (but not smaller).
-     *  @param planes     Memory for each of the Y, U, and V planes.
+     *  On failure, return false and ignore other parameters.
      */
-    virtual bool onGetYUV8Planes(const SkYUVSizeInfo& sizeInfo, void* planes[3]) = 0;
+    virtual bool onGetYUVPlanes(SkISize sizes[kPlaneCount], void* planes[kPlaneCount],
+                                size_t rowBytes[kPlaneCount], SkYUVColorSpace*) = 0;
 };
 
 #endif