commit 6300f4d1f3bd2e1a4d991ab28e843bcc3d4a4691
author commit-bot@chromium.org <commit-bot@chromium.org@2bbb7eff-a529-9590-31e7-b0007b416f81> Tue Nov 26 12:46:59 2013 +0000
committer commit-bot@chromium.org <commit-bot@chromium.org@2bbb7eff-a529-9590-31e7-b0007b416f81> Tue Nov 26 12:46:59 2013 +0000
tree 16dc678cca55bd343c9e82d49c7ffcc2f4ba1267
parent 7f78611271a121ffc1cd08be92018857b615204c

Add 'skiapict' magic bytes to SkPicture format.

Testing: out/Debug/tests && out/Release/gm --replay --serialize


BUG=
R=fmalita@google.com, reed@google.com, fmalita@chromium.org

Author: mtklein@google.com

Review URL: https://codereview.chromium.org/27408002

git-svn-id: http://skia.googlecode.com/svn/trunk@12391 2bbb7eff-a529-9590-31e7-b0007b416f81

src/core/SkPicture.cpp

diff --git a/src/core/SkPicture.cpp b/src/core/SkPicture.cpp
index 4acc549..2520e6b 100644
--- a/src/core/SkPicture.cpp
+++ b/src/core/SkPicture.cpp
@@ -266,11 +266,20 @@
 
 #include "SkStream.h"
 
+static const char kMagic[] = { 's', 'k', 'i', 'a', 'p', 'i', 'c', 't' };
+
 bool SkPicture::StreamIsSKP(SkStream* stream, SkPictInfo* pInfo) {
     if (NULL == stream) {
         return false;
     }
 
+    // Check magic bytes.
+    char magic[sizeof(kMagic)];
+    stream->read(magic, sizeof(kMagic));
+    if (0 != memcmp(magic, kMagic, sizeof(kMagic))) {
+        return false;
+    }
+
     SkPictInfo info;
     if (!stream->read(&info, sizeof(SkPictInfo))) {
         return false;
@@ -341,6 +350,10 @@
         info.fFlags |= SkPictInfo::kPtrIs64Bit_Flag;
     }
 
+    // Write 8 magic bytes to ID this file format.
+    SkASSERT(sizeof(kMagic) == 8);
+    stream->write(kMagic, sizeof(kMagic));
+
     stream->write(&info, sizeof(info));
     if (playback) {
         stream->writeBool(true);