Bug 849207 - Use __declspec(dllexport) for exporting skia C++ symbols. r=gwright

--HG--
extra : rebase_source : 333c7fcc334db6f6969995f0ff5fac8bb9607e74

configure.in

@@ -8279,6 +8279,9 @@ if test "$MOZ_ENABLE_SKIA"; then
   AC_DEFINE(USE_SKIA)
   if test "${MOZ_WIDGET_TOOLKIT}" = "android" -o x"$MOZ_WIDGET_TOOLKIT" = x"gonk"; then
     AC_DEFINE(SK_BUILD_FOR_ANDROID_NDK)
+  elif test "$OS_ARCH" = "WINNT"; then
+    AC_DEFINE(SKIA_DLL)
+    AC_DEFINE(GR_DLL)
   fi
 else
   MOZ_SKIA_LIBS=

gfx/2d/Makefile.in

@@ -138,6 +138,7 @@ ifdef MOZ_ENABLE_SKIA
 CPPSRCS += \
         ScaledFontWin.cpp \
         $(NULL)
+DEFINES += -DSKIA_IMPLEMENTATION=1 -DGR_IMPLEMENTATION=1
 endif
 endif
 

gfx/gl/GLContextSkia.cpp

@@ -4,7 +4,6 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 #include "skia/GrGLInterface.h"
-#include "skia/SkString.h"
 
 /* SkPostConfig.h includes windows.h, which includes windef.h
  * which redefines min/max. We don't want that. */
@@ -300,25 +299,25 @@ const GLubyte* glGetString_mozilla(GrGLenum name)
         // Only expose the bare minimum extensions we want to support to ensure a functional Ganesh
         // as GLContext only exposes certain extensions
         static bool extensionsStringBuilt = false;
-        static SkString extensionsString;
+        static char extensionsString[120];
 
         if (!extensionsStringBuilt) {
             if (sGLContext->IsExtensionSupported(GLContext::EXT_texture_format_BGRA8888)) {
-                extensionsString.append("GL_EXT_texture_format_BGRA8888 ");
+                strcpy(extensionsString, "GL_EXT_texture_format_BGRA8888 ");
             }
 
             if (sGLContext->IsExtensionSupported(GLContext::OES_packed_depth_stencil)) {
-                extensionsString.append("GL_OES_packed_depth_stencil ");
+                strcat(extensionsString, "GL_OES_packed_depth_stencil ");
             }
 
             if (sGLContext->IsExtensionSupported(GLContext::EXT_packed_depth_stencil)) {
-                extensionsString.append("GL_EXT_packed_depth_stencil ");
+                strcat(extensionsString, "GL_EXT_packed_depth_stencil ");
             }
 
             extensionsStringBuilt = true;
         }
 
-        return reinterpret_cast<const GLubyte*>(extensionsString.c_str());
+        return reinterpret_cast<const GLubyte*>(extensionsString);
 
     } else if (name == LOCAL_GL_SHADING_LANGUAGE_VERSION) {
         if (sGLContext->IsGLES2()) {

gfx/skia/Makefile.in

@@ -507,6 +507,7 @@ CPPSRCS += \
 	SkFontHost_sandbox_none.cpp \
 	SkTime_win.cpp \
 	$(NULL)
+DEFINES += -DSKIA_IMPLEMENTATION=1 -DGR_IMPLEMENTATION=1
 endif
 
 ifneq (,$(INTEL_ARCHITECTURE))

layout/media/symbols.def.in

@@ -567,18 +567,3 @@ hb_unicode_funcs_set_eastasian_width_func
 hb_unicode_funcs_set_general_category_func
 hb_unicode_funcs_set_mirroring_func
 hb_unicode_funcs_set_script_func
-#ifdef MOZ_ENABLE_SKIA
-#ifdef HAVE_64BIT_OS
-?insert@SkString@@QEAAX_KQEBD@Z
-??0SkString@@QEAA@XZ
-??1SkString@@QEAA@XZ
-?Create@GrContext@@SAPEAV1@W4GrEngine@@_J@Z
-??0GrGLInterface@@QEAA@XZ
-#else
-?insert@SkString@@QAEXIQBD@Z
-??0SkString@@QAE@XZ
-??1SkString@@QAE@XZ
-?Create@GrContext@@SAPAV1@W4GrEngine@@H@Z
-??0GrGLInterface@@QAE@XZ
-#endif
-#endif