rename utility to see if a paint will overwrite its pixels

src/utils/SkDeferredCanvas.cpp

 
 /*
  * Copyright 2013 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #include "SkDeferredCanvas.h"
 
@@ skipping 773 matching lines @@
     this->recordedDrawCommand();
 }
 
 void SkDeferredCanvas::onClipRegion(const SkRegion& deviceRgn, SkRegion::Op op) {
     this->drawingCanvas()->clipRegion(deviceRgn, op);
     this->INHERITED::onClipRegion(deviceRgn, op);
     this->recordedDrawCommand();
 }
 
 void SkDeferredCanvas::onDrawPaint(const SkPaint& paint) {
-    if (fDeferredDrawing && this->isFullFrame(NULL, &paint) &&
-        isPaintOpaque(&paint)) {
+    if (fDeferredDrawing && this->isFullFrame(NULL, &paint) && SkPaintPriv::Overwrites(paint)) {
         this->getDeferredDevice()->skipPendingCommands();
     }
     AutoImmediateDrawIfNeeded autoDraw(*this, &paint);
     this->drawingCanvas()->drawPaint(paint);
     this->recordedDrawCommand();
 }
 
 void SkDeferredCanvas::onDrawPoints(PointMode mode, size_t count,
                                     const SkPoint pts[], const SkPaint& paint) {
     AutoImmediateDrawIfNeeded autoDraw(*this, &paint);
     this->drawingCanvas()->drawPoints(mode, count, pts, paint);
     this->recordedDrawCommand();
 }
 
 void SkDeferredCanvas::onDrawOval(const SkRect& rect, const SkPaint& paint) {
     AutoImmediateDrawIfNeeded autoDraw(*this, &paint);
     this->drawingCanvas()->drawOval(rect, paint);
     this->recordedDrawCommand();
 }
 
 void SkDeferredCanvas::onDrawRect(const SkRect& rect, const SkPaint& paint) {
-    if (fDeferredDrawing && this->isFullFrame(&rect, &paint) &&
-        isPaintOpaque(&paint)) {
+    if (fDeferredDrawing && this->isFullFrame(&rect, &paint) && SkPaintPriv::Overwrites(paint)) {
         this->getDeferredDevice()->skipPendingCommands();
     }
 
     AutoImmediateDrawIfNeeded autoDraw(*this, &paint);
     this->drawingCanvas()->drawRect(rect, paint);
     this->recordedDrawCommand();
 }
 
 void SkDeferredCanvas::onDrawRRect(const SkRRect& rrect, const SkPaint& paint) {
     if (rrect.isRect()) {
@@ skipping 19 matching lines @@
     this->drawingCanvas()->drawPath(path, paint);
     this->recordedDrawCommand();
 }
 
 void SkDeferredCanvas::onDrawBitmap(const SkBitmap& bitmap, SkScalar left,
                                     SkScalar top, const SkPaint* paint) {
     SkRect bitmapRect = SkRect::MakeXYWH(left, top,
         SkIntToScalar(bitmap.width()), SkIntToScalar(bitmap.height()));
     if (fDeferredDrawing &&
         this->isFullFrame(&bitmapRect, paint) &&
-        isPaintOpaque(paint, &bitmap)) {
+        SkPaintPriv::Overwrites(bitmap, paint)) {
         this->getDeferredDevice()->skipPendingCommands();
     }
 
     AutoImmediateDrawIfNeeded autoDraw(*this, &bitmap, paint);
     this->drawingCanvas()->drawBitmap(bitmap, left, top, paint);
     this->recordedDrawCommand();
 }
 
 void SkDeferredCanvas::onDrawBitmapRect(const SkBitmap& bitmap, const SkRect* src,
                                         const SkRect& dst, const SkPaint* paint,
                                         SK_VIRTUAL_CONSTRAINT_TYPE constraint) {
     if (fDeferredDrawing &&
         this->isFullFrame(&dst, paint) &&
-        isPaintOpaque(paint, &bitmap)) {
+        SkPaintPriv::Overwrites(bitmap, paint)) {
         this->getDeferredDevice()->skipPendingCommands();
     }
 
     AutoImmediateDrawIfNeeded autoDraw(*this, &bitmap, paint);
     this->drawingCanvas()->drawBitmapRect(bitmap, src, dst, paint, (SrcRectConstraint)constraint);
     this->recordedDrawCommand();
 }
 
 
 void SkDeferredCanvas::onDrawImage(const SkImage* image, SkScalar x, SkScalar y,
                                    const SkPaint* paint) {
     SkRect bounds = SkRect::MakeXYWH(x, y,
                                      SkIntToScalar(image->width()), SkIntToScalar(image->height()));
     if (fDeferredDrawing &&
         this->isFullFrame(&bounds, paint) &&
-        isPaintOpaque(paint, image)) {
+        SkPaintPriv::Overwrites(image, paint)) {
         this->getDeferredDevice()->skipPendingCommands();
     }
     
     AutoImmediateDrawIfNeeded autoDraw(*this, image, paint);
     this->drawingCanvas()->drawImage(image, x, y, paint);
     this->recordedDrawCommand();
 }
 void SkDeferredCanvas::onDrawImageRect(const SkImage* image, const SkRect* src, const SkRect& dst,
                                        const SkPaint* paint SRC_RECT_CONSTRAINT_PARAM(constraint)) {
     if (fDeferredDrawing &&
         this->isFullFrame(&dst, paint) &&
-        isPaintOpaque(paint, image)) {
+        SkPaintPriv::Overwrites(image, paint)) {
         this->getDeferredDevice()->skipPendingCommands();
     }
     
     AutoImmediateDrawIfNeeded autoDraw(*this, image, paint);
     this->drawingCanvas()->drawImageRect(image, src, dst, paint
                                          SRC_RECT_CONSTRAINT_ARG(constraint));
     this->recordedDrawCommand();
 }
 
 void SkDeferredCanvas::onDrawImageNine(const SkImage* image, const SkIRect& center,
                                        const SkRect& dst, const SkPaint* paint) {
     if (fDeferredDrawing &&
         this->isFullFrame(&dst, paint) &&
-        isPaintOpaque(paint, image)) {
+        SkPaintPriv::Overwrites(image, paint)) {
         this->getDeferredDevice()->skipPendingCommands();
     }
     
     AutoImmediateDrawIfNeeded autoDraw(*this, image, paint);
     this->drawingCanvas()->drawImageNine(image, center, dst, paint);
     this->recordedDrawCommand();
 }
 
 void SkDeferredCanvas::onDrawBitmapNine(const SkBitmap& bitmap,
                                         const SkIRect& center, const SkRect& dst,
                                         const SkPaint* paint) {
     // TODO: reset recording canvas if paint+bitmap is opaque and clip rect
     // covers canvas entirely and dst covers canvas entirely
     AutoImmediateDrawIfNeeded autoDraw(*this, &bitmap, paint);
     this->drawingCanvas()->drawBitmapNine(bitmap, center, dst, paint);
     this->recordedDrawCommand();
 }
 
 void SkDeferredCanvas::onDrawSprite(const SkBitmap& bitmap, int left, int top,
                                     const SkPaint* paint) {
     SkRect bitmapRect = SkRect::MakeXYWH(
         SkIntToScalar(left),
         SkIntToScalar(top),
         SkIntToScalar(bitmap.width()),
         SkIntToScalar(bitmap.height()));
     if (fDeferredDrawing &&
         this->isFullFrame(&bitmapRect, paint) &&
-        isPaintOpaque(paint, &bitmap)) {
+        SkPaintPriv::Overwrites(bitmap, paint)) {
         this->getDeferredDevice()->skipPendingCommands();
     }
 
     AutoImmediateDrawIfNeeded autoDraw(*this, &bitmap, paint);
     this->drawingCanvas()->drawSprite(bitmap, left, top, paint);
     this->recordedDrawCommand();
 }
 
 void SkDeferredCanvas::onDrawText(const void* text, size_t byteLength, SkScalar x, SkScalar y,
                                   const SkPaint& paint) {
@@ skipping 68 matching lines @@
 SkDrawFilter* SkDeferredCanvas::setDrawFilter(SkDrawFilter* filter) {
     this->drawingCanvas()->setDrawFilter(filter);
     this->INHERITED::setDrawFilter(filter);
     this->recordedDrawCommand();
     return filter;
 }
 
 SkCanvas* SkDeferredCanvas::canvasForDrawIter() {
     return this->drawingCanvas();
 }