Index: src/gpu/GrClipMaskManager.h |
diff --git a/src/gpu/GrClipMaskManager.h b/src/gpu/GrClipMaskManager.h |
index f93fa4af0dbed03e4f0da79a139a36058f1319da..e41a48bbb491373539645e124dd919a343ddefde 100644 |
--- a/src/gpu/GrClipMaskManager.h |
+++ b/src/gpu/GrClipMaskManager.h |
@@ -41,21 +41,6 @@ public: |
, fClipMode(kIgnoreClip_StencilClipMode) { |
} |
- // The state of the scissor is controlled by the clip manager, no one else should set |
- // Scissor state. This should really be on Gpu itself. We should revist this when GPU |
- // and drawtarget are separate |
- struct ScissorState { |
- ScissorState() : fEnabled(false) {} |
- void set(const SkIRect& rect) { fRect = rect; fEnabled = true; } |
- bool operator==(const ScissorState& other) const { |
- return fEnabled == other.fEnabled && |
- (false == fEnabled || fRect == other.fRect); |
- } |
- bool operator!=(const ScissorState& other) const { return !(*this == other); } |
- bool fEnabled; |
- SkIRect fRect; |
- }; |
- |
/** |
* Creates a clip mask if necessary as a stencil buffer or alpha texture |
* and sets the GrGpu's scissor and stencil state. If the return is false |
@@ -66,7 +51,7 @@ public: |
bool setupClipping(GrDrawState*, |
GrDrawState::AutoRestoreEffects*, |
GrDrawState::AutoRestoreStencil*, |
- ScissorState*, |
+ GrScissorState*, |
const GrClipData* clipDataIn, |
const SkRect* devBounds); |