| Index: src/gpu/SkGpuDevice.h
|
| diff --git a/src/gpu/SkGpuDevice.h b/src/gpu/SkGpuDevice.h
|
| index 522cba80a1f0f11b850a3a7db163a78613bf9ff6..ad0c2d63f0de18c12723d72422cbb18a9b1f8625 100644
|
| --- a/src/gpu/SkGpuDevice.h
|
| +++ b/src/gpu/SkGpuDevice.h
|
| @@ -41,13 +41,6 @@
|
| static SkGpuDevice* Create(GrRenderTarget* target, const SkSurfaceProps*, unsigned flags = 0);
|
|
|
| /**
|
| - * Creates an SkGpuDevice from a GrRenderTarget whose texture width/height is
|
| - * different than its actual width/height (e.g., approx-match scratch texture).
|
| - */
|
| - static SkGpuDevice* Create(GrRenderTarget* target, int width, int height,
|
| - const SkSurfaceProps*, unsigned flags = 0);
|
| -
|
| - /**
|
| * New device that will create an offscreen renderTarget based on the ImageInfo and
|
| * sampleCount. The Budgeted param controls whether the device's backing store counts against
|
| * the resource cache budget. On failure, returns NULL.
|
| @@ -74,7 +67,7 @@
|
| GrRenderTarget* accessRenderTarget() override;
|
|
|
| SkImageInfo imageInfo() const override {
|
| - return fLegacyBitmap.info();
|
| + return fRenderTarget ? fRenderTarget->surfacePriv().info() : SkImageInfo::MakeUnknown();
|
| }
|
|
|
| const SkSurfaceProps& surfaceProps() const { return fSurfaceProps; }
|
| @@ -128,7 +121,7 @@
|
| const SkImageFilter::Context&,
|
| SkBitmap*, SkIPoint*) override;
|
|
|
| - bool filterTexture(GrContext*, GrTexture*, int width, int height, const SkImageFilter*,
|
| + bool filterTexture(GrContext*, GrTexture*, const SkImageFilter*,
|
| const SkImageFilter::Context&,
|
| SkBitmap* result, SkIPoint* offset);
|
|
|
| @@ -154,7 +147,7 @@
|
| SkBitmap fLegacyBitmap;
|
| bool fNeedClear;
|
|
|
| - SkGpuDevice(GrRenderTarget*, int width, int height, const SkSurfaceProps*, unsigned flags);
|
| + SkGpuDevice(GrRenderTarget*, const SkSurfaceProps*, unsigned flags);
|
|
|
| SkBaseDevice* onCreateDevice(const CreateInfo&, const SkPaint*) override;
|
|
|
|
|