aboutsummaryrefslogtreecommitdiffhomepage
path: root/src/gpu/GrClipMaskManager.h
diff options
context:
space:
mode:
authorGravatar commit-bot@chromium.org <commit-bot@chromium.org@2bbb7eff-a529-9590-31e7-b0007b416f81>2013-07-17 21:39:42 +0000
committerGravatar commit-bot@chromium.org <commit-bot@chromium.org@2bbb7eff-a529-9590-31e7-b0007b416f81>2013-07-17 21:39:42 +0000
commitfd03d4a829efe2d77a712fd991927c55f59a2ffe (patch)
treeb207777f1e3fe70b5823a2bc166a75c71f311036 /src/gpu/GrClipMaskManager.h
parent5dd567c2a55c16c8bc2668902cdfce1734dfae8f (diff)
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
Diffstat (limited to 'src/gpu/GrClipMaskManager.h')
-rw-r--r--src/gpu/GrClipMaskManager.h7
1 files changed, 3 insertions, 4 deletions
diff --git a/src/gpu/GrClipMaskManager.h b/src/gpu/GrClipMaskManager.h
index 121737b897..2cba4776d9 100644
--- a/src/gpu/GrClipMaskManager.h
+++ b/src/gpu/GrClipMaskManager.h
@@ -12,7 +12,6 @@
#include "GrContext.h"
#include "GrDrawState.h"
#include "GrNoncopyable.h"
-#include "GrRect.h"
#include "GrReducedClip.h"
#include "GrStencil.h"
#include "GrTexture.h"
@@ -142,13 +141,13 @@ private:
void mergeMask(GrTexture* dstMask,
GrTexture* srcMask,
SkRegion::Op op,
- const GrIRect& dstBound,
- const GrIRect& srcBound);
+ const SkIRect& dstBound,
+ const SkIRect& srcBound);
void getTemp(int width, int height, GrAutoScratchTexture* temp);
void setupCache(const SkClipStack& clip,
- const GrIRect& bounds);
+ const SkIRect& bounds);
/**
* Called prior to return control back the GrGpu in setupClipping. It