Reenable assertions that were reported failing in tests/CanvasTest.cpp

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
  *      a single or a small group of canvas API calls. Each test step is
@@ skipping 582 matching lines @@
     SkIRect deviceBounds1, deviceBounds2;
     REPORTER_ASSERT_MESSAGE(reporter,
         canvas1->getClipDeviceBounds(&deviceBounds1) ==
         canvas2->getClipDeviceBounds(&deviceBounds2),
         testStep->assertMessage());
     REPORTER_ASSERT_MESSAGE(reporter, deviceBounds1 == deviceBounds2, testStep->assertMessage());
     REPORTER_ASSERT_MESSAGE(reporter, canvas1->getTotalMatrix() ==
         canvas2->getTotalMatrix(), testStep->assertMessage());
     REPORTER_ASSERT_MESSAGE(reporter, equal_clips(*canvas1, *canvas2), testStep->assertMessage());
 
-    // The following test code is commented out because the test fails when
-    // the canvas is an SkPictureRecord or SkDeferredCanvas
-    // Issue: http://code.google.com/p/skia/issues/detail?id=498
-    // Also, creating a LayerIter on an SkProxyCanvas crashes
-    // Issue: http://code.google.com/p/skia/issues/detail?id=499
-    /*
     SkCanvas::LayerIter layerIter1(const_cast<SkCanvas*>(canvas1), false);
     SkCanvas::LayerIter layerIter2(const_cast<SkCanvas*>(canvas2), false);
     while (!layerIter1.done() && !layerIter2.done()) {
         REPORTER_ASSERT_MESSAGE(reporter, layerIter1.matrix() ==
             layerIter2.matrix(), testStep->assertMessage());
         REPORTER_ASSERT_MESSAGE(reporter, layerIter1.clip() ==
             layerIter2.clip(), testStep->assertMessage());
         REPORTER_ASSERT_MESSAGE(reporter, layerIter1.paint() ==
             layerIter2.paint(), testStep->assertMessage());
         REPORTER_ASSERT_MESSAGE(reporter, layerIter1.x() ==
             layerIter2.x(), testStep->assertMessage());
         REPORTER_ASSERT_MESSAGE(reporter, layerIter1.y() ==
             layerIter2.y(), testStep->assertMessage());
         layerIter1.next();
         layerIter2.next();
     }
     REPORTER_ASSERT_MESSAGE(reporter, layerIter1.done(),
         testStep->assertMessage());
     REPORTER_ASSERT_MESSAGE(reporter, layerIter2.done(),
         testStep->assertMessage());
-    */
+
 }
 
 // The following class groups static functions that need to access
 // the privates members of SkPictureRecord
 class SkPictureTester {
 private:
     static int EQ(const SkFlatData* a, const SkFlatData* b) {
         return *a == *b;
     }
 
@@ skipping 228 matching lines @@
 
     for (int testStep = 0; testStep < testStepArray().count(); testStep++) {
         TestOverrideStateConsistency(reporter, d, testStepArray()[testStep]);
         if (testStepArray()[testStep]->enablePdfTesting()) {
             TestPdfDevice(reporter, d, testStepArray()[testStep]);
         }
     }
 
     test_newraster(reporter);
 }