From b82fe4978930afe1e37adbcb3200b1ae1b61f03c Mon Sep 17 00:00:00 2001
From: Kyle Huey <khuey@kylehuey.com>
Date: Fri, 6 Jan 2012 09:44:25 -0500
Subject: [PATCH] Bug 683891: Stop exporting THEBES_API symbols from libxul.
 r=glandium

---
 gfx/thebes/gfxASurface.h | 15 +++++++++++++++
 gfx/thebes/gfxTypes.h    |  6 +-----
 2 files changed, 16 insertions(+), 5 deletions(-)

diff --git a/gfx/thebes/gfxASurface.h b/gfx/thebes/gfxASurface.h
index 94b8e9ed835..33fa4726fd7 100644
--- a/gfx/thebes/gfxASurface.h
+++ b/gfx/thebes/gfxASurface.h
@@ -57,9 +57,24 @@ struct nsIntRect;
  */
 class THEBES_API gfxASurface {
 public:
+#ifdef MOZILLA_INTERNAL_API
     nsrefcnt AddRef(void);
     nsrefcnt Release(void);
 
+    // These functions exist so that browsercomps can refcount a gfxASurface
+    virtual nsresult AddRefExternal(void)
+    {
+      return AddRef();
+    }
+    virtual nsresult ReleaseExternal(void)
+    {
+      return Release();
+    }
+#else
+    virtual nsresult AddRef(void);
+    virtual nsresult Release(void);
+#endif
+
 public:
     /**
      * The format for an image surface. For all formats with alpha data, 0
diff --git a/gfx/thebes/gfxTypes.h b/gfx/thebes/gfxTypes.h
index e12611cb631..48b53081d69 100644
--- a/gfx/thebes/gfxTypes.h
+++ b/gfx/thebes/gfxTypes.h
@@ -47,11 +47,7 @@
  */
 typedef double gfxFloat;
 
-#if defined(IMPL_THEBES)
-# define THEBES_API NS_EXPORT
-#else
-# define THEBES_API NS_IMPORT
-#endif
+# define THEBES_API
 
 /**
  * gfx errors