aboutsummaryrefslogtreecommitdiffhomepage
path: root/include
diff options
context:
space:
mode:
authorGravatar joshualitt <joshualitt@chromium.org>2015-06-01 10:03:54 -0700
committerGravatar Commit bot <commit-bot@chromium.org>2015-06-01 10:03:55 -0700
commit7fe8ee4cb7396754bfdb8c3bc1bf7c09af7459dd (patch)
tree52560e70e7de11398f7d39767468e2eb7a44d053 /include
parent038b01c081d16e3e3ec3e874c816ee866ab73508 (diff)
Expand VisualBench to a real benching tool
Diffstat (limited to 'include')
-rw-r--r--include/views/SkOSWindow_Unix.h5
-rw-r--r--include/views/SkWindow.h1
2 files changed, 5 insertions, 1 deletions
diff --git a/include/views/SkOSWindow_Unix.h b/include/views/SkOSWindow_Unix.h
index 78670cde13..4b7ee93d60 100644
--- a/include/views/SkOSWindow_Unix.h
+++ b/include/views/SkOSWindow_Unix.h
@@ -48,6 +48,7 @@ public:
void setFullscreen(bool) override;
void setVsync(bool) override;
+ void closeWindow() override;
protected:
// Overridden from from SkWindow:
@@ -64,7 +65,9 @@ private:
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;
diff --git a/include/views/SkWindow.h b/include/views/SkWindow.h
index 70cbcc19e1..0ae0a7efc4 100644
--- a/include/views/SkWindow.h
+++ b/include/views/SkWindow.h
@@ -82,6 +82,7 @@ public:
virtual void setFullscreen(bool) {}
virtual void setVsync(bool) {}
+ virtual void closeWindow() {}
protected:
virtual bool onEvent(const SkEvent&);