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/include/gpu/GrAARectRenderer.h b/include/gpu/GrAARectRenderer.h
index a19b07a..607329a 100644
--- a/include/gpu/GrAARectRenderer.h
+++ b/include/gpu/GrAARectRenderer.h
@@ -9,9 +9,9 @@
#ifndef GrAARectRenderer_DEFINED
#define GrAARectRenderer_DEFINED
-#include "GrRect.h"
#include "GrRefCnt.h"
#include "SkMatrix.h"
+#include "SkRect.h"
class GrGpu;
class GrDrawTarget;
@@ -40,9 +40,9 @@
void fillAARect(GrGpu* gpu,
GrDrawTarget* target,
- const GrRect& rect,
+ const SkRect& rect,
const SkMatrix& combinedMatrix,
- const GrRect& devRect,
+ const SkRect& devRect,
bool useVertexCoverage) {
#ifdef SHADER_AA_FILL_RECT
if (combinedMatrix.rectStaysRect()) {
@@ -61,9 +61,9 @@
void strokeAARect(GrGpu* gpu,
GrDrawTarget* target,
- const GrRect& rect,
+ const SkRect& rect,
const SkMatrix& combinedMatrix,
- const GrRect& devRect,
+ const SkRect& devRect,
SkScalar width,
bool useVertexCoverage);
@@ -87,19 +87,19 @@
// since we now have a coverage vertex attribute
void geometryFillAARect(GrGpu* gpu,
GrDrawTarget* target,
- const GrRect& rect,
+ const SkRect& rect,
const SkMatrix& combinedMatrix,
- const GrRect& devRect,
+ const SkRect& devRect,
bool useVertexCoverage);
void shaderFillAARect(GrGpu* gpu,
GrDrawTarget* target,
- const GrRect& rect,
+ const SkRect& rect,
const SkMatrix& combinedMatrix);
void shaderFillAlignedAARect(GrGpu* gpu,
GrDrawTarget* target,
- const GrRect& rect,
+ const SkRect& rect,
const SkMatrix& combinedMatrix);
void geometryStrokeAARect(GrGpu* gpu,