Thread picture version through to SkReadBuffer.
This will let code outside SkPicture* fork its read code based on the picture version.
BUG=skia:
R=reed@google.com, robertphillips@google.com, mtklein@google.com
Author: mtklein@chromium.org
Review URL: https://codereview.chromium.org/214413008
git-svn-id: http://skia.googlecode.com/svn/trunk@13984 2bbb7eff-a529-9590-31e7-b0007b416f81
diff --git a/debugger/QT/SkDebuggerGUI.cpp b/debugger/QT/SkDebuggerGUI.cpp
index 58b8da7..0572550 100644
--- a/debugger/QT/SkDebuggerGUI.cpp
+++ b/debugger/QT/SkDebuggerGUI.cpp
@@ -164,15 +164,15 @@
const SkTDArray<bool>& deletedCommands) {
// Mimics SkPicturePlayback::CreateFromStream
SkAutoTDelete<SkTimedPicturePlayback> playback(SkNEW_ARGS(SkTimedPicturePlayback,
- (deletedCommands)));
- if (!playback->parseStream(stream, info, proc)) {
+ (deletedCommands, info)));
+ if (!playback->parseStream(stream, proc)) {
return NULL; // we're invalid
}
return playback.detach();
}
- SkTimedPicturePlayback(const SkTDArray<bool>& deletedCommands)
- : INHERITED()
+ SkTimedPicturePlayback(const SkTDArray<bool>& deletedCommands, const SkPictInfo& info)
+ : INHERITED(info)
, fSkipCommands(deletedCommands)
, fTot(0.0)
, fCurCommand(0) {
@@ -254,14 +254,6 @@
#endif
private:
- // SkPicturePlayback::parseStream is protected, so it can be
- // called here, but not by our static factory function. This
- // allows the factory function to call it.
- bool parseStream(SkStream* stream, const SkPictInfo& info,
- SkPicture::InstallPixelRefProc proc) {
- return this->INHERITED::parseStream(stream, info, proc);
- }
-
typedef SkPicturePlayback INHERITED;
};