| Index: src/gpu/GrTest.cpp
|
| diff --git a/src/gpu/GrTest.cpp b/src/gpu/GrTest.cpp
|
| index 8174d76779b807515c559e2f844ff141b6a4b0e4..14d6bd49de7ba6c22c1b282388bf14a025a097a5 100644
|
| --- a/src/gpu/GrTest.cpp
|
| +++ b/src/gpu/GrTest.cpp
|
| @@ -1,4 +1,3 @@
|
| -
|
| /*
|
| * Copyright 2013 Google Inc.
|
| *
|
| @@ -297,7 +296,7 @@ public:
|
| GrPixelConfig readConfig, DrawPreference*,
|
| ReadPixelTempDrawInfo*) override { return false; }
|
|
|
| - bool onGetWritePixelsInfo(GrSurface* dstSurface, int width, int height, size_t rowBytes,
|
| + bool onGetWritePixelsInfo(GrSurface* dstSurface, int width, int height,
|
| GrPixelConfig srcConfig, DrawPreference*,
|
| WritePixelTempDrawInfo*) override { return false; }
|
|
|
| @@ -323,12 +322,12 @@ private:
|
| void xferBarrier(GrRenderTarget*, GrXferBarrierType) override {}
|
|
|
| GrTexture* onCreateTexture(const GrSurfaceDesc& desc, GrGpuResource::LifeCycle lifeCycle,
|
| - const void* srcData, size_t rowBytes) override {
|
| + const SkTArray<SkMipMapLevel>& texels) override {
|
| return nullptr;
|
| }
|
|
|
| GrTexture* onCreateCompressedTexture(const GrSurfaceDesc& desc, GrGpuResource::LifeCycle,
|
| - const void* srcData) override {
|
| + const SkTArray<SkMipMapLevel>& texels) override {
|
| return nullptr;
|
| }
|
|
|
| @@ -362,8 +361,7 @@ private:
|
|
|
| bool onWritePixels(GrSurface* surface,
|
| int left, int top, int width, int height,
|
| - GrPixelConfig config, const void* buffer,
|
| - size_t rowBytes) override {
|
| + GrPixelConfig config, const SkTArray<SkMipMapLevel>& texels) override {
|
| return false;
|
| }
|
|
|
| @@ -386,7 +384,7 @@ private:
|
|
|
| GrBackendObject createTestingOnlyBackendTexture(void* pixels, int w, int h,
|
| GrPixelConfig config) const override {
|
| - return 0;
|
| + return 0;
|
| }
|
| bool isTestingOnlyBackendTexture(GrBackendObject ) const override { return false; }
|
| void deleteTestingOnlyBackendTexture(GrBackendObject, bool abandonTexture) const override {}
|
|
|