| Index: src/gpu/GrInOrderDrawBuffer.h
|
| diff --git a/src/gpu/GrInOrderDrawBuffer.h b/src/gpu/GrInOrderDrawBuffer.h
|
| index 464fdcb3798f40935c2b0a023ade5c128ff61f60..ac1b79cd55f02c59eb3d011a2db8866d2940a7f0 100644
|
| --- a/src/gpu/GrInOrderDrawBuffer.h
|
| +++ b/src/gpu/GrInOrderDrawBuffer.h
|
| @@ -38,21 +38,21 @@ public:
|
| GrVertexBufferAllocPool* vertexPool,
|
| GrIndexBufferAllocPool* indexPool);
|
|
|
| - ~GrInOrderDrawBuffer() SK_OVERRIDE;
|
| + ~GrInOrderDrawBuffer() override;
|
|
|
| // tracking for draws
|
| - DrawToken getCurrentDrawToken() SK_OVERRIDE { return DrawToken(this, fDrawID); }
|
| + DrawToken getCurrentDrawToken() override { return DrawToken(this, fDrawID); }
|
|
|
| void clearStencilClip(const SkIRect& rect,
|
| bool insideClip,
|
| - GrRenderTarget* renderTarget) SK_OVERRIDE;
|
| + GrRenderTarget* renderTarget) override;
|
|
|
| - void discard(GrRenderTarget*) SK_OVERRIDE;
|
| + void discard(GrRenderTarget*) override;
|
|
|
| protected:
|
| void willReserveVertexAndIndexSpace(int vertexCount,
|
| size_t vertexStride,
|
| - int indexCount) SK_OVERRIDE;
|
| + int indexCount) override;
|
|
|
| void appendIndicesAndTransforms(const void* indexValues, PathIndexType indexType,
|
| const float* transformValues, PathTransformType transformType,
|
| @@ -92,28 +92,28 @@ protected:
|
| private:
|
| friend class GrTargetCommands;
|
|
|
| - void onReset() SK_OVERRIDE;
|
| - void onFlush() SK_OVERRIDE;
|
| + void onReset() override;
|
| + void onFlush() override;
|
|
|
| // overrides from GrDrawTarget
|
| - void onDraw(const GrGeometryProcessor*, const DrawInfo&, const PipelineInfo&) SK_OVERRIDE;
|
| - void onDrawBatch(GrBatch*, const PipelineInfo&) SK_OVERRIDE;
|
| + void onDraw(const GrGeometryProcessor*, const DrawInfo&, const PipelineInfo&) override;
|
| + void onDrawBatch(GrBatch*, const PipelineInfo&) override;
|
| void onDrawRect(GrPipelineBuilder*,
|
| GrColor,
|
| const SkMatrix& viewMatrix,
|
| const SkRect& rect,
|
| const SkRect* localRect,
|
| - const SkMatrix* localMatrix) SK_OVERRIDE;
|
| + const SkMatrix* localMatrix) override;
|
|
|
| void onStencilPath(const GrPipelineBuilder&,
|
| const GrPathProcessor*,
|
| const GrPath*,
|
| const GrScissorState&,
|
| - const GrStencilSettings&) SK_OVERRIDE;
|
| + const GrStencilSettings&) override;
|
| void onDrawPath(const GrPathProcessor*,
|
| const GrPath*,
|
| const GrStencilSettings&,
|
| - const PipelineInfo&) SK_OVERRIDE;
|
| + const PipelineInfo&) override;
|
| void onDrawPaths(const GrPathProcessor*,
|
| const GrPathRange*,
|
| const void* indices,
|
| @@ -122,15 +122,15 @@ private:
|
| PathTransformType,
|
| int count,
|
| const GrStencilSettings&,
|
| - const PipelineInfo&) SK_OVERRIDE;
|
| + const PipelineInfo&) override;
|
| void onClear(const SkIRect* rect,
|
| GrColor color,
|
| bool canIgnoreRect,
|
| - GrRenderTarget* renderTarget) SK_OVERRIDE;
|
| + GrRenderTarget* renderTarget) override;
|
| bool onCopySurface(GrSurface* dst,
|
| GrSurface* src,
|
| const SkIRect& srcRect,
|
| - const SkIPoint& dstPoint) SK_OVERRIDE;
|
| + const SkIPoint& dstPoint) override;
|
|
|
| // Attempts to concat instances from info onto the previous draw. info must represent an
|
| // instanced draw. The caller must have already recorded a new draw state and clip if necessary.
|
| @@ -144,7 +144,7 @@ private:
|
| SkASSERT(index < fGpuCmdMarkers.count());
|
| return fGpuCmdMarkers[index].toString();
|
| }
|
| - bool isIssued(uint32_t drawID) SK_OVERRIDE { return drawID != fDrawID; }
|
| + bool isIssued(uint32_t drawID) override { return drawID != fDrawID; }
|
|
|
| // TODO: Use a single allocator for commands and records
|
| enum {
|
|
|