aboutsummaryrefslogtreecommitdiffhomepage
path: root/src/core/SkPictureRecorder.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/SkPictureRecorder.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/SkPictureRecorder.cpp')
-rw-r--r--src/core/SkPictureRecorder.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/core/SkPictureRecorder.cpp b/src/core/SkPictureRecorder.cpp
index 62fa0e968f..8fbfed0229 100644
--- a/src/core/SkPictureRecorder.cpp
+++ b/src/core/SkPictureRecorder.cpp
@@ -92,8 +92,8 @@ SkPicture* SkPictureRecorder::endRecordingAsPicture() {
for (int i = 0; pictList && i < pictList->count(); i++) {
subPictureBytes += SkPictureUtils::ApproximateBytesUsed(pictList->begin()[i]);
}
- return new SkBigPicture(fCullRect, fRecord.detach(), pictList, fBBH.detach(),
- saveLayerData.detach(), subPictureBytes);
+ return new SkBigPicture(fCullRect, fRecord.release(), pictList, fBBH.release(),
+ saveLayerData.release(), subPictureBytes);
}
SkPicture* SkPictureRecorder::endRecordingAsPicture(const SkRect& cullRect) {
@@ -173,7 +173,7 @@ protected:
// SkBigPicture will take ownership of a ref on both fRecord and fBBH.
// We're not willing to give up our ownership, so we must ref them for SkPicture.
return new SkBigPicture(fBounds, SkRef(fRecord.get()), pictList, SkSafeRef(fBBH.get()),
- saveLayerData.detach(), subPictureBytes);
+ saveLayerData.release(), subPictureBytes);
}
};