[aseprite] 123/250: Fix EventQueue::instance() for Skia port

[Tobias Hansen]

This is an automated email from the git hooks/post-receive script.

thansen pushed a commit to branch master
in repository aseprite.

commit e8fde930bdf4f885541f9a497737df201fc3ff5e
Author: David Capello <davidcapello at gmail.com>
Date:   Fri Oct 2 12:08:38 2015 -0300

    Fix EventQueue::instance() for Skia port
---
 src/she/skia/skia_display.cpp |  2 +-
 src/she/skia/skia_display.h   |  2 +-
 src/she/skia/skia_system.h    | 11 ++++++++---
 3 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/src/she/skia/skia_display.cpp b/src/she/skia/skia_display.cpp
index 53519af..7144e21 100644
--- a/src/she/skia/skia_display.cpp
+++ b/src/she/skia/skia_display.cpp
@@ -17,7 +17,7 @@
 
 namespace she {
 
-SkiaDisplay::SkiaDisplay(EventQueue* queue, int width, int height, int scale)
+SkiaDisplay::SkiaDisplay(int width, int height, int scale)
   : m_window(instance()->eventQueue(), this)
   , m_surface(new SkiaSurface)
   , m_customSurface(false)
diff --git a/src/she/skia/skia_display.h b/src/she/skia/skia_display.h
index bf7e660..21ab241 100644
--- a/src/she/skia/skia_display.h
+++ b/src/she/skia/skia_display.h
@@ -18,7 +18,7 @@ class SkiaSurface;
 
 class SkiaDisplay : public Display {
 public:
-  SkiaDisplay(EventQueue* queue, int width, int height, int scale);
+  SkiaDisplay(int width, int height, int scale);
 
   void setSkiaSurface(SkiaSurface* surface);
 
diff --git a/src/she/skia/skia_system.h b/src/she/skia/skia_system.h
index b378ce7..dbe45b9 100644
--- a/src/she/skia/skia_system.h
+++ b/src/she/skia/skia_system.h
@@ -28,6 +28,8 @@
 
 namespace she {
 
+EventQueueImpl g_queue;
+
 class SkiaSystem : public CommonSystem {
 public:
   SkiaSystem()
@@ -52,7 +54,7 @@ public:
   }
 
   EventQueue* eventQueue() override {
-    return &m_queue;
+    return &g_queue;
   }
 
   Display* defaultDisplay() override {
@@ -60,7 +62,7 @@ public:
   }
 
   Display* createDisplay(int width, int height, int scale) override {
-    SkiaDisplay* display = new SkiaDisplay(&m_queue, width, height, scale);
+    SkiaDisplay* display = new SkiaDisplay(width, height, scale);
     if (!m_defaultDisplay)
       m_defaultDisplay = display;
     return display;
@@ -107,9 +109,12 @@ public:
 
 private:
   SkiaDisplay* m_defaultDisplay;
-  EventQueueImpl m_queue;
 };
 
+EventQueue* EventQueue::instance() {
+  return &g_queue;
+}
+
 } // namespace she
 
 #endif

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/aseprite.git