diff -r 000000000000 -r 6474c204b198 gfx/thebes/gfxWindowsSurface.h
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/gfx/thebes/gfxWindowsSurface.h	Wed Dec 31 06:09:35 2014 +0100
@@ -0,0 +1,90 @@
+/* -*- Mode: C++; tab-width: 20; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+#ifndef GFX_WINDOWSSURFACE_H
+#define GFX_WINDOWSSURFACE_H
+
+#include "gfxASurface.h"
+#include "gfxImageSurface.h"
+
+/* include windows.h for the HWND and HDC definitions that we need. */
+#include <windows.h>
+
+struct IDirect3DSurface9;
+
+/* undefine LoadImage because our code uses that name */
+#undef LoadImage
+
+class gfxContext;
+
+class gfxWindowsSurface : public gfxASurface {
+public:
+    enum {
+        FLAG_TAKE_DC = (1 << 0),
+        FLAG_FOR_PRINTING = (1 << 1),
+        FLAG_IS_TRANSPARENT = (1 << 2)
+    };
+
+    gfxWindowsSurface(HWND wnd, uint32_t flags = 0);
+    gfxWindowsSurface(HDC dc, uint32_t flags = 0);
+
+    // Create from a shared d3d9surface
+    gfxWindowsSurface(IDirect3DSurface9 *surface, uint32_t flags = 0);
+
+    // Create a DIB surface
+    gfxWindowsSurface(const gfxIntSize& size,
+                      gfxImageFormat imageFormat = gfxImageFormat::RGB24);
+
+    // Create a DDB surface; dc may be nullptr to use the screen DC
+    gfxWindowsSurface(HDC dc,
+                      const gfxIntSize& size,
+                      gfxImageFormat imageFormat = gfxImageFormat::RGB24);
+
+    gfxWindowsSurface(cairo_surface_t *csurf);
+
+    virtual already_AddRefed<gfxASurface> CreateSimilarSurface(gfxContentType aType,
+                                                               const gfxIntSize& aSize);
+
+    void InitWithDC(uint32_t flags);
+
+    virtual ~gfxWindowsSurface();
+
+    HDC GetDC();
+
+    HDC GetDCWithClip(gfxContext *);
+
+    already_AddRefed<gfxImageSurface> GetAsImageSurface();
+
+    nsresult BeginPrinting(const nsAString& aTitle, const nsAString& aPrintToFileName);
+    nsresult EndPrinting();
+    nsresult AbortPrinting();
+    nsresult BeginPage();
+    nsresult EndPage();
+
+    virtual int32_t GetDefaultContextFlags() const;
+
+    const gfxIntSize GetSize() const;
+
+    void MovePixels(const nsIntRect& aSourceRect,
+                    const nsIntPoint& aDestTopLeft)
+    {
+        FastMovePixels(aSourceRect, aDestTopLeft);
+    }
+
+    // The memory used by this surface lives in this process's address space,
+    // but not in the heap.
+    virtual gfxMemoryLocation GetMemoryLocation() const;
+
+private:
+    void MakeInvalid(gfxIntSize& size);
+
+    bool mOwnsDC;
+    bool mForPrinting;
+
+    HDC mDC;
+    HWND mWnd;
+};
+
+#endif /* GFX_WINDOWSSURFACE_H */