commit af51e04dc0978d7a93f12ee7588f5af9336c1fcc
author reed <reed@google.com> Wed Jul 15 13:42:32 2015 -0700
committer Commit bot <commit-bot@chromium.org> Wed Jul 15 13:42:32 2015 -0700
tree 037742b169e4265a73e54ef2bd65c808291f1bbe
parent 891f0f35db5c805f57fe070a2f2b515c612eecca

rename utility to see if a paint will overwrite its pixels

BUG=skia:

Review URL: https://codereview.chromium.org/1228853005

src/utils/SkDeferredCanvas.cpp

diff --git a/src/utils/SkDeferredCanvas.cpp b/src/utils/SkDeferredCanvas.cpp
index 343d0c4..5ff987e 100644
--- a/src/utils/SkDeferredCanvas.cpp
+++ b/src/utils/SkDeferredCanvas.cpp
@@ -791,8 +791,7 @@
 }
 
 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);
@@ -814,8 +813,7 @@
 }
 
 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();
     }
 
@@ -855,7 +853,7 @@
         SkIntToScalar(bitmap.width()), SkIntToScalar(bitmap.height()));
     if (fDeferredDrawing &&
         this->isFullFrame(&bitmapRect, paint) &&
-        isPaintOpaque(paint, &bitmap)) {
+        SkPaintPriv::Overwrites(bitmap, paint)) {
         this->getDeferredDevice()->skipPendingCommands();
     }
 
@@ -869,7 +867,7 @@
                                         SK_VIRTUAL_CONSTRAINT_TYPE constraint) {
     if (fDeferredDrawing &&
         this->isFullFrame(&dst, paint) &&
-        isPaintOpaque(paint, &bitmap)) {
+        SkPaintPriv::Overwrites(bitmap, paint)) {
         this->getDeferredDevice()->skipPendingCommands();
     }
 
@@ -885,7 +883,7 @@
                                      SkIntToScalar(image->width()), SkIntToScalar(image->height()));
     if (fDeferredDrawing &&
         this->isFullFrame(&bounds, paint) &&
-        isPaintOpaque(paint, image)) {
+        SkPaintPriv::Overwrites(image, paint)) {
         this->getDeferredDevice()->skipPendingCommands();
     }
     
@@ -897,7 +895,7 @@
                                        const SkPaint* paint SRC_RECT_CONSTRAINT_PARAM(constraint)) {
     if (fDeferredDrawing &&
         this->isFullFrame(&dst, paint) &&
-        isPaintOpaque(paint, image)) {
+        SkPaintPriv::Overwrites(image, paint)) {
         this->getDeferredDevice()->skipPendingCommands();
     }
     
@@ -911,7 +909,7 @@
                                        const SkRect& dst, const SkPaint* paint) {
     if (fDeferredDrawing &&
         this->isFullFrame(&dst, paint) &&
-        isPaintOpaque(paint, image)) {
+        SkPaintPriv::Overwrites(image, paint)) {
         this->getDeferredDevice()->skipPendingCommands();
     }
     
@@ -939,7 +937,7 @@
         SkIntToScalar(bitmap.height()));
     if (fDeferredDrawing &&
         this->isFullFrame(&bitmapRect, paint) &&
-        isPaintOpaque(paint, &bitmap)) {
+        SkPaintPriv::Overwrites(bitmap, paint)) {
         this->getDeferredDevice()->skipPendingCommands();
     }