aboutsummaryrefslogtreecommitdiffhomepage
path: root/src/core/SkTextBlob.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'src/core/SkTextBlob.cpp')
-rw-r--r--src/core/SkTextBlob.cpp10
1 files changed, 5 insertions, 5 deletions
diff --git a/src/core/SkTextBlob.cpp b/src/core/SkTextBlob.cpp
index 1cbb2b6d6d..3c7345f9a0 100644
--- a/src/core/SkTextBlob.cpp
+++ b/src/core/SkTextBlob.cpp
@@ -246,7 +246,7 @@ void SkTextBlob::flatten(SkWriteBuffer& buffer) const {
SkASSERT(0 == runCount);
}
-const SkTextBlob* SkTextBlob::CreateFromBuffer(SkReadBuffer& reader) {
+sk_sp<SkTextBlob> SkTextBlob::MakeFromBuffer(SkReadBuffer& reader) {
int runCount = reader.read32();
if (runCount < 0) {
return nullptr;
@@ -290,7 +290,7 @@ const SkTextBlob* SkTextBlob::CreateFromBuffer(SkReadBuffer& reader) {
}
}
- return blobBuilder.build();
+ return blobBuilder.make();
}
unsigned SkTextBlob::ScalarsPerGlyph(GlyphPositioning pos) {
@@ -613,7 +613,7 @@ const SkTextBlobBuilder::RunBuffer& SkTextBlobBuilder::allocRunPos(const SkPaint
return fCurrentRunBuffer;
}
-const SkTextBlob* SkTextBlobBuilder::build() {
+sk_sp<SkTextBlob> SkTextBlobBuilder::make() {
SkASSERT((fRunCount > 0) == (nullptr != fStorage.get()));
this->updateDeferredBounds();
@@ -624,7 +624,7 @@ const SkTextBlob* SkTextBlobBuilder::build() {
fStorage.realloc(fStorageUsed);
}
- const SkTextBlob* blob = new (fStorage.release()) SkTextBlob(fRunCount, fBounds);
+ SkTextBlob* blob = new (fStorage.release()) SkTextBlob(fRunCount, fBounds);
SkDEBUGCODE(const_cast<SkTextBlob*>(blob)->fStorageSize = fStorageSize;)
SkDEBUGCODE(
@@ -644,5 +644,5 @@ const SkTextBlob* SkTextBlobBuilder::build() {
fLastRun = 0;
fBounds.setEmpty();
- return blob;
+ return sk_sp<SkTextBlob>(blob);
}