Revert of Update Skia's YUV API

src/lazy/SkDiscardablePixelRef.h

 /*
  * Copyright 2013 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #ifndef SkDiscardablePixelRef_DEFINED
 #define SkDiscardablePixelRef_DEFINED
 
@@ skipping 36 matching lines @@
 
     SkDiscardableMemory* fDiscardableMemory;
     bool                 fDiscardableMemoryIsLocked;
     SkAutoTUnref<SkColorTable> fCTable;
 
     /* Takes ownership of SkImageGenerator. */
     SkDiscardablePixelRef(const SkImageInfo&, SkImageGenerator*,
                           size_t rowBytes,
                           SkDiscardableMemory::Factory* factory);
 
-    bool onQueryYUV8(SkYUVSizeInfo* sizeInfo, SkYUVColorSpace* colorSpace) const override {
+    bool onGetYUV8Planes(SkISize sizes[3],
+                         void* planes[3],
+                         size_t rowBytes[3],
+                         SkYUVColorSpace* colorSpace) override {
         // If the image was already decoded with lockPixels(), favor not
         // re-decoding to YUV8 planes.
         if (fDiscardableMemory) {
             return false;
         }
-        return fGenerator->queryYUV8(sizeInfo, colorSpace);
-    }
-
-    bool onGetYUV8Planes(const SkYUVSizeInfo& sizeInfo, void* planes[3]) override {
-        // If the image was already decoded with lockPixels(), favor not
-        // re-decoding to YUV8 planes.
-        if (fDiscardableMemory) {
-            return false;
-        }
-        return fGenerator->getYUV8Planes(sizeInfo, planes);
+        return fGenerator->getYUV8Planes(sizes, planes, rowBytes, colorSpace);
     }
 
     friend bool SkDEPRECATED_InstallDiscardablePixelRef(SkImageGenerator*, const SkIRect*, SkBitmap*,
                                              SkDiscardableMemory::Factory*);
 
     typedef SkPixelRef INHERITED;
 };
 
 #endif  // SkDiscardablePixelRef_DEFINED