SkMultiSKP: version 2

src/utils/SkMultiPictureDocumentPriv.h

Index: src/utils/SkMultiPictureDocumentPriv.h
diff --git a/src/utils/SkMultiPictureDocumentPriv.h b/src/utils/SkMultiPictureDocumentPriv.h
index 124dad7c6bcb56b799fd69796f8d92c98291d1c5..6d5ab47d211f35a821b55a1da3f776a9de64dd82 100644
--- a/src/utils/SkMultiPictureDocumentPriv.h
+++ b/src/utils/SkMultiPictureDocumentPriv.h
@@ -8,16 +8,25 @@
 #ifndef SkMultiPictureDocumentPriv_DEFINED
 #define SkMultiPictureDocumentPriv_DEFINED
 
-#include "stdint.h"
+#include "SkTArray.h"
+#include "SkSize.h"
 
 namespace SkMultiPictureDocumentProtocol {
 static constexpr char kMagic[] = "Skia Multi-Picture Doc\n\n";
 
-struct Entry {
-    uint64_t offset;
-    float sizeX;
-    float sizeY;
-};
+static constexpr char kEndPage[] = "SkMultiPictureEndPage";
+
+const uint32_t kVersion = 2;
+
+inline SkSize Join(const SkTArray<SkSize>& sizes) {
+    SkSize joined = SkSize::Make(0, 0);
+    for (SkSize s : sizes) {
+        joined = SkSize::Make(SkTMax(joined.width(), s.width()),
+                              SkTMax(joined.height(), s.height()));
+    }
+    return joined;
+}
+
 }
 
 #endif  // SkMultiPictureDocumentPriv_DEFINED