aboutsummaryrefslogtreecommitdiffhomepage
path: root/dm
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 /dm
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 'dm')
-rw-r--r--dm/DM.cpp4
-rw-r--r--dm/DMSrcSink.cpp2
2 files changed, 3 insertions, 3 deletions
diff --git a/dm/DM.cpp b/dm/DM.cpp
index 6748544eca..d8421c95b0 100644
--- a/dm/DM.cpp
+++ b/dm/DM.cpp
@@ -315,7 +315,7 @@ static void push_src(const char* tag, ImplicitString options, Src* s) {
FLAGS_src.contains(tag) &&
!SkCommandLineFlags::ShouldSkip(FLAGS_match, src->name().c_str())) {
TaggedSrc& s = gSrcs.push_back();
- s.reset(src.detach());
+ s.reset(src.release());
s.tag = tag;
s.options = options;
}
@@ -791,7 +791,7 @@ static void push_sink(const SkCommandLineConfig& config, Sink* s) {
}
TaggedSink& ts = gSinks.push_back();
- ts.reset(sink.detach());
+ ts.reset(sink.release());
ts.tag = config.getTag();
}
diff --git a/dm/DMSrcSink.cpp b/dm/DMSrcSink.cpp
index 134c7a37e0..27cb6aa54e 100644
--- a/dm/DMSrcSink.cpp
+++ b/dm/DMSrcSink.cpp
@@ -818,7 +818,7 @@ Error ImageGenSrc::draw(SkCanvas* canvas) const {
// We have disabled these tests in DM.cpp.
SkASSERT(kGray_8_SkColorType != gen->getInfo().colorType());
- SkAutoTDelete<SkImage> image(SkImage::NewFromGenerator(gen.detach(), nullptr));
+ SkAutoTDelete<SkImage> image(SkImage::NewFromGenerator(gen.release(), nullptr));
if (!image) {
return "Could not create image from codec image generator.";
}