No deduping dictionaries for matrices and regions.

tests/CanvasTest.cpp

 
 /*
  * Copyright 2012 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 /*  Description:
  *      This test defines a series of elementatry test steps that perform
@@ skipping 651 matching lines @@
     static void AssertFlattenedObjectsEqual(
         SkPictureRecord* referenceRecord,
         SkPictureRecord* testRecord,
         skiatest::Reporter* reporter,
         CanvasTestStep* testStep) {
 
         REPORTER_ASSERT_MESSAGE(reporter,
             referenceRecord->fBitmapHeap->count() ==
             testRecord->fBitmapHeap->count(), testStep->assertMessage());
         REPORTER_ASSERT_MESSAGE(reporter,
-            referenceRecord->fMatrices.count() ==
-            testRecord->fMatrices.count(), testStep->assertMessage());
-        for (int i = 0; i < referenceRecord->fMatrices.count(); ++i) {
-            REPORTER_ASSERT_MESSAGE(reporter,
-                EQ(referenceRecord->fMatrices[i], testRecord->fMatrices[i]),
-                testStep->assertMessage());
-        }
-        REPORTER_ASSERT_MESSAGE(reporter,
             referenceRecord->fPaints.count() ==
             testRecord->fPaints.count(), testStep->assertMessage());
         for (int i = 0; i < referenceRecord->fPaints.count(); ++i) {
             REPORTER_ASSERT_MESSAGE(reporter,
                 EQ(referenceRecord->fPaints[i], testRecord->fPaints[i]),
                                     testStep->assertMessage());
         }
         REPORTER_ASSERT_MESSAGE(reporter,
-            referenceRecord->fRegions.count() ==
-            testRecord->fRegions.count(), testStep->assertMessage());
-        for (int i = 0; i < referenceRecord->fRegions.count(); ++i) {
-            REPORTER_ASSERT_MESSAGE(reporter,
-                EQ(referenceRecord->fRegions[i], testRecord->fRegions[i]),
-                                    testStep->assertMessage());
-        }
-        REPORTER_ASSERT_MESSAGE(reporter,
             !referenceRecord->fPathHeap ==
             !testRecord->fPathHeap,
             testStep->assertMessage());
         // The following tests are commented out because they currently
         // fail. Issue: http://code.google.com/p/skia/issues/detail?id=507
         /*
         if (referenceRecord->fPathHeap) {
             REPORTER_ASSERT_MESSAGE(reporter,
                 referenceRecord->fPathHeap->count() ==
                 testRecord->fPathHeap->count(),
@@ skipping 205 matching lines @@
         SkPictureTester::TestPictureFlattenedObjectReuse(reporter,
             testStepArray()[testStep], 0);
         if (testStepArray()[testStep]->enablePdfTesting()) {
             TestPdfDevice(reporter, testStepArray()[testStep]);
         }
     }
 
     // Explicitly call reset(), so we don't leak the pixels (since kTestBitmap is a global)
     kTestBitmap.reset();
 }