detach -> release

src/views/unix/SkOSWindow_Unix.cpp

 
 /*
  * Copyright 2011 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 #include <X11/Xlib.h>
 #include <X11/Xatom.h>
 #include <X11/XKBlib.h>
@@ skipping 29 matching lines @@
     this->initWindow(0, nullptr);
     this->resize(WIDTH, HEIGHT);
 }
 
 SkOSWindow::~SkOSWindow() {
     this->internalCloseWindow();
 }
 
 void SkOSWindow::internalCloseWindow() {
     if (fUnixWindow.fDisplay) {
-        this->detach();
+        this->release();
         SkASSERT(fUnixWindow.fGc);
         XFreeGC(fUnixWindow.fDisplay, fUnixWindow.fGc);
         fUnixWindow.fGc = nullptr;
         XDestroyWindow(fUnixWindow.fDisplay, fUnixWindow.fWin);
         fVi = nullptr;
         XCloseDisplay(fUnixWindow.fDisplay);
         fUnixWindow.fDisplay = nullptr;
         fMSAASampleCount = 0;
     }
 }
@@ skipping 310 matching lines @@
                    fUnixWindow.fGLContext);
     glViewport(0, 0,
                SkScalarRoundToInt(this->width()),
                SkScalarRoundToInt(this->height()));
     glClearColor(0, 0, 0, 0);
     glClearStencil(0);
     glClear(GL_COLOR_BUFFER_BIT | GL_STENCIL_BUFFER_BIT);
     return true;
 }
 
-void SkOSWindow::detach() {
+void SkOSWindow::release() {
     if (nullptr == fUnixWindow.fDisplay || nullptr == fUnixWindow.fGLContext) {
         return;
     }
     glXMakeCurrent(fUnixWindow.fDisplay, None, nullptr);
     glXDestroyContext(fUnixWindow.fDisplay, fUnixWindow.fGLContext);
     fUnixWindow.fGLContext = nullptr;
 }
 
 void SkOSWindow::present() {
     if (fUnixWindow.fDisplay && fUnixWindow.fGLContext) {
@@ skipping 118 matching lines @@
 
 void SkEvent::SignalNonEmptyQueue() {
     // nothing to do, since we spin on our event-queue, polling for XPending
 }
 
 void SkEvent::SignalQueueTimer(SkMSec delay) {
     // just need to record the delay time. We handle waking up for it in
     // MyXNextEventWithDelay()
     gTimerDelay = delay;
 }