diff options
| author |  mtklein <mtklein@chromium.org> | 2016-03-16 13:53:35 -0700 |
|---|---|---|
| committer |  Commit bot <commit-bot@chromium.org> | 2016-03-16 13:53:35 -0700 |
| commit | 18300a3aa7cb6eb55d21bb0450dffa58b6fc062c (patch) | |
| tree | d1c0f54567937ed7dd44fb17842c6c1b544815d0 /tools/Resources.cpp | |
| parent | 830dfd87a7707f687e13da5be645e75c746a2cf5 (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 'tools/Resources.cpp')
| -rw-r--r-- | tools/Resources.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/tools/Resources.cpp b/tools/Resources.cpp index 62b3f9fd0d..ecbf88c17a 100644 --- a/tools/Resources.cpp +++ b/tools/Resources.cpp @@ -42,7 +42,7 @@ SkStreamAsset* GetResourceAsStream(const char* resource) { SkString resourcePath = GetResourcePath(resource); SkAutoTDelete<SkFILEStream> stream(new SkFILEStream(resourcePath.c_str())); if (stream->isValid()) { - return stream.detach(); + return stream.release(); } else { SkDebugf("Resource %s not found.\n", resource); return nullptr; @@ -54,5 +54,5 @@ SkTypeface* GetResourceAsTypeface(const char* resource) { if (!stream) { return nullptr; } - return SkTypeface::CreateFromStream(stream.detach()); + return SkTypeface::CreateFromStream(stream.release()); } |