aboutsummaryrefslogtreecommitdiffhomepage
path: root/src/utils/SkMultiPictureDocumentPriv.h
diff options
context:
space:
mode:
authorGravatar halcanary <halcanary@google.com>2016-08-23 09:15:04 -0700
committerGravatar Commit bot <commit-bot@chromium.org>2016-08-23 09:15:04 -0700
commitc966ef9f07eed89bd571e3f89f8eb86f73b9328f (patch)
tree718c283931e211d1d8ae6cb7175be6057f2bf3c6 /src/utils/SkMultiPictureDocumentPriv.h
parentafdc177e77a4d083a23f709113ca97e4905df9ff (diff)
SkMultiSKP: version 2
Measurable size improvement. BUG=skia:5370 GOLD_TRYBOT_URL= https://gold.skia.org/search?issue=2255333003 Review-Url: https://codereview.chromium.org/2255333003
Diffstat (limited to 'src/utils/SkMultiPictureDocumentPriv.h')
-rw-r--r--src/utils/SkMultiPictureDocumentPriv.h21
1 files changed, 15 insertions, 6 deletions
diff --git a/src/utils/SkMultiPictureDocumentPriv.h b/src/utils/SkMultiPictureDocumentPriv.h
index 124dad7c6b..6d5ab47d21 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