commit d2700eec7eb2e26beb206b88a0f0b6f3c5f49118
author djsollen@google.com <djsollen@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> Wed May 30 16:54:13 2012 +0000
committer djsollen@google.com <djsollen@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> Wed May 30 16:54:13 2012 +0000
tree c43ed22ce3a91677ca29d04b733bbcc7847304ac
parent dde718c558b118e2a918d14046770a8c37d75040

Refactor dictionaries for use by entities other than just SkPicture
Review URL: https://codereview.appspot.com/6101043

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

tests/CanvasTest.cpp

diff --git a/tests/CanvasTest.cpp b/tests/CanvasTest.cpp
index 3efbdea..814386e 100644
--- a/tests/CanvasTest.cpp
+++ b/tests/CanvasTest.cpp
@@ -583,14 +583,14 @@
 
         // Verify that deserialization-serialization round trip conserves all
         // data by comparing referenceRecord to roundTripRecord
-        REPORTER_ASSERT_MESSAGE(reporter, referenceRecord->fBitmapIndex ==
-            roundTripRecord->fBitmapIndex, testStep->assertMessage());
-        REPORTER_ASSERT_MESSAGE(reporter, referenceRecord->fMatrixIndex ==
-            roundTripRecord->fMatrixIndex, testStep->assertMessage());
-        REPORTER_ASSERT_MESSAGE(reporter, referenceRecord->fPaintIndex ==
-            roundTripRecord->fPaintIndex, testStep->assertMessage());
-        REPORTER_ASSERT_MESSAGE(reporter, referenceRecord->fRegionIndex ==
-            roundTripRecord->fRegionIndex, testStep->assertMessage());
+        REPORTER_ASSERT_MESSAGE(reporter, referenceRecord->fBitmaps.count() ==
+            roundTripRecord->fBitmaps.count(), testStep->assertMessage());
+        REPORTER_ASSERT_MESSAGE(reporter, referenceRecord->fMatrices.count() ==
+            roundTripRecord->fMatrices.count(), testStep->assertMessage());
+        REPORTER_ASSERT_MESSAGE(reporter, referenceRecord->fPaints.count() ==
+            roundTripRecord->fPaints.count(), testStep->assertMessage());
+        REPORTER_ASSERT_MESSAGE(reporter, referenceRecord->fRegions.count() ==
+            roundTripRecord->fRegions.count(), testStep->assertMessage());
         char referenceBuffer[kMaxPictureBufferSize];
         SkMemoryWStream referenceStream(referenceBuffer,
             kMaxPictureBufferSize);