ensure we always set the pictinfo.fVersion

BUG=skia:

GOLD_TRYBOT_URL= https://gold.skia.org/search?issue=2932

Change-Id: I8864a60f629e0f68b7871e0c388b42f4b6d78dbe
Reviewed-on: https://skia-review.googlesource.com/2932
Reviewed-by: Mike Klein <mtklein@chromium.org>
Commit-Queue: Mike Reed <reed@google.com>
Commit-Queue: Mike Klein <mtklein@chromium.org>

1 files changed, 5 insertions, 5 deletions

diff --git a/src/core/SkPicture.cpp b/src/core/SkPicture.cpp
index 60987b64c0..88da70aacf 100644
--- a/src/core/SkPicture.cpp
+++ b/src/core/SkPicture.cpp
@@ -90,7 +90,7 @@ SkPictInfo SkPicture::createHeader() const {
     memcpy(info.fMagic, kMagic, sizeof(kMagic));
 
     // Set picture info after magic bytes in the header
-    info.fVersion = CURRENT_PICTURE_VERSION;
+    info.setVersion(CURRENT_PICTURE_VERSION);
     info.fCullRect = this->cullRect();
     info.fFlags = SkPictInfo::kCrossProcess_Flag;
     // TODO: remove this flag, since we're always float (now)
@@ -106,7 +106,7 @@ bool SkPicture::IsValidPictInfo(const SkPictInfo& info) {
     if (0 != memcmp(info.fMagic, kMagic, sizeof(kMagic))) {
         return false;
     }
-    if (info.fVersion < MIN_PICTURE_VERSION || info.fVersion > CURRENT_PICTURE_VERSION) {
+    if (info.getVersion() < MIN_PICTURE_VERSION || info.getVersion() > CURRENT_PICTURE_VERSION) {
         return false;
     }
     return true;
@@ -123,7 +123,7 @@ bool SkPicture::InternalOnly_StreamIsSKP(SkStream* stream, SkPictInfo* pInfo) {
         return false;
     }
 
-    info.fVersion          = stream->readU32();
+    info.setVersion(         stream->readU32());
     info.fCullRect.fLeft   = stream->readScalar();
     info.fCullRect.fTop    = stream->readScalar();
     info.fCullRect.fRight  = stream->readScalar();
@@ -144,7 +144,7 @@ bool SkPicture::InternalOnly_BufferIsSKP(SkReadBuffer* buffer, SkPictInfo* pInfo
         return false;
     }
 
-    info.fVersion = buffer->readUInt();
+    info.setVersion(buffer->readUInt());
     buffer->readRect(&info.fCullRect);
     info.fFlags = buffer->readUInt();
 
@@ -249,7 +249,7 @@ void SkPicture::flatten(SkWriteBuffer& buffer) const {
     SkAutoTDelete<SkPictureData> data(this->backport());
 
     buffer.writeByteArray(&info.fMagic, sizeof(info.fMagic));
-    buffer.writeUInt(info.fVersion);
+    buffer.writeUInt(info.getVersion());
     buffer.writeRect(info.fCullRect);
     buffer.writeUInt(info.fFlags);
     if (data) {