Remove Picture deletion listeners.

tests/PictureTest.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.
  */
 
 #include "SkBBoxHierarchy.h"
 #include "SkBlurImageFilter.h"
 #include "SkCanvas.h"
@@ skipping 993 matching lines @@
         REPORTER_ASSERT(reporter, info0.fPreMat.isIdentity());
         REPORTER_ASSERT(reporter, 0 == info0.fBounds.fLeft && 0 == info0.fBounds.fTop);
         REPORTER_ASSERT(reporter, NULL != info0.fPaint);
         REPORTER_ASSERT(reporter, !info0.fIsNested && !info0.fHasNestedLayers);
 
         REPORTER_ASSERT(reporter, NULL == info1.fPicture);
         REPORTER_ASSERT(reporter, kWidth/2.0 == info1.fBounds.width() &&
                                   kHeight/2.0 == info1.fBounds.height());
         REPORTER_ASSERT(reporter, info1.fLocalMat.isIdentity());
         REPORTER_ASSERT(reporter, info1.fPreMat.isIdentity());
-        REPORTER_ASSERT(reporter, kWidth/2.0 == info1.fBounds.fLeft && 
+        REPORTER_ASSERT(reporter, kWidth/2.0 == info1.fBounds.fLeft &&
                                   kHeight/2.0 == info1.fBounds.fTop);
         REPORTER_ASSERT(reporter, NULL == info1.fPaint);
         REPORTER_ASSERT(reporter, !info1.fIsNested &&
                                   info1.fHasNestedLayers); // has a nested SL
 
         REPORTER_ASSERT(reporter, NULL == info2.fPicture);
         REPORTER_ASSERT(reporter, kWidth / 2 == info2.fBounds.width() &&
                                   kHeight / 2 == info2.fBounds.height()); // bound reduces size
         REPORTER_ASSERT(reporter, !info2.fLocalMat.isIdentity());
         REPORTER_ASSERT(reporter, info2.fPreMat.isIdentity());
@@ skipping 701 matching lines @@
     SkPictureRecorder recorder;
 
     recorder.beginRecording(0, 0);
     SkAutoTUnref<SkPicture> empty(recorder.endRecording());
 
     // Sanity check to make sure we aren't under-measuring.
     REPORTER_ASSERT(reporter, SkPictureUtils::ApproximateBytesUsed(empty.get()) >=
                               sizeof(SkPicture) + sizeof(SkRecord));
 
     // Protect against any unintentional bloat.
-    REPORTER_ASSERT(reporter, SkPictureUtils::ApproximateBytesUsed(empty.get()) <= 144);
+    REPORTER_ASSERT(reporter, SkPictureUtils::ApproximateBytesUsed(empty.get()) <= 128);
 
     // Sanity check of nested SkPictures.
     SkPictureRecorder r2;
     r2.beginRecording(0, 0);
     r2.getRecordingCanvas()->drawPicture(empty.get());
     SkAutoTUnref<SkPicture> nested(r2.endRecording());
 
     REPORTER_ASSERT(reporter, SkPictureUtils::ApproximateBytesUsed(nested.get()) >
                               SkPictureUtils::ApproximateBytesUsed(empty.get()));
 }
@@ skipping 166 matching lines @@
 
     // The picture shares the immutable pixels but copies the mutable ones.
     REPORTER_ASSERT(r, mut.pixelRef()->unique());
     REPORTER_ASSERT(r, !immut.pixelRef()->unique());
 
     // When the picture goes away, it's just our bitmaps holding the refs.
     pic.reset(NULL);
     REPORTER_ASSERT(r, mut.pixelRef()->unique());
     REPORTER_ASSERT(r, immut.pixelRef()->unique());
 }