SkTextBlob GPipe serialization.

Instead of relying on unrolling blobs in SkCanvas, serialize when
passing through a GPipe.

This is a prerequisite for pushing the blob draw op to the device.

R=mtklein@google.com, reed@google.com, robertphillips@google.com

Author: fmalita@chromium.org

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

diff --git a/include/core/SkTextBlob.h b/include/core/SkTextBlob.h
index af29933..0fb2402 100644 (file)
--- a/include/core/SkTextBlob.h
+++ b/include/core/SkTextBlob.h
@@ -32,6 +32,20 @@ public:
      */
     uint32_t uniqueID() const;
 
+    /**
+     *  Serialize to a buffer.
+     */
+    void flatten(SkWriteBuffer&) const;
+
+    /**
+     *  Recreate an SkTextBlob that was serialized into a buffer.
+     *
+     *  @param  SkReadBuffer Serialized blob data.
+     *  @return A new SkTextBlob representing the serialized data, or NULL if the buffer is
+     *          invalid.
+     */
+    static const SkTextBlob* CreateFromBuffer(SkReadBuffer&);
+
 private:
     enum GlyphPositioning {
         kDefault_Positioning      = 0, // Default glyph advances -- zero scalars per glyph.
@@ -70,13 +84,9 @@ private:
 
     SkTextBlob(uint16_t* glyphs, SkScalar* pos, const SkTArray<Run>* runs, const SkRect& bounds);
 
-    void flatten(SkWriteBuffer&) const;
-    static const SkTextBlob* CreateFromBuffer(SkReadBuffer&);
-
     static unsigned ScalarsPerGlyph(GlyphPositioning pos);
 
     friend class SkCanvas;
-    friend class SkPictureData;
     friend class SkTextBlobBuilder;
     friend class TextBlobTester;
 

diff --git a/src/pipe/SkGPipeRead.cpp b/src/pipe/SkGPipeRead.cpp
index e48baf3..4bd4fa6 100644 (file)
--- a/src/pipe/SkGPipeRead.cpp
+++ b/src/pipe/SkGPipeRead.cpp
@@ -26,6 +26,7 @@
 #include "SkRasterizer.h"
 #include "SkRRect.h"
 #include "SkShader.h"
+#include "SkTextBlob.h"
 #include "SkTypeface.h"
 #include "SkXfermode.h"
 
@@ -672,7 +673,19 @@ static void drawPicture_rp(SkCanvas* canvas, SkReader32* reader, uint32_t op32,
 
 static void drawTextBlob_rp(SkCanvas* canvas, SkReader32* reader, uint32_t op32,
                             SkGPipeState* state) {
-    UNIMPLEMENTED
+    SkScalar x = reader->readScalar();
+    SkScalar y = reader->readScalar();
+
+    size_t blobSize = reader->readU32();
+    const void* data = reader->skip(SkAlign4(blobSize));
+
+    if (state->shouldDraw()) {
+        SkReadBuffer blobBuffer(data, blobSize);
+        SkAutoTUnref<const SkTextBlob> blob(SkTextBlob::CreateFromBuffer(blobBuffer));
+        SkASSERT(blob.get());
+
+        canvas->drawTextBlob(blob, x, y, state->paint());
+    }
 }
 ///////////////////////////////////////////////////////////////////////////////
 

diff --git a/src/pipe/SkGPipeWrite.cpp b/src/pipe/SkGPipeWrite.cpp
index 32af81d..b5d2522 100644 (file)
--- a/src/pipe/SkGPipeWrite.cpp
+++ b/src/pipe/SkGPipeWrite.cpp
@@ -26,6 +26,7 @@
 #include "SkRRect.h"
 #include "SkShader.h"
 #include "SkStream.h"
+#include "SkTextBlob.h"
 #include "SkTSearch.h"
 #include "SkTypeface.h"
 #include "SkWriter32.h"
@@ -939,9 +940,22 @@ void SkGPipeCanvas::onDrawTextOnPath(const void* text, size_t byteLength, const
 
 void SkGPipeCanvas::onDrawTextBlob(const SkTextBlob* blob, SkScalar x, SkScalar y,
                                    const SkPaint& paint) {
-    // FIXME: blob serialization only supports SkWriteBuffers
-    //        -- convert to SkWriter32 to avoid unrolling?
-    this->INHERITED::onDrawTextBlob(blob, x, y, paint);
+    NOTIFY_SETUP(this);
+    this->writePaint(paint);
+
+    // FIXME: this is inefficient but avoids duplicating the blob serialization logic.
+    SkWriteBuffer blobBuffer;
+    blob->flatten(blobBuffer);
+
+    size_t size = sizeof(uint32_t) + 2 * sizeof(SkScalar) + blobBuffer.bytesWritten();
+    if (this->needOpBytes(size)) {
+        this->writeOp(kDrawTextBlob_DrawOp);
+        fWriter.writeScalar(x);
+        fWriter.writeScalar(y);
+        fWriter.write32(SkToU32(blobBuffer.bytesWritten()));
+        uint32_t* pad = fWriter.reservePad(blobBuffer.bytesWritten());
+        blobBuffer.writeToMemory(pad);
+    }
 }
 
 void SkGPipeCanvas::onDrawPicture(const SkPicture* picture, const SkMatrix* matrix,