Ensure blob typeface information survives SkGPipe serialization.

src/pipe/SkGPipeWrite.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 "SkAnnotation.h"
 #include "SkBitmapDevice.h"
 #include "SkBitmapHeap.h"
 #include "SkCanvas.h"
 #include "SkColorFilter.h"
 #include "SkData.h"
 #include "SkDrawLooper.h"
 #include "SkGPipe.h"
 #include "SkGPipePriv.h"
 #include "SkImageFilter.h"
 #include "SkMaskFilter.h"
 #include "SkWriteBuffer.h"
 #include "SkPaint.h"
 #include "SkPatchUtils.h"
 #include "SkPathEffect.h"
 #include "SkPictureFlat.h"
+#include "SkPtrRecorder.h"
 #include "SkRasterizer.h"
 #include "SkRRect.h"
 #include "SkShader.h"
 #include "SkStream.h"
 #include "SkTextBlob.h"
 #include "SkTSearch.h"
 #include "SkTypeface.h"
 #include "SkWriter32.h"
 
 enum {
@@ skipping 902 matching lines @@
         }
     }
 }
 
 void SkGPipeCanvas::onDrawTextBlob(const SkTextBlob* blob, SkScalar x, SkScalar y,
                                    const SkPaint& paint) {
     NOTIFY_SETUP(this);
     this->writePaint(paint);
 
     // FIXME: this is inefficient but avoids duplicating the blob serialization logic.
+    SkRefCntSet typefaceSet;
     SkWriteBuffer blobBuffer;
+    blobBuffer.setTypefaceRecorder(&typefaceSet);
     blob->flatten(blobBuffer);
 
-    size_t size = sizeof(uint32_t) + 2 * sizeof(SkScalar) + blobBuffer.bytesWritten();
+    int typefaceCount = typefaceSet.count();
+    SkAutoSTMalloc<16, SkTypeface*> storage(typefaceCount);
+    SkTypeface** array = (SkTypeface**)storage.get();

[mtklein, 2014/09/12 16:07:17]

Out of curiosity, why this cast?  Doesn't storage.get() return an SkTypeface** ?

[f(malita), 2014/09/12 22:20:49]

Indeed it does. Removed.

+    typefaceSet.copyToArray((SkRefCnt**)array);
+
+    size_t size = 2 * sizeof(uint32_t) + 2 * sizeof(SkScalar) + blobBuffer.bytesWritten();

[mtklein, 2014/09/12 16:07:17]

Can you add some comments explaining what the different parts of size are?

// text byte count + typeface count + x + y + all the text
size_t size = ...
// plus an index (cross-process) or pointer (in-process) for each typeface
size += ...

[f(malita), 2014/09/12 22:20:49]

Done.

+    size += typefaceCount * (isCrossProcess(fFlags) ? sizeof(uint32_t) : sizeof(void*));
+
     if (this->needOpBytes(size)) {
         this->writeOp(kDrawTextBlob_DrawOp);
         fWriter.writeScalar(x);
         fWriter.writeScalar(y);
+
+        fWriter.write32(typefaceCount);
+        if (isCrossProcess(fFlags)) {
+            for (int i = 0; i < typefaceCount; ++i) {
+                fWriter.write32(this->getTypefaceID(array[i]));
+            }
+        } else {
+            fWriter.write(array, typefaceCount * sizeof(SkTypeface*));
+        }
+
         fWriter.write32(SkToU32(blobBuffer.bytesWritten()));
         uint32_t* pad = fWriter.reservePad(blobBuffer.bytesWritten());
         blobBuffer.writeToMemory(pad);
     }
 }
 
 void SkGPipeCanvas::onDrawPicture(const SkPicture* picture, const SkMatrix* matrix,
                                   const SkPaint* paint) {
     // we want to playback the picture into individual draw calls
     //
@@ skipping 371 matching lines @@
     return fCanvas->shuttleBitmap(bitmap, slot);
 }
 
 void BitmapShuttle::removeCanvas() {
     if (NULL == fCanvas) {
         return;
     }
     fCanvas->unref();
     fCanvas = NULL;
 }