| Index: src/gpu/gl/GrGpuGL.h
|
| diff --git a/src/gpu/gl/GrGpuGL.h b/src/gpu/gl/GrGpuGL.h
|
| index 38e5842dcef8b18a001cc6e5eca86f8cca47e576..b5ea2a7be5e807eaa7fd223cc6a06699a94de701 100644
|
| --- a/src/gpu/gl/GrGpuGL.h
|
| +++ b/src/gpu/gl/GrGpuGL.h
|
| @@ -5,12 +5,9 @@
|
| * found in the LICENSE file.
|
| */
|
|
|
| -
|
| -
|
| #ifndef GrGpuGL_DEFINED
|
| #define GrGpuGL_DEFINED
|
|
|
| -
|
| #include "GrBinHashKey.h"
|
| #include "GrDrawState.h"
|
| #include "GrGpu.h"
|
| @@ -121,7 +118,7 @@ private:
|
| GrStencilBuffer* sb,
|
| GrRenderTarget* rt) SK_OVERRIDE;
|
|
|
| - virtual void onClear(const GrIRect* rect, GrColor color) SK_OVERRIDE;
|
| + virtual void onClear(const SkIRect* rect, GrColor color) SK_OVERRIDE;
|
|
|
| virtual void onForceRenderTargetFlush() SK_OVERRIDE;
|
|
|
| @@ -148,7 +145,7 @@ private:
|
| virtual void onGpuStencilPath(const GrPath*, SkPath::FillType) SK_OVERRIDE;
|
|
|
| virtual void clearStencil() SK_OVERRIDE;
|
| - virtual void clearStencilClip(const GrIRect& rect,
|
| + virtual void clearStencilClip(const SkIRect& rect,
|
| bool insideClip) SK_OVERRIDE;
|
| virtual bool flushGraphicsState(DrawType, const GrDeviceCoordTexture* dstCopy) SK_OVERRIDE;
|
|
|
| @@ -235,7 +232,7 @@ private:
|
|
|
| // bound is region that may be modified and therefore has to be resolved.
|
| // NULL means whole target. Can be an empty rect.
|
| - void flushRenderTarget(const GrIRect* bound);
|
| + void flushRenderTarget(const SkIRect* bound);
|
| void flushStencil(DrawType);
|
| void flushAAState(DrawType);
|
|
|
|
|