Index: src/gpu/SkGpuDevice.cpp |
diff --git a/src/gpu/SkGpuDevice.cpp b/src/gpu/SkGpuDevice.cpp |
index e6c834394311c56e7d424d1e6022c9d5dac33634..9a78048aa7f139195a01c0bc0d97756319353da4 100644 |
--- a/src/gpu/SkGpuDevice.cpp |
+++ b/src/gpu/SkGpuDevice.cpp |
@@ -68,7 +68,7 @@ |
#define DO_DEFERRED_CLEAR() \ |
do { \ |
if (fFlags & kNeedClear_Flag) { \ |
- this->clearAll(); \ |
+ this->clear(SK_ColorTRANSPARENT); \ |
} \ |
} while (false) \ |
@@ -294,14 +294,6 @@ |
return fRenderTarget; |
} |
-void SkGpuDevice::clearAll() { |
- GrColor color = 0; |
- GR_CREATE_TRACE_MARKER_CONTEXT("SkGpuDevice::clearAll", fContext); |
- SkIRect rect = SkIRect::MakeWH(this->width(), this->height()); |
- fContext->clear(&rect, color, true, fRenderTarget); |
- fFlags &= ~kNeedClear_Flag; |
-} |
- |
/////////////////////////////////////////////////////////////////////////////// |
SK_COMPILE_ASSERT(SkShader::kNone_BitmapType == 0, shader_type_mismatch); |
@@ -316,6 +308,13 @@ |
SK_COMPILE_ASSERT(SkShader::kLast_BitmapType == 6, shader_type_mismatch); |
/////////////////////////////////////////////////////////////////////////////// |
+ |
+void SkGpuDevice::clear(SkColor color) { |
+ GR_CREATE_TRACE_MARKER_CONTEXT("SkGpuDevice::clear", fContext); |
+ SkIRect rect = SkIRect::MakeWH(this->width(), this->height()); |
+ fContext->clear(&rect, SkColor2GrColor(color), true, fRenderTarget); |
+ fFlags &= ~kNeedClear_Flag; |
+} |
void SkGpuDevice::drawPaint(const SkDraw& draw, const SkPaint& paint) { |
CHECK_SHOULD_DRAW(draw, false); |
@@ -1482,7 +1481,7 @@ |
SkGpuDevice* dev = static_cast<SkGpuDevice*>(device); |
if (dev->fFlags & kNeedClear_Flag) { |
// TODO: could check here whether we really need to draw at all |
- dev->clearAll(); |
+ dev->clear(0x0); |
} |
// drawDevice is defined to be in device coords. |