Clean up SK_PICTURE_USE_SK_RECORD and SK_PICTURE_OPTIMIZE_SK_RECORD.

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 */) {
-#ifdef SK_PICTURE_USE_SK_RECORD
     return EXPERIMENTAL_beginRecording(width, height, bbhFactory);
-#else
-    return DEPRECATED_beginRecording(width, height, bbhFactory, recordFlags);
-#endif
 }
 
 SkCanvas* SkPictureRecorder::DEPRECATED_beginRecording(SkScalar width, SkScalar height,
                                                        SkBBHFactory* bbhFactory /* = NULL */,
                                                        uint32_t recordFlags /* = 0 */) {
     fCullWidth = width;
     fCullHeight = height;
 
     const SkISize size = SkISize::Make(width, height);
 
@@ skipping 30 matching lines @@
     if (fRecorder.get()) {
         return fRecorder.get();
     }
     return fPictureRecord.get();
 }
 
 SkPicture* SkPictureRecorder::endRecording() {
     SkPicture* picture = NULL;
 
     if (fRecord.get()) {
-        picture = SkNEW_ARGS(SkPicture, (fCullWidth, fCullHeight, 
+        picture = SkNEW_ARGS(SkPicture, (fCullWidth, fCullHeight,
                                          fRecord.detach(), fBBH.get()));
     }
 
     if (fPictureRecord.get()) {
         fPictureRecord->endRecording();
         const bool deepCopyOps = false;
-        picture = SkNEW_ARGS(SkPicture, (fCullWidth, fCullHeight, 
+        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, 
+        SkPicture picture(fCullWidth, fCullHeight,
                           *fPictureRecord.get(), deepCopyOps);
         picture.playback(canvas);
     }
 }