Move closeWindow()/setFullscreen()/setVSynv() from SkWindow to SkOSWindow

Rename setFullscreen to makeFullscreen, drop the param, return a bool.

Review URL: https://codereview.chromium.org/1181723006

6 files changed, 17 insertions, 12 deletions

diff --git a/include/views/SkOSWindow_Android.h b/include/views/SkOSWindow_Android.h
index 2538a3ea8e..09163fc1cb 100644
--- a/include/views/SkOSWindow_Android.h
+++ b/include/views/SkOSWindow_Android.h
@@ -31,8 +31,9 @@ public:
     bool attach(SkBackEndTypes attachType, int msaaSampleCount, AttachmentInfo* info);
     void detach();
     void present();
-    void closeWindow() override;
-    void setVsync(bool) override;
+    bool makeFullscreen() { return true; }
+    void closeWindow();
+    void setVsync(bool);
     bool destroyRequested() { return fDestroyRequested; }
 
     virtual void onPDFSaved(const char title[], const char desc[], const char path[]);
diff --git a/include/views/SkOSWindow_Mac.h b/include/views/SkOSWindow_Mac.h
index 2a15bf5f67..91d42bd855 100644
--- a/include/views/SkOSWindow_Mac.h
+++ b/include/views/SkOSWindow_Mac.h
@@ -30,6 +30,10 @@ public:
     bool    attach(SkBackEndTypes attachType, int msaaSampleCount, AttachmentInfo*);
     void    present();
 
+    bool    makeFullscreen() { return false; }
+    void    closeWindow()  { /* Not impl yet */ }
+    void    setVsync(bool)  { /* Not impl yet */ }
+
 protected:
     // overrides from SkEventSink
     virtual bool onEvent(const SkEvent& evt);
diff --git a/include/views/SkOSWindow_Unix.h b/include/views/SkOSWindow_Unix.h
index 4b7ee93d60..62705b441e 100644
--- a/include/views/SkOSWindow_Unix.h
+++ b/include/views/SkOSWindow_Unix.h
@@ -46,9 +46,9 @@ public:
 
     //static bool PostEvent(SkEvent* evt, SkEventSinkID, SkMSec delay);
 
-    void setFullscreen(bool) override;
-    void setVsync(bool) override;
-    void closeWindow() override;
+    bool makeFullscreen();
+    void setVsync(bool);
+    void closeWindow();
 
 protected:
     // Overridden from from SkWindow:
diff --git a/include/views/SkOSWindow_Win.h b/include/views/SkOSWindow_Win.h
index 6018b120bc..e7bba18205 100644
--- a/include/views/SkOSWindow_Win.h
+++ b/include/views/SkOSWindow_Win.h
@@ -52,9 +52,9 @@ public:
         SK_WM_SkTimerID = 0xFFFF    // just need a non-zero value
     };
 
-    void setFullscreen(bool) override;
-    void setVsync(bool) override;
-    void closeWindow() override;
+    bool makeFullscreen();
+    void setVsync(bool);
+    void closeWindow();
 
     static SkOSWindow* GetOSWindowForHWND(void* hwnd) {
         SkOSWindow** win = gHwndToOSWindowMap.find(hwnd);
diff --git a/include/views/SkOSWindow_iOS.h b/include/views/SkOSWindow_iOS.h
index f386c738f9..071d6db18c 100644
--- a/include/views/SkOSWindow_iOS.h
+++ b/include/views/SkOSWindow_iOS.h
@@ -25,6 +25,10 @@ public:
     bool    attach(SkBackEndTypes attachType, int msaaSampleCount, AttachmentInfo*);
     void    present();
 
+    bool makeFullscreen() { return true; }
+    void closeWindow() { /* Not impl yet */ }
+    void setVsync(bool) { /* Can't turn off vsync? */ }
+
 protected:
     // overrides from SkEventSink
     virtual bool onEvent(const SkEvent& evt);
diff --git a/include/views/SkWindow.h b/include/views/SkWindow.h
index 0ae0a7efc4..602c1c2076 100644
--- a/include/views/SkWindow.h
+++ b/include/views/SkWindow.h
@@ -80,10 +80,6 @@ public:
     virtual void onPDFSaved(const char title[], const char desc[],
         const char path[]) {}
 
-    virtual void setFullscreen(bool) {}
-    virtual void setVsync(bool) {}
-    virtual void closeWindow() {}
-
 protected:
     virtual bool onEvent(const SkEvent&);
     virtual bool onDispatchClick(int x, int y, Click::State, void* owner, unsigned modi);