Revert of https://codereview.chromium.org/112113005/
Reason for revert: breaks unit tests
R=mtklein@google.com, bsalomon@google.com, reed@google.com, scroggo@google.com
TBR=bsalomon@google.com, mtklein@google.com, reed@google.com, scroggo@google.com
NOTREECHECKS=true
NOTRY=true
BUG=skia:1742
Author: caryclark@google.com
Review URL: https://codereview.chromium.org/134453002
git-svn-id: http://skia.googlecode.com/svn/trunk@13024 2bbb7eff-a529-9590-31e7-b0007b416f81
diff --git a/tests/GpuBitmapCopyTest.cpp b/tests/GpuBitmapCopyTest.cpp
index bfc3020..a1434dc 100644
--- a/tests/GpuBitmapCopyTest.cpp
+++ b/tests/GpuBitmapCopyTest.cpp
@@ -40,20 +40,22 @@
* @param success True if the copy succeeded.
* @param src A GPU-backed SkBitmap that had copyTo or deepCopyTo called on it.
* @param dst SkBitmap that was copied to.
- * @param expectSameGenID Whether the genIDs should be the same if success is true.
+ * @param deepCopy True if deepCopyTo was used; false if copyTo was used.
*/
static void TestIndividualCopy(skiatest::Reporter* reporter, const SkBitmap::Config desiredConfig,
const bool success, const SkBitmap& src, const SkBitmap& dst,
- const bool expectSameGenID) {
+ const bool deepCopy = true) {
if (success) {
REPORTER_ASSERT(reporter, src.width() == dst.width());
REPORTER_ASSERT(reporter, src.height() == dst.height());
REPORTER_ASSERT(reporter, dst.config() == desiredConfig);
if (src.config() == dst.config()) {
- if (expectSameGenID) {
+ // FIXME: When calling copyTo (so deepCopy is false here), sometimes we copy the pixels
+ // exactly, in which case the IDs should be the same, but sometimes we do a bitmap draw,
+ // in which case the IDs should not be the same. Is there any way to determine which is
+ // the case at this point?
+ if (deepCopy) {
REPORTER_ASSERT(reporter, src.getGenerationID() == dst.getGenerationID());
- } else {
- REPORTER_ASSERT(reporter, src.getGenerationID() != dst.getGenerationID());
}
REPORTER_ASSERT(reporter, src.pixelRef() != NULL && dst.pixelRef() != NULL);
@@ -61,17 +63,11 @@
SkBitmap srcReadBack, dstReadBack;
{
SkASSERT(src.getTexture() != NULL);
- const SkIPoint origin = src.pixelRefOrigin();
- const SkIRect subset = SkIRect::MakeXYWH(origin.fX, origin.fY,
- src.width(), src.height());
- bool readBack = src.pixelRef()->readPixels(&srcReadBack, &subset);
+ bool readBack = src.pixelRef()->readPixels(&srcReadBack);
REPORTER_ASSERT(reporter, readBack);
}
if (dst.getTexture() != NULL) {
- const SkIPoint origin = dst.pixelRefOrigin();
- const SkIRect subset = SkIRect::MakeXYWH(origin.fX, origin.fY,
- dst.width(), dst.height());
- bool readBack = dst.pixelRef()->readPixels(&dstReadBack, &subset);
+ bool readBack = dst.pixelRef()->readPixels(&dstReadBack);
REPORTER_ASSERT(reporter, readBack);
} else {
// If dst is not a texture, do a copy instead, to the same config as srcReadBack.
@@ -168,7 +164,7 @@
boolStr(canSucceed));
}
- TestIndividualCopy(reporter, gPairs[j].fConfig, success, src, dst, true);
+ TestIndividualCopy(reporter, gPairs[j].fConfig, success, src, dst);
// Test copying the subset bitmap, using both copyTo and deepCopyTo.
if (extracted) {
@@ -177,7 +173,7 @@
REPORTER_ASSERT(reporter, success == expected);
REPORTER_ASSERT(reporter, success == canSucceed);
TestIndividualCopy(reporter, gPairs[j].fConfig, success, subset, subsetCopy,
- true);
+ false);
// Reset the bitmap so that a failed copyTo will leave it in the expected state.
subsetCopy.reset();
@@ -186,32 +182,6 @@
REPORTER_ASSERT(reporter, success == canSucceed);
TestIndividualCopy(reporter, gPairs[j].fConfig, success, subset, subsetCopy,
true);
-
- // Now set a bitmap to be a subset that will share the same pixelref.
- // This allows testing another case of cloning the genID. When calling copyTo
- // on a bitmap representing a subset of its pixelref, the resulting pixelref
- // should not share the genID, since we only copied the subset.
- SkBitmap trueSubset;
- // FIXME: Once https://codereview.chromium.org/109023008/ lands, call
- // trueSubset.installPixelRef(src.pixelRef(), subset);
- trueSubset.setConfig(gPairs[i].fConfig, W/2, H/2);
- trueSubset.setPixelRef(src.pixelRef(), W/2, H/2);
-
- subsetCopy.reset();
- success = trueSubset.copyTo(&subsetCopy, gPairs[j].fConfig);
- REPORTER_ASSERT(reporter, success == expected);
- REPORTER_ASSERT(reporter, success == canSucceed);
- TestIndividualCopy(reporter, gPairs[j].fConfig, success, trueSubset, subsetCopy,
- false);
-
- // deepCopyTo copies the entire pixelref, even if the bitmap only represents
- // a subset. Therefore, the result should share the same genID.
- subsetCopy.reset();
- success = trueSubset.deepCopyTo(&subsetCopy, gPairs[j].fConfig);
- REPORTER_ASSERT(reporter, success == expected);
- REPORTER_ASSERT(reporter, success == canSucceed);
- TestIndividualCopy(reporter, gPairs[j].fConfig, success, trueSubset, subsetCopy,
- true);
}
} // for (size_t j = ...
} // for (size_t i = ...