commit 0eb7576c659a165f1d73b6b7ddfd43dc3782f62b
author skyostil@google.com <skyostil@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> Mon Jan 16 10:45:53 2012 +0000
committer skyostil@google.com <skyostil@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> Mon Jan 16 10:45:53 2012 +0000
tree 9b453b5258e1bbc1009d315c8ac1afbbe6a57db1
parent ff25e3e3a079b32a3349f3337c48d6d3ab4b0651

Modify SkBitmap::extractSubset() to respect volatility

The resulting subset bitmap will always have the same volatility flag as the
source bitmap.

BUG=452
Review URL: http://codereview.appspot.com/5544052

git-svn-id: http://skia.googlecode.com/svn/trunk@3039 2bbb7eff-a529-9590-31e7-b0007b416f81

tests/BitmapCopyTest.cpp

diff --git a/tests/BitmapCopyTest.cpp b/tests/BitmapCopyTest.cpp
index c3c6f12..a89064b 100644
--- a/tests/BitmapCopyTest.cpp
+++ b/tests/BitmapCopyTest.cpp
@@ -313,11 +313,14 @@
                     SkIRect r;
                     r.set(1, 1, 2, 2);
                     bitmap.setIsOpaque(true);
+                    bitmap.setIsVolatile(true);
                     if (bitmap.extractSubset(&subset, r)) {
                         REPORTER_ASSERT(reporter, subset.width() == 1);
                         REPORTER_ASSERT(reporter, subset.height() == 1);
                         REPORTER_ASSERT(reporter,
                                         subset.isOpaque() == bitmap.isOpaque());
+                        REPORTER_ASSERT(reporter,
+                                        subset.isVolatile() == true);
 
                         SkBitmap copy;
                         REPORTER_ASSERT(reporter,
@@ -334,9 +337,12 @@
                                     (copy.getColorTable() != NULL) == hasCT);
                     }
                     bitmap.setIsOpaque(false);
+                    bitmap.setIsVolatile(false);
                     if (bitmap.extractSubset(&subset, r)) {
                         REPORTER_ASSERT(reporter,
                                         subset.isOpaque() == bitmap.isOpaque());
+                        REPORTER_ASSERT(reporter,
+                                        subset.isVolatile() == false);
                     }
                 }
             } else {