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 /src/views/sdl | |
| 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 'src/views/sdl')
| -rw-r--r-- | src/views/sdl/SkOSWindow_SDL.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/views/sdl/SkOSWindow_SDL.cpp b/src/views/sdl/SkOSWindow_SDL.cpp index c39a4fdfef..76d43498e8 100644 --- a/src/views/sdl/SkOSWindow_SDL.cpp +++ b/src/views/sdl/SkOSWindow_SDL.cpp @@ -50,7 +50,7 @@ SkOSWindow* SkOSWindow::GetInstanceForWindowID(Uint32 windowID) { return nullptr; } -void SkOSWindow::detach() { +void SkOSWindow::release() { if (fGLContext) { SDL_GL_DeleteContext(fGLContext); fGLContext = nullptr; @@ -76,7 +76,7 @@ bool SkOSWindow::attach(SkBackEndTypes attachType, int msaaSampleCount, Attachme if (SDL_GL_MakeCurrent(fWindow, fGLContext) != 0) { report_sdl_error("Failed to make SDL GL context current."); - this->detach(); + this->release(); return false; } @@ -219,7 +219,7 @@ void SkOSWindow::createWindow(int msaaSampleCount) { } void SkOSWindow::destroyWindow() { - this->detach(); + this->release(); if (fWindow) { SDL_DestroyWindow(fWindow); fWindow = nullptr; |