Minor tweaks to SampleApplication.

samples/sample_util/SampleApplication.cpp

@@ -191,9 +191,19 @@ int SampleApplication::run()
         while (popEvent(&event))
         {
             // If the application did not catch a close event, close now
-            if (event.Type == Event::EVENT_CLOSED)
+            switch (event.Type)
             {
-                exit();
+                case Event::EVENT_CLOSED:
+                    exit();
+                    break;
+                case Event::EVENT_KEY_RELEASED:
+                    onKeyUp(event.Key);
+                    break;
+                case Event::EVENT_KEY_PRESSED:
+                    onKeyDown(event.Key);
+                    break;
+                default:
+                    break;
             }
         }
 
@@ -226,3 +236,13 @@ bool SampleApplication::popEvent(Event *event)
 {
     return mOSWindow->popEvent(event);
 }
+
+void SampleApplication::onKeyUp(const Event::KeyEvent &keyEvent)
+{
+    // Default no-op.
+}
+
+void SampleApplication::onKeyDown(const Event::KeyEvent &keyEvent)
+{
+    // Default no-op.
+}

samples/sample_util/SampleApplication.h

@@ -45,18 +45,21 @@ class SampleApplication
 
     virtual void swap();
 
+    virtual void onKeyUp(const Event::KeyEvent &keyEvent);
+    virtual void onKeyDown(const Event::KeyEvent &keyEvent);
+
     OSWindow *getWindow() const;
     EGLConfig getConfig() const;
     EGLDisplay getDisplay() const;
     EGLSurface getSurface() const;
     EGLContext getContext() const;
 
-    bool popEvent(Event *event);
-
     int run();
     void exit();
 
   private:
+    bool popEvent(Event *event);
+
     std::string mName;
     uint32_t mWidth;
     uint32_t mHeight;

util/OSWindow.h

@@ -25,8 +25,8 @@ class ANGLE_UTIL_EXPORT OSWindow
     static OSWindow *New();
     static void Delete(OSWindow **osWindow);
 
-    virtual bool initialize(const std::string &name, int width, int height)       = 0;
-    virtual void destroy()                                                        = 0;
+    virtual bool initialize(const std::string &name, int width, int height) = 0;
+    virtual void destroy()                                                  = 0;
 
     int getX() const;
     int getY() const;
@@ -66,7 +66,6 @@ class ANGLE_UTIL_EXPORT OSWindow
   protected:
     OSWindow();
     virtual ~OSWindow();
-    friend ANGLE_UTIL_EXPORT void FreeOSWindow(OSWindow *window);
 
     int mX;
     int mY;