Use sk_sp-based text blob APIs

third_party/WebKit/Source/platform/fonts/Font.cpp

 /*
  * Copyright (C) 1999 Lars Knoll (knoll@kde.org)
  *           (C) 1999 Antti Koivisto (koivisto@kde.org)
  *           (C) 2000 Dirk Mueller (mueller@kde.org)
  * Copyright (C) 2003, 2006, 2010, 2011 Apple Inc. All rights reserved.
  * Copyright (c) 2007, 2008, 2010 Google Inc. All rights reserved.
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Library General Public
  * License as published by the Free Software Foundation; either
@@ skipping 248 matching lines @@
         , m_deviceScaleFactor(deviceScaleFactor)
         , m_hasVerticalOffsets(buffer.hasVerticalOffsets())
         , m_index(0)
         , m_blobCount(0)
         , m_rotation(buffer.isEmpty() ? NoRotation : computeBlobRotation(buffer.fontDataAt(0)))
     { }
 
     bool done() const { return m_index >= m_buffer.size(); }
     unsigned blobCount() const { return m_blobCount; }
 
-    std::pair<sk_sp<const SkTextBlob>, BlobRotation> next()
+    std::pair<sk_sp<SkTextBlob>, BlobRotation> next()
     {
         ASSERT(!done());
         const BlobRotation currentRotation = m_rotation;
 
         while (m_index < m_buffer.size()) {
             const SimpleFontData* fontData = m_buffer.fontDataAt(m_index);
             ASSERT(fontData);
 
             const BlobRotation newRotation = computeBlobRotation(fontData);
             if (newRotation != m_rotation) {
                 // We're switching to an orientation which requires a different rotation
                 //   => emit the pending blob (and start a new one with the new rotation).
                 m_rotation = newRotation;
                 break;
             }
 
             const unsigned start = m_index++;
             while (m_index < m_buffer.size() && m_buffer.fontDataAt(m_index) == fontData)
                 m_index++;
 
             appendRun(start, m_index - start, fontData);
         }
 
         m_blobCount++;
-        return std::make_pair(sk_sp<const SkTextBlob>(m_builder.build()), currentRotation);
+        return std::make_pair(m_builder.make(), currentRotation);
     }
 
 private:
     static BlobRotation computeBlobRotation(const SimpleFontData* font)
     {
         // For vertical upright text we need to compensate the inherited 90deg CW rotation
         // (using a 90deg CCW rotation).
         return (font->platformData().isVerticalAnyUpright() && font->verticalData()) ?
             CCWRotation : NoRotation;
     }
@@ skipping 38 matching lines @@
     unsigned m_blobCount;
     BlobRotation m_rotation;
 };
 
 } // anonymous namespace
 
 void Font::drawGlyphBuffer(SkCanvas* canvas, const SkPaint& paint, const TextRunPaintInfo& runInfo,
     const GlyphBuffer& glyphBuffer, const FloatPoint& point, float deviceScaleFactor) const
 {
     GlyphBufferBloberizer bloberizer(glyphBuffer, this, deviceScaleFactor);
-    std::pair<sk_sp<const SkTextBlob>, BlobRotation> blob;
+    std::pair<sk_sp<SkTextBlob>, BlobRotation> blob;
 
     while (!bloberizer.done()) {
         blob = bloberizer.next();
         ASSERT(blob.first);
 
         SkAutoCanvasRestore autoRestore(canvas, false);
         if (blob.second == CCWRotation) {
             canvas->save();
 
             SkMatrix m;
             m.setSinCos(-1, 0, point.x(), point.y());
             canvas->concat(m);
         }
 
-        canvas->drawTextBlob(blob.first.get(), point.x(), point.y(), paint);
+        canvas->drawTextBlob(blob.first, point.x(), point.y(), paint);
     }
 
     // Cache results when
     //   1) requested by clients, and
     //   2) the glyph buffer is encoded as a single blob, and
     //   3) the blob is not upright/rotated
     if (runInfo.cachedTextBlob && bloberizer.blobCount() == 1 && blob.second == NoRotation) {
         ASSERT(!*runInfo.cachedTextBlob);
         *runInfo.cachedTextBlob = std::move(blob.first);
         ASSERT(*runInfo.cachedTextBlob);
@@ skipping 474 matching lines @@
 {
     return m_fontFallbackList && m_fontFallbackList->loadingCustomFonts();
 }
 
 bool Font::isFallbackValid() const
 {
     return !m_fontFallbackList || m_fontFallbackList->isValid();
 }
 
 } // namespace blink