1 files changed, 8 insertions, 40 deletions
diff --git a/indra/llwindow/llwindowwin32.h b/indra/llwindow/llwindowwin32.h
index d082080807..5966061177 100644
--- a/indra/llwindow/llwindowwin32.h
+++ b/indra/llwindow/llwindowwin32.h
@@ -36,44 +36,12 @@
 #include "llthread.h"
 #include "llthreadsafequeue.h"
 #include "llmutex.h"
+#include "workqueue.h"
 
 // Hack for async host by name
 #define LL_WM_HOST_RESOLVED      (WM_APP + 1)
 typedef void (*LLW32MsgCallback)(const MSG &msg);
 
-class LLWindowWin32;
-
-// Thread that owns the Window Handle
-class LLWindowWin32Thread : public LLThread
-{
-public:
-    class Message
-    {
-    public:
-        LRESULT mMsg;
-    };
-
-    static const int MAX_QUEUE_SIZE = 2048;
-
-    LLThreadSafeQueue<MSG> mMessageQueue;
-    LLThreadSafeQueue<std::function<void()>> mFunctionQueue;
-
-    bool mFinished = false;
-
-    LLWindowWin32Thread(LLWindowWin32* window);
-
-    void run() override;
-
-    void post(const std::function<void()>& func);
-
-private:
-
-    // call PeekMessage and pull enqueue messages for later processing
-    void gatherInput();
-    LLWindowWin32* mWindow = nullptr;
-
-};
-
 class LLWindowWin32 : public LLWindow
 {
 public:
@@ -218,7 +186,6 @@ protected:
 	HGLRC		mhRC = 0;			// OpenGL rendering context
 	HDC			mhDC = 0;			// Windows Device context handle
 	HINSTANCE	mhInstance;		// handle to application instance
-	WNDPROC		mWndProc;		// user-installable window proc
 	RECT		mOldMouseClip;  // Screen rect to which the mouse cursor was globally constrained before we changed it in clipMouse()
 	WPARAM		mLastSizeWParam;
 	F32			mOverrideAspectRatio;
@@ -270,14 +237,15 @@ protected:
 
 	BOOL			mMouseVanish;
 
-    LLWindowWin32Thread* mWindowThread = nullptr;
-    LLThreadSafeQueue<std::function<void()>> mFunctionQueue;
-    LLThreadSafeQueue<std::function<void()>> mMouseQueue;
-    void post(const std::function<void()>& func);
-    void postMouseButtonEvent(const std::function<void()>& func);
+	struct LLWindowWin32Thread;
+	LLWindowWin32Thread* mWindowThread = nullptr;
+	LLThreadSafeQueue<std::function<void()>> mFunctionQueue;
+	LLThreadSafeQueue<std::function<void()>> mMouseQueue;
+	void post(const std::function<void()>& func);
+	void postMouseButtonEvent(const std::function<void()>& func);
+	void recreateWindow(RECT window_rect, DWORD dw_ex_style, DWORD dw_style);
 
 	friend class LLWindowManager;
-    friend class LLWindowWin32Thread;
 };
 
 class LLSplashScreenWin32 : public LLSplashScreen