aboutsummaryrefslogtreecommitdiffhomepage
path: root/src/core/SkStream.cpp
diff options
context:
space:
mode:
authorGravatar mtklein <mtklein@chromium.org>2016-03-16 13:53:35 -0700
committerGravatar Commit bot <commit-bot@chromium.org>2016-03-16 13:53:35 -0700
commit18300a3aa7cb6eb55d21bb0450dffa58b6fc062c (patch)
treed1c0f54567937ed7dd44fb17842c6c1b544815d0 /src/core/SkStream.cpp
parent830dfd87a7707f687e13da5be645e75c746a2cf5 (diff)
detach -> release
The C++ standard library uses the name "release" for the operation we call "detach". Rewriting each "detach(" to "release(" brings us a step closer to using standard library types directly (e.g. std::unique_ptr instead of SkAutoTDelete). This was a fairly blind transformation. There may have been unintentional conversions in here, but it's probably for the best to have everything uniformly say "release". BUG=skia: GOLD_TRYBOT_URL= https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&issue=1809733002 Review URL: https://codereview.chromium.org/1809733002
Diffstat (limited to 'src/core/SkStream.cpp')
-rw-r--r--src/core/SkStream.cpp8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/core/SkStream.cpp b/src/core/SkStream.cpp
index b6d0a2bb33..a4c44fb2bc 100644
--- a/src/core/SkStream.cpp
+++ b/src/core/SkStream.cpp
@@ -241,7 +241,7 @@ SkStreamAsset* SkFILEStream::duplicate() const {
if (!fName.isEmpty()) {
SkAutoTDelete<SkFILEStream> that(new SkFILEStream(fName.c_str()));
if (sk_fidentical(that->fFILE, this->fFILE)) {
- return that.detach();
+ return that.release();
}
}
@@ -267,7 +267,7 @@ bool SkFILEStream::move(long offset) {
SkStreamAsset* SkFILEStream::fork() const {
SkAutoTDelete<SkStreamAsset> that(this->duplicate());
that->seek(this->getPosition());
- return that.detach();
+ return that.release();
}
size_t SkFILEStream::getLength() const {
@@ -403,7 +403,7 @@ bool SkMemoryStream::move(long offset) {
SkMemoryStream* SkMemoryStream::fork() const {
SkAutoTDelete<SkMemoryStream> that(this->duplicate());
that->seek(fOffset);
- return that.detach();
+ return that.release();
}
size_t SkMemoryStream::getLength() const {
@@ -785,7 +785,7 @@ public:
that->fCurrent = this->fCurrent;
that->fOffset = this->fOffset;
that->fCurrentOffset = this->fCurrentOffset;
- return that.detach();
+ return that.release();
}
size_t getLength() const override {