Revert of allow pictures to have a full bounds

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 112 matching lines @@
 
 #ifdef SK_LEGACY_PICTURE_SIZE_API
     int width() const  { return SkScalarCeilToInt(fCullWidth); }
     int height() const { return SkScalarCeilToInt(fCullHeight); }
 #endif
 
     /** Return the cull rect used when creating this picture: { 0, 0, cullWidth, cullHeight }.
         It does not necessarily reflect the bounds of what has been recorded into the picture.
         @return the cull rect used to create this picture
     */
-    SkRect cullRect() const { return fCullRect; }
+    const SkRect cullRect() const { return SkRect::MakeWH(fCullWidth, fCullHeight); }
 
     /** Return a non-zero, unique value representing the picture. This call is
         only valid when not recording. Between a beginRecording/endRecording
         pair it will just return 0 (the invalid ID). Each beginRecording/
         endRecording pair will cause a different generation ID to be returned.
     */
     uint32_t uniqueID() const;
 
     /**
      *  Function to encode an SkBitmap to an SkData. A function with this
@@ skipping 109 matching lines @@
     static const uint32_t MIN_PICTURE_VERSION = 19;
     static const uint32_t CURRENT_PICTURE_VERSION = 37;
 
     void needsNewGenID() { fUniqueID = SK_InvalidGenID; }
     void callDeletionListeners();
 
     void createHeader(SkPictInfo* info) const;
     static bool IsValidPictInfo(const SkPictInfo& info);
 
     // Takes ownership of the SkRecord, refs the (optional) drawablePicts and BBH.
-    SkPicture(const SkRect& cullRect, SkRecord*, SkData* drawablePicts,
+    SkPicture(SkScalar width, SkScalar height, SkRecord*, SkData* drawablePicts,
               SkBBoxHierarchy*);
 
     static SkPicture* Forwardport(const SkPictInfo&, const SkPictureData*);
     static SkPictureData* Backport(const SkRecord&, const SkPictInfo&,
                                    SkPicture const* const drawablePics[], int drawableCount);
 
-    const SkRect                          fCullRect;
+    const SkScalar                        fCullWidth;
+    const SkScalar                        fCullHeight;
     mutable SkAutoTUnref<const AccelData> fAccelData;
     mutable SkTDArray<DeletionListener*> fDeletionListeners;  // pointers are refed
     SkAutoTDelete<SkRecord>       fRecord;
     SkAutoTUnref<SkBBoxHierarchy> fBBH;
     SkAutoTUnref<SkData>          fDrawablePicts;
 
     // helpers for fDrawablePicts
     int drawableCount() const;
     // will return NULL if drawableCount() returns 0
     SkPicture const* const* drawablePicts() const;
@@ skipping 17 matching lines @@
     mutable uint32_t fUniqueID;
 
     friend class SkPictureRecorder;            // SkRecord-based constructor.
     friend class GrLayerHoister;               // access to fRecord
     friend class ReplaceDraw;
 
     typedef SkRefCnt INHERITED;
 };
 
 #endif