Replace all instances of GrRect with SkRect.
And remove the typedef in GrRect.h. The same with GrIRect.
R=robertphillips@google.com
Author: tfarina@chromium.org
Review URL: https://chromiumcodereview.appspot.com/19449002
git-svn-id: http://skia.googlecode.com/svn/trunk@10130 2bbb7eff-a529-9590-31e7-b0007b416f81
diff --git a/src/gpu/GrGpu.h b/src/gpu/GrGpu.h
index 85e3988..86c25ee 100644
--- a/src/gpu/GrGpu.h
+++ b/src/gpu/GrGpu.h
@@ -1,4 +1,3 @@
-
/*
* Copyright 2011 Google Inc.
*
@@ -6,15 +5,12 @@
* found in the LICENSE file.
*/
-
#ifndef GrGpu_DEFINED
#define GrGpu_DEFINED
#include "GrDrawTarget.h"
-#include "GrRect.h"
#include "GrRefCnt.h"
#include "GrClipMaskManager.h"
-
#include "SkPath.h"
class GrContext;
@@ -27,7 +23,6 @@
class GrVertexBufferAllocPool;
class GrGpu : public GrDrawTarget {
-
public:
/**
@@ -269,7 +264,7 @@
void removeResource(GrResource* resource);
// GrDrawTarget overrides
- virtual void clear(const GrIRect* rect,
+ virtual void clear(const SkIRect* rect,
GrColor color,
GrRenderTarget* renderTarget = NULL) SK_OVERRIDE;
@@ -310,7 +305,7 @@
* onStencilPath member functions.) The GrGpu subclass should flush the
* stencil state to the 3D API in its implementation of flushGraphicsState.
*/
- void enableScissor(const GrIRect& rect) {
+ void enableScissor(const SkIRect& rect) {
fScissorState.fEnabled = true;
fScissorState.fRect = rect;
}
@@ -331,7 +326,7 @@
// GrGpu subclass sets clip bit in the stencil buffer. The subclass is
// free to clear the remaining bits to zero if masked clears are more
// expensive than clearing all bits.
- virtual void clearStencilClip(const GrIRect& rect, bool insideClip) = 0;
+ virtual void clearStencilClip(const SkIRect& rect, bool insideClip) = 0;
enum PrivateDrawStateStateBits {
kFirstBit = (GrDrawState::kLastPublicStateBit << 1),
@@ -398,7 +393,7 @@
// The state of the scissor is controlled by the clip manager
struct ScissorState {
bool fEnabled;
- GrIRect fRect;
+ SkIRect fRect;
} fScissorState;
// The final stencil settings to use as determined by the clip manager.
@@ -442,7 +437,7 @@
// overridden by backend-specific derived class to perform the clear and
// clearRect. NULL rect means clear whole target.
- virtual void onClear(const GrIRect* rect, GrColor color) = 0;
+ virtual void onClear(const SkIRect* rect, GrColor color) = 0;
// overridden by backend-specific derived class to perform the draw call.
virtual void onGpuDraw(const DrawInfo&) = 0;