Use sk_sp text blob APIs

tools/debugger/SkDrawCommand.cpp

 /*
  * Copyright 2012 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #include "SkDrawCommand.h"
 
 #include "SkBlurMaskFilter.h"
@@ skipping 2779 matching lines @@
     SkScalar y = command[SKDEBUGCANVAS_ATTRIBUTE_Y].asFloat();
     return new SkDrawPosTextHCommand(text, strlen(text), xpos, y, paint);
 }
 
 static const char* gPositioningLabels[] = {
     "kDefault_Positioning",
     "kHorizontal_Positioning",
     "kFull_Positioning",
 };
 
-SkDrawTextBlobCommand::SkDrawTextBlobCommand(const SkTextBlob* blob, SkScalar x, SkScalar y,
+SkDrawTextBlobCommand::SkDrawTextBlobCommand(sk_sp<SkTextBlob> blob, SkScalar x, SkScalar y,
                                              const SkPaint& paint)
     : INHERITED(kDrawTextBlob_OpType)
-    , fBlob(SkRef(blob))
+    , fBlob(std::move(blob))
     , fXPos(x)
     , fYPos(y)
     , fPaint(paint) {
 
     SkAutoTDelete<SkString> runsStr(new SkString);
     fInfo.push(SkObjectParser::ScalarToString(x, "XPOS: "));
     fInfo.push(SkObjectParser::ScalarToString(y, "YPOS: "));
     fInfo.push(SkObjectParser::RectToString(fBlob->bounds(), "Bounds: "));
     fInfo.push(runsStr);
     fInfo.push(SkObjectParser::PaintToString(paint));
 
     unsigned runs = 0;
     SkPaint runPaint(paint);
-    SkTextBlobRunIterator iter(blob);
+    SkTextBlobRunIterator iter(blob.get());
     while (!iter.done()) {
         SkAutoTDelete<SkString> tmpStr(new SkString);
         tmpStr->printf("==== Run [%d] ====", runs++);
         fInfo.push(tmpStr.release());
 
         fInfo.push(SkObjectParser::IntToString(iter.glyphCount(), "GlyphCount: "));
         tmpStr.reset(new SkString("GlyphPositioning: "));
         tmpStr->append(gPositioningLabels[iter.positioning()]);
         fInfo.push(tmpStr.release());
 
@@ skipping 12 matching lines @@
     canvas->drawTextBlob(fBlob, fXPos, fYPos, fPaint);
 }
 
 bool SkDrawTextBlobCommand::render(SkCanvas* canvas) const {
     canvas->clear(SK_ColorWHITE);
     canvas->save();
 
     SkRect bounds = fBlob->bounds().makeOffset(fXPos, fYPos);
     xlate_and_scale_to_bounds(canvas, bounds);
 
-    canvas->drawTextBlob(fBlob.get(), fXPos, fYPos, fPaint);
+    canvas->drawTextBlob(fBlob, fXPos, fYPos, fPaint);
 
     canvas->restore();
 
     return true;
 }
 
 Json::Value SkDrawTextBlobCommand::toJSON(UrlDataManager& urlDataManager) const {
     Json::Value result = INHERITED::toJSON(urlDataManager);
     Json::Value runs(Json::arrayValue);
     SkTextBlobRunIterator iter(fBlob.get());
@@ skipping 82 matching lines @@
             SkTextBlobBuilder::RunBuffer buffer = builder.allocRun(font, count, x, y, &bounds);
             for (int j = 0; j < count; j++) {
                 buffer.glyphs[j] = glyphs[j].asUInt();
             }
         }
     }
     SkScalar x = command[SKDEBUGCANVAS_ATTRIBUTE_X].asFloat();
     SkScalar y = command[SKDEBUGCANVAS_ATTRIBUTE_Y].asFloat();
     SkPaint paint;
     extract_json_paint(command[SKDEBUGCANVAS_ATTRIBUTE_PAINT], urlDataManager, &paint);
-    return new SkDrawTextBlobCommand(builder.build(), x, y, paint);
+    return new SkDrawTextBlobCommand(builder.make(), x, y, paint);
 }
 
 SkDrawPatchCommand::SkDrawPatchCommand(const SkPoint cubics[12], const SkColor colors[4],
                                        const SkPoint texCoords[4], SkXfermode* xfermode,
                                        const SkPaint& paint)
     : INHERITED(kDrawPatch_OpType) {
     memcpy(fCubics, cubics, sizeof(fCubics));
     if (colors != nullptr) {
         memcpy(fColors, colors, sizeof(fColors));
         fColorsPtr = fColors;
@@ skipping 584 matching lines @@
 SkTranslateZCommand* SkTranslateZCommand::fromJSON(Json::Value& command,
                                        UrlDataManager& urlDataManager) {
     SkScalar z;
 #ifdef SK_EXPERIMENTAL_SHADOWING
     extract_json_scalar(command[SKDEBUGCANVAS_ATTRIBUTE_DRAWDEPTHTRANS], &z);
 #else
     z = 0;
 #endif
     return new SkTranslateZCommand(z);
 }