First step in pulling SkPicturePlayback & SkPictureRecord out of SkPicture

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 677 matching lines @@
             testRecord->fBitmapHeap->count(), 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->fPathHeap ==
-            !testRecord->fPathHeap,
+            !referenceRecord->fPicture->fPathHeap ==
+            !testRecord->fPicture->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(),
                 testStep->assertMessage());
             for (int i = 0; i < referenceRecord->fPathHeap->count(); ++i) {
@@ skipping 242 matching lines @@
         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();
 
     test_newraster(reporter);
 }