Index: tools/viewer/sk_app/unix/Window_unix.h |
diff --git a/tools/viewer/sk_app/unix/Window_unix.h b/tools/viewer/sk_app/unix/Window_unix.h |
index fb6b22d4132a4e09ed056528bc6b298cb2588e84..c2156fc6aecf1e3e5b2fc86db4dd1f3553bf4f43 100644 |
--- a/tools/viewer/sk_app/unix/Window_unix.h |
+++ b/tools/viewer/sk_app/unix/Window_unix.h |
@@ -9,7 +9,6 @@ |
#define Window_unix_DEFINED |
#include <X11/Xlib.h> |
-#include <GL/glx.h> |
#include "../Window.h" |
#include "SkChecksum.h" |
#include "SkTDynamicHash.h" |
@@ -19,22 +18,17 @@ |
namespace sk_app { |
struct ContextPlatformData_unix { |
- Display* fDisplay; |
- XWindow fWindow; |
- XVisualInfo* fVisualInfo; |
+ Display* fDisplay; |
+ XWindow fHWnd; |
+ VisualID fVisualID; |
}; |
class Window_unix : public Window { |
public: |
- Window_unix() : Window() |
- , fDisplay(nullptr) |
- , fWindow(0) |
- , fGC(nullptr) |
- , fVisualInfo(nullptr) |
- , fMSAASampleCount(0) {} |
- ~Window_unix() override { this->closeWindow(); } |
+ Window_unix() : Window() {} |
+ ~Window_unix() override {} |
- bool initWindow(Display* display, const DisplayParams* params); |
+ bool init(Display* display); |
void setTitle(const char*) override; |
void show() override; |
@@ -46,7 +40,7 @@ |
bool handleEvent(const XEvent& event); |
static const XWindow& GetKey(const Window_unix& w) { |
- return w.fWindow; |
+ return w.fHWnd; |
} |
static uint32_t Hash(const XWindow& w) { |
@@ -76,13 +70,8 @@ |
} |
private: |
- void closeWindow(); |
- |
- Display* fDisplay; |
- XWindow fWindow; |
- GC fGC; |
- XVisualInfo* fVisualInfo; |
- int fMSAASampleCount; |
+ Display* fDisplay; |
+ XWindow fHWnd; |
Atom fWmDeleteMessage; |