Expand VisualBench to a real benching tool

include/views/SkOSWindow_Unix.h

 /*
  * Copyright 2006 The Android Open Source Project
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #ifndef SkOSWindow_Unix_DEFINED
 #define SkOSWindow_Unix_DEFINED
 
@@ skipping 30 matching lines @@
     bool attach(SkBackEndTypes attachType, int msaaSampleCount, AttachmentInfo*);
     void detach();
     void present();
 
     int getMSAASampleCount() const { return fMSAASampleCount; }
 
     //static bool PostEvent(SkEvent* evt, SkEventSinkID, SkMSec delay);
 
     void setFullscreen(bool) override;
     void setVsync(bool) override;
+    void closeWindow() override;
 
 protected:
     // Overridden from from SkWindow:
     void onSetTitle(const char title[]) override;
 
 private:
     enum NextXEventResult {
         kContinue_NextXEventResult,
         kQuitRequest_NextXEventResult,
         kPaintRequest_NextXEventResult
     };
 
     NextXEventResult nextXEvent();
     void doPaint();
     void mapWindowAndWait();
 
-    void closeWindow();
+    // Forcefully closes the window.  If a graceful shutdown is desired then call the public
+    // closeWindow method
+    void internalCloseWindow();
     void initWindow(int newMSAASampleCount, AttachmentInfo* info);
 
     SkUnixWindow fUnixWindow;
 
     // Needed for GL
     XVisualInfo* fVi;
     // we recreate the underlying xwindow if this changes
     int fMSAASampleCount;
 
     typedef SkWindow INHERITED;
 };
 
 #endif