Dedup SkPaths by gen-ID when going to .skp

src/core/SkPictureRecord.cpp

 /*
  * Copyright 2011 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #include "SkPictureRecord.h"
 #include "SkDevice.h"
 #include "SkImage_Base.h"
@@ skipping 569 matching lines @@
 }
 
 void SkPictureRecord::onDrawImageRect(const SkImage* image, const SkRect* src, const SkRect& dst,
                                       const SkPaint* paint, SrcRectConstraint constraint) {
     // id + paint_index + image_index + bool_for_src + constraint
     size_t size = 5 * kUInt32Size;
     if (src) {
         size += sizeof(*src);   // + rect
     }
     size += sizeof(dst);        // + rect
-    
+
     size_t initialOffset = this->addDraw(DRAW_IMAGE_RECT, &size);
     SkASSERT(initialOffset+get_paint_offset(DRAW_IMAGE_RECT, size)
              == fWriter.bytesWritten());
     this->addPaintPtr(paint);
     this->addImage(image);
     this->addRectPtr(src);  // may be null
     this->addRect(dst);
     this->addInt(constraint);
     this->validate(initialOffset, size);
 }
 
 void SkPictureRecord::onDrawImageNine(const SkImage* img, const SkIRect& center, const SkRect& dst,
                                       const SkPaint* paint) {
     // id + paint_index + image_index + center + dst
     size_t size = 3 * kUInt32Size + sizeof(SkIRect) + sizeof(SkRect);
-    
+
     size_t initialOffset = this->addDraw(DRAW_IMAGE_NINE, &size);
     SkASSERT(initialOffset+get_paint_offset(DRAW_IMAGE_NINE, size) == fWriter.bytesWritten());
     this->addPaintPtr(paint);
     this->addImage(img);
     this->addIRect(center);
     this->addRect(dst);
     this->validate(initialOffset, size);
 }
 
 void SkPictureRecord::onDrawBitmapNine(const SkBitmap& bitmap, const SkIRect& center,
@@ skipping 239 matching lines @@
     uint32_t flags = 0;
     if (colors) {
         flags |= DRAW_ATLAS_HAS_COLORS;
         size += count * sizeof(SkColor);
         size += sizeof(uint32_t);   // xfermode::mode
     }
     if (cull) {
         flags |= DRAW_ATLAS_HAS_CULL;
         size += sizeof(SkRect);
     }
-    
+
     size_t initialOffset = this->addDraw(DRAW_ATLAS, &size);
     SkASSERT(initialOffset+get_paint_offset(DRAW_ATLAS, size) == fWriter.bytesWritten());
     this->addPaintPtr(paint);
     this->addImage(atlas);
     this->addInt(flags);
     this->addInt(count);
     fWriter.write(xform, count * sizeof(SkRSXform));
     fWriter.write(tex, count * sizeof(SkRect));
 
     // write optional parameters
@@ skipping 103 matching lines @@
 
     if (paint) {
         fPaints.push_back(*paint);
         this->addInt(fPaints.count());
     } else {
         this->addInt(0);
     }
 }
 
 int SkPictureRecord::addPathToHeap(const SkPath& path) {
-    fPaths.push_back(path);
-    return fPaths.count();
+    if (int* n = fPaths.find(path)) {
+        return *n;
+    }
+    int n = fPaths.count() + 1;  // 0 is reserved for null / error.
+    fPaths.set(path, n);
+    return n;
 }
 
 void SkPictureRecord::addPath(const SkPath& path) {
     this->addInt(this->addPathToHeap(path));
 }
 
 void SkPictureRecord::addPatch(const SkPoint cubics[12]) {
     fWriter.write(cubics, SkPatchUtils::kNumCtrlPts * sizeof(SkPoint));
 }
 
@@ skipping 58 matching lines @@
 void SkPictureRecord::addTextBlob(const SkTextBlob *blob) {
     int index = fTextBlobRefs.count();
     *fTextBlobRefs.append() = blob;
     blob->ref();
     // follow the convention of recording a 1-based index
     this->addInt(index + 1);
 }
 
 ///////////////////////////////////////////////////////////////////////////////