Add new skpinfo tool

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 199 matching lines @@
 
 #ifdef SK_BUILD_FOR_ANDROID
     /** Signals that the caller is prematurely done replaying the drawing
         commands. This can be called from a canvas virtual while the picture
         is drawing. Has no effect if the picture is not drawing.
         @deprecated preserving for legacy purposes
     */
     void abortPlayback();
 #endif
 
+    // Return true if the SkStream represents a serialized picture, and fills out
+    // SkPictInfo. After this function returns, the SkStream is not rewound; it
+    // will be ready to be parsed to create an SkPicturePlayback.

[reed1, 2014/03/03 15:18:24]

This part about "ready to be parsed..." is confusing. Is this meant to be a
private API, but exposed here for the tool?
I wonder if we can make that part clearer.

[robertphillips, 2014/03/03 15:29:29]

Done. Hopefully clearer.

+    // If false is returned, SkPictInfo is unmodified.
+    static bool StreamIsSKP(SkStream*, SkPictInfo*);
+    static bool BufferIsSKP(SkReadBuffer&, SkPictInfo*);
+
 protected:
     // V2 : adds SkPixelRef's generation ID.
     // V3 : PictInfo tag at beginning, and EOF tag at the end
     // V4 : move SkPictInfo to be the header
     // V5 : don't read/write FunctionPtr on cross-process (we can detect that)
     // V6 : added serialization of SkPath's bounds (and packed its flags tighter)
     // V7 : changed drawBitmapRect(IRect) to drawBitmapRectToRect(Rect)
     // V8 : Add an option for encoding bitmaps
     // V9 : Allow the reader and writer of an SKP disagree on whether to support
     //      SK_SUPPORT_HINTING_SCALE_FACTOR
@@ skipping 25 matching lines @@
     SkPictureRecord* fRecord;
     int fWidth, fHeight;
 
     // Create a new SkPicture from an existing SkPicturePlayback. Ref count of
     // playback is unchanged.
     SkPicture(SkPicturePlayback*, int width, int height);
 
     // For testing. Derived classes may instantiate an alternate
     // SkBBoxHierarchy implementation
     virtual SkBBoxHierarchy* createBBoxHierarchy() const;
-
-    // Return true if the SkStream represents a serialized picture, and fills out
-    // SkPictInfo. After this function returns, the SkStream is not rewound; it
-    // will be ready to be parsed to create an SkPicturePlayback.
-    // If false is returned, SkPictInfo is unmodified.
-    static bool StreamIsSKP(SkStream*, SkPictInfo*);
-    static bool BufferIsSKP(SkReadBuffer&, SkPictInfo*);
 private:
     void createHeader(void* header) const;
 
     friend class SkFlatPicture;
     friend class SkPicturePlayback;
 
     typedef SkRefCnt INHERITED;
 };
 
 /**
  *  Subclasses of this can be passed to canvas.drawPicture. During the drawing
  *  of the picture, this callback will periodically be invoked. If its
  *  abortDrawing() returns true, then picture playback will be interrupted.
  *
  *  The resulting drawing is undefined, as there is no guarantee how often the
  *  callback will be invoked. If the abort happens inside some level of nested
  *  calls to save(), restore will automatically be called to return the state
  *  to the same level it was before the drawPicture call was made.
  */
 class SK_API SkDrawPictureCallback {
 public:
     SkDrawPictureCallback() {}
     virtual ~SkDrawPictureCallback() {}
 
     virtual bool abortDrawing() = 0;
 };
 
 #endif