Expand VisualBench to a real benching tool

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 24 matching lines @@
 SkOSWindow::SkOSWindow(void*)
     : fVi(NULL)
     , fMSAASampleCount(0) {
     fUnixWindow.fDisplay = NULL;
     fUnixWindow.fGLContext = NULL;
     this->initWindow(0, NULL);
     this->resize(WIDTH, HEIGHT);
 }
 
 SkOSWindow::~SkOSWindow() {
-    this->closeWindow();
+    this->internalCloseWindow();
 }
 
-void SkOSWindow::closeWindow() {
+void SkOSWindow::internalCloseWindow() {
     if (fUnixWindow.fDisplay) {
         this->detach();
         SkASSERT(fUnixWindow.fGc);
         XFreeGC(fUnixWindow.fDisplay, fUnixWindow.fGc);
         fUnixWindow.fGc = NULL;
         XDestroyWindow(fUnixWindow.fDisplay, fUnixWindow.fWin);
         fVi = NULL;
         XCloseDisplay(fUnixWindow.fDisplay);
         fUnixWindow.fDisplay = NULL;
         fMSAASampleCount = 0;
     }
 }
 
 void SkOSWindow::initWindow(int requestedMSAASampleCount, AttachmentInfo* info) {
     if (fMSAASampleCount != requestedMSAASampleCount) {
-        this->closeWindow();
+        this->internalCloseWindow();
     }
     // presence of fDisplay means we already have a window
     if (fUnixWindow.fDisplay) {
         if (info) {
             if (fVi) {
                 glXGetConfig(fUnixWindow.fDisplay, fVi, GLX_SAMPLES_ARB, &info->fSampleCount);
                 glXGetConfig(fUnixWindow.fDisplay, fVi, GLX_STENCIL_SIZE, &info->fStencilBits);
             } else {
                 info->fSampleCount = 0;
                 info->fStencilBits = 0;
@@ skipping 379 matching lines @@
     _NET_WM_STATE_REMOVE =0,
     _NET_WM_STATE_ADD = 1,
     _NET_WM_STATE_TOGGLE =2
 };
 
 void SkOSWindow::setFullscreen(bool setFullscreen) {
     Display* dsp = fUnixWindow.fDisplay;
     if (NULL == dsp) {
         return;
     }
-    Window win = fUnixWindow.fWin;
 
     // Full screen
     Atom wm_state = XInternAtom(dsp, "_NET_WM_STATE", False);
     Atom fullscreen = XInternAtom(dsp, "_NET_WM_STATE_FULLSCREEN", False);
 
     XEvent evt;
     sk_bzero(&evt, sizeof(evt));
     evt.type = ClientMessage;
-    evt.xclient.window = win;
+    evt.xclient.window = fUnixWindow.fWin;
     evt.xclient.message_type = wm_state;
     evt.xclient.format = 32;
     evt.xclient.data.l[0] = setFullscreen ? _NET_WM_STATE_ADD : _NET_WM_STATE_REMOVE;
     evt.xclient.data.l[1] = fullscreen;
     evt.xclient.data.l[2] = 0;
 
     XSendEvent(dsp, DefaultRootWindow(dsp), False,
                SubstructureRedirectMask | SubstructureNotifyMask, &evt);
 }
 
 void SkOSWindow::setVsync(bool vsync) {
     if (fUnixWindow.fDisplay && fUnixWindow.fGLContext && fUnixWindow.fWin) {
         int swapInterval = vsync ? 1 : 0;
         glXSwapInterval(fUnixWindow.fDisplay, fUnixWindow.fWin, swapInterval);
     }
 }
 
+void SkOSWindow::closeWindow() {
+    Display* dsp = fUnixWindow.fDisplay;
+    if (NULL == dsp) {
+        return;
+    }
+
+    XEvent evt;
+    sk_bzero(&evt, sizeof(evt));
+    evt.type = ClientMessage;
+    evt.xclient.message_type = XInternAtom(dsp, "WM_PROTOCOLS", true);
+    evt.xclient.window = fUnixWindow.fWin;
+    evt.xclient.format = 32;
+    evt.xclient.data.l[0] = XInternAtom(dsp, "WM_DELETE_WINDOW", false);
+    evt.xclient.data.l[1] = CurrentTime;
+
+    XSendEvent(dsp, fUnixWindow.fWin, false, NoEventMask, &evt);
+}
+
 ///////////////////////////////////////////////////////////////////////////////
 
 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;
 }