Fix SK_SUPPORT_DEPRECATED_RECORD_FLAGS handling

include/core/SkPicture.h

 
 /*
  * Copyright 2007 The Android Open Source Project
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 
 #ifndef SkPicture_DEFINED
@@ skipping 129 matching lines @@
             path.
          */
         kUsePathBoundsForClip_RecordingFlag = 0x01
     };
 
 #ifndef SK_SUPPORT_DEPRECATED_RECORD_FLAGS
     // TODO: once kOptimizeForClippedPlayback_RecordingFlag is hidden from
     // all external consumers, SkPicture::createBBoxHierarchy can also be
     // cleaned up.
 private:
+    friend class SkPictureRecorder;
 #endif
     enum Deprecated_RecordingFlags {
         /*  This flag causes the picture to compute bounding boxes and build
             up a spatial hierarchy (currently an R-Tree), plus a tree of Canvas'
             usually stack-based clip/etc state. This requires an increase in
             recording time (often ~2x; likely more for very complex pictures),
             but allows us to perform much faster culling at playback time, and
             completely avoid some unnecessary clips and other operations. This
             is ideal for tiled rendering, or any other situation where you're
             drawing a fraction of a large scene into a smaller viewport.
 
             In most cases the record cost is offset by the playback improvement
             after a frame or two of tiled rendering (and complex pictures that
             induce the worst record times will generally get the largest
             speedups at playback time).
 
             Note: Currently this is not serializable, the bounding data will be
             discarded if you serialize into a stream and then deserialize.
         */
         kOptimizeForClippedPlayback_RecordingFlag = 0x02,
     };
 #ifndef SK_SUPPORT_DEPRECATED_RECORD_FLAGS
 public:
 #endif
 
 #ifndef SK_SUPPORT_LEGACY_PICTURE_CAN_RECORD
 private:
     friend class SkPictureRecorder;
-    friend class SkImage_Picture;
-    friend class SkSurface_Picture;
 #endif
 
     /** Returns the canvas that records the drawing commands.
         @param width the base width for the picture, as if the recording
                      canvas' bitmap had this width.
         @param height the base width for the picture, as if the recording
                      canvas' bitmap had this height.
         @param recordFlags optional flags that control recording.
         @return the picture canvas.
     */
@@ skipping 298 matching lines @@
     }
 
 private:
     SkAutoTUnref<SkPictureFactory> fFactory;
     SkAutoTUnref<SkPicture>        fPicture;
 
     typedef SkNoncopyable INHERITED;
 };
 
 #endif