Strip old backend recording down to essentials

src/core/SkPictureRecorder.cpp

 /*
  * Copyright 2014 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
-#include "SkBBoxHierarchyRecord.h"
 #include "SkPictureRecord.h"
 #include "SkPictureRecorder.h"
 #include "SkRecord.h"
 #include "SkRecordDraw.h"
 #include "SkRecorder.h"
 #include "SkTypes.h"
 
 SkPictureRecorder::SkPictureRecorder() {}
 
 SkPictureRecorder::~SkPictureRecorder() {}
 
 SkCanvas* SkPictureRecorder::beginRecording(SkScalar width, SkScalar height,
                                             SkBBHFactory* bbhFactory /* = NULL */,
                                             uint32_t recordFlags /* = 0 */) {
     return EXPERIMENTAL_beginRecording(width, height, bbhFactory);
 }
 
 SkCanvas* SkPictureRecorder::DEPRECATED_beginRecording(SkScalar width, SkScalar height,
                                                        SkBBHFactory* bbhFactory /* = NULL */,
                                                        uint32_t recordFlags /* = 0 */) {
+    SkASSERT(!bbhFactory);  // No longer suppported with this backend.
+
     fCullWidth = width;
     fCullHeight = height;
-
-    const SkISize size = SkISize::Make(width, height);
-
-    if (bbhFactory) {
-        // We don't need to hold a ref on the BBH ourselves, but might as well for
-        // consistency with EXPERIMENTAL_beginRecording(), which does need to.
-        fBBH.reset((*bbhFactory)(width, height));
-        SkASSERT(fBBH.get());
-        fPictureRecord.reset(SkNEW_ARGS(SkBBoxHierarchyRecord, (size, recordFlags, fBBH.get())));
-    } else {
-        fPictureRecord.reset(SkNEW_ARGS(SkPictureRecord, (size, recordFlags)));
-    }
+    fPictureRecord.reset(SkNEW_ARGS(SkPictureRecord, (SkISize::Make(width, height), recordFlags)));
 
     fPictureRecord->beginRecording();
     return this->getRecordingCanvas();
 }
 
 SkCanvas* SkPictureRecorder::EXPERIMENTAL_beginRecording(SkScalar width, SkScalar height,
                                                          SkBBHFactory* bbhFactory /* = NULL */) {
     fCullWidth = width;
     fCullHeight = height;
 
@@ skipping 25 matching lines @@
     if (fPictureRecord.get()) {
         fPictureRecord->endRecording();
         const bool deepCopyOps = false;
         picture = SkNEW_ARGS(SkPicture, (fCullWidth, fCullHeight,
                                          *fPictureRecord.get(), deepCopyOps));
     }
 
     return picture;
 }
 
-void SkPictureRecorder::internalOnly_EnableOpts(bool enableOpts) {
-    if (fPictureRecord.get()) {
-        fPictureRecord->internalOnly_EnableOpts(enableOpts);
-    }
-}
-
 void SkPictureRecorder::partialReplay(SkCanvas* canvas) const {
     if (NULL == canvas) {
         return;
     }
 
     if (fRecord.get()) {
         SkRecordDraw(*fRecord, canvas, NULL/*bbh*/, NULL/*callback*/);
     }
 
     if (fPictureRecord.get()) {
         const bool deepCopyOps = true;
         SkPicture picture(fCullWidth, fCullHeight,
                           *fPictureRecord.get(), deepCopyOps);
         picture.playback(canvas);
     }
 }