Index: src/gpu/SkGpuDevice.cpp |
diff --git a/src/gpu/SkGpuDevice.cpp b/src/gpu/SkGpuDevice.cpp |
index add0fa744f09a4c3c66f193cb8f3b7ad2223e084..b05cd3342535bca31d562839b10b8af0e3a18d1f 100644 |
--- a/src/gpu/SkGpuDevice.cpp |
+++ b/src/gpu/SkGpuDevice.cpp |
@@ -20,7 +20,6 @@ |
#include "SkGrTexturePixelRef.h" |
-#include "SkBounder.h" |
#include "SkDeviceImageFilterProxy.h" |
#include "SkDrawProcs.h" |
#include "SkGlyphCache.h" |
@@ -532,10 +531,6 @@ void SkGpuDevice::drawRRect(const SkDraw& draw, const SkRRect& rect, |
// clipped out |
return; |
} |
- if (NULL != draw.fBounder && !draw.fBounder->doIRect(finalIRect)) { |
- // nothing to draw |
- return; |
- } |
if (paint.getMaskFilter()->directFilterRRectMaskGPU(fContext, &grPaint, |
stroke, devRRect)) { |
return; |
@@ -611,7 +606,6 @@ void SkGpuDevice::drawOval(const SkDraw& draw, const SkRect& oval, |
} |
#include "SkMaskFilter.h" |
-#include "SkBounder.h" |
/////////////////////////////////////////////////////////////////////////////// |
@@ -638,7 +632,7 @@ bool draw_mask(GrContext* context, const SkRect& maskRect, |
} |
bool draw_with_mask_filter(GrContext* context, const SkPath& devPath, |
- SkMaskFilter* filter, const SkRegion& clip, SkBounder* bounder, |
+ SkMaskFilter* filter, const SkRegion& clip, |
GrPaint* grp, SkPaint::Style style) { |
SkMask srcM, dstM; |
@@ -657,9 +651,6 @@ bool draw_with_mask_filter(GrContext* context, const SkPath& devPath, |
if (clip.quickReject(dstM.fBounds)) { |
return false; |
} |
- if (bounder && !bounder->doIRect(dstM.fBounds)) { |
- return false; |
- } |
// we now have a device-aligned 8bit mask in dstM, ready to be drawn using |
// the current clip (and identity matrix) and GrPaint settings |
@@ -819,10 +810,6 @@ void SkGpuDevice::drawPath(const SkDraw& draw, const SkPath& origSrcPath, |
// clipped out |
return; |
} |
- if (NULL != draw.fBounder && !draw.fBounder->doIRect(finalIRect)) { |
- // nothing to draw |
- return; |
- } |
if (paint.getMaskFilter()->directFilterMaskGPU(fContext, &grPaint, |
stroke, *devPathPtr)) { |
@@ -862,8 +849,8 @@ void SkGpuDevice::drawPath(const SkDraw& draw, const SkPath& origSrcPath, |
// GPU path fails |
SkPaint::Style style = stroke.isHairlineStyle() ? SkPaint::kStroke_Style : |
SkPaint::kFill_Style; |
- draw_with_mask_filter(fContext, *devPathPtr, paint.getMaskFilter(), |
- *draw.fClip, draw.fBounder, &grPaint, style); |
+ draw_with_mask_filter(fContext, *devPathPtr, paint.getMaskFilter(), *draw.fClip, &grPaint, |
+ style); |
return; |
} |