Change where layer hoisting data is gathered

include/core/SkPictureRecorder.h

 /*
  * Copyright 2014 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #ifndef SkPictureRecorder_DEFINED
 #define SkPictureRecorder_DEFINED
 
@@ skipping 19 matching lines @@
 
 #ifdef SK_LEGACY_PICTURE_SIZE_API
     SkCanvas* beginRecording(int width, int height,
                              SkBBHFactory* bbhFactory = NULL,
                              uint32_t recordFlags = 0) {
         return this->beginRecording(SkIntToScalar(width), SkIntToScalar(height),
                                     bbhFactory, recordFlags);
     }
 #endif
 
+    enum RecordFlags {
+        // This flag indicates that, if some BHH is being computed, saveLayer
+        // information should also be extracted at the same time.
+        kComputeSaveLayerInfo_RecordFlag = 0x01
+    };
+
     /** Returns the canvas that records the drawing commands.
         @param width the width of the cull rect used when recording this picture.
         @param height the height of the cull rect used when recording this picture.
         @param bbhFactory factory to create desired acceleration structure
         @param recordFlags optional flags that control recording.
         @return the canvas.
     */
     SkCanvas* beginRecording(SkScalar width, SkScalar height,
                              SkBBHFactory* bbhFactory = NULL,
                              uint32_t recordFlags = 0);
@@ skipping 15 matching lines @@
 
     /** Replay the current (partially recorded) operation stream into
         canvas. This call doesn't close the current recording.
     */
 #ifdef SK_BUILD_FOR_ANDROID_FRAMEWORK
     friend class android::Picture;
 #endif
     friend class SkPictureRecorderReplayTester; // for unit testing
     void partialReplay(SkCanvas* canvas) const;
 
+    uint32_t                      fFlags;
     SkScalar                      fCullWidth;
     SkScalar                      fCullHeight;
     SkAutoTUnref<SkBBoxHierarchy> fBBH;
     SkAutoTUnref<SkRecorder>      fRecorder;
     SkAutoTDelete<SkRecord>       fRecord;
 
     typedef SkNoncopyable INHERITED;
 };
 
 #endif