linux components: tag exported Skia functions with SK_API

When we build libskia as a component, we need to mark the functions
we use from outside of Skia.

Review URL: http://codereview.chromium.org/6905077

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@83413 0039d316-1c4b-4281-b951-d872f2087c98

5 files changed, 11 insertions, 6 deletions

diff --git a/skia/ext/SkFontHost_fontconfig.cpp b/skia/ext/SkFontHost_fontconfig.cpp
index e1153eb..688f3d0 100644
--- a/skia/ext/SkFontHost_fontconfig.cpp
+++ b/skia/ext/SkFontHost_fontconfig.cpp
@@ -33,6 +33,7 @@
 
 #include "SkFontHost.h"
 #include "SkStream.h"
+#include "SkFontHost_fontconfig_control.h"
 #include "SkFontHost_fontconfig_impl.h"
 #include "SkFontHost_fontconfig_direct.h"
 
diff --git a/skia/ext/SkFontHost_fontconfig_control.h b/skia/ext/SkFontHost_fontconfig_control.h
index 568320f..72d0371 100644
--- a/skia/ext/SkFontHost_fontconfig_control.h
+++ b/skia/ext/SkFontHost_fontconfig_control.h
@@ -19,10 +19,14 @@
 #define FontConfigControl_DEFINED
 #pragma once
 
+#include "SkPreConfig.h"
+
+class FontConfigInterface;
+
 // Sets the Skia FontHost to use the direct (non-IPC, requires filesystem
 // access) FontConfig implementation. Any previously-set FontConfigInterface
 // will be freed.
-void SkiaFontConfigUseDirectImplementation();
+SK_API void SkiaFontConfigUseDirectImplementation();
 
 // Sets the Skia FontHost to use the given implementation of FontConfig. This
 // is normally used to configure the IPC-based implementation to get out of
@@ -30,6 +34,6 @@ void SkiaFontConfigUseDirectImplementation();
 //
 // Ownership of the given pointer is transferred, and any previously-set
 // FontConfigInterface will be freed.
-void SkiaFontConfigSetImplementation(FontConfigInterface* font_config);
+SK_API void SkiaFontConfigSetImplementation(FontConfigInterface* font_config);
 
 #endif  // FontConfigControl_DEFINED
diff --git a/skia/ext/SkFontHost_fontconfig_direct.h b/skia/ext/SkFontHost_fontconfig_direct.h
index c4ffb6c..4f9fbf6 100644
--- a/skia/ext/SkFontHost_fontconfig_direct.h
+++ b/skia/ext/SkFontHost_fontconfig_direct.h
@@ -25,7 +25,7 @@
 #include "SkThread.h"
 #include "SkFontHost_fontconfig_impl.h"
 
-class FontConfigDirect : public FontConfigInterface {
+class SK_API FontConfigDirect : public FontConfigInterface {
  public:
   FontConfigDirect();
   virtual ~FontConfigDirect();
diff --git a/skia/ext/vector_platform_device_cairo_linux.h b/skia/ext/vector_platform_device_cairo_linux.h
index 64628ab..84dd734 100644
--- a/skia/ext/vector_platform_device_cairo_linux.h
+++ b/skia/ext/vector_platform_device_cairo_linux.h
@@ -14,7 +14,7 @@
 
 namespace skia {
 
-class VectorPlatformDeviceCairoFactory : public SkDeviceFactory {
+class SK_API VectorPlatformDeviceCairoFactory : public SkDeviceFactory {
  public:
   static PlatformDevice* CreateDevice(cairo_t* context, int width, int height,
                                       bool isOpaque);
@@ -30,7 +30,7 @@ class VectorPlatformDeviceCairoFactory : public SkDeviceFactory {
 // cooresponding Cairo APIs and outputs to a Cairo surface. Please NOTE that
 // since it is completely vectorial, the bitmap content in it is thus
 // meaningless.
-class VectorPlatformDeviceCairo : public PlatformDevice {
+class SK_API VectorPlatformDeviceCairo : public PlatformDevice {
  public:
   virtual ~VectorPlatformDeviceCairo();
 
diff --git a/skia/skia.gyp b/skia/skia.gyp
index 1b6edfa..a06a06f 100644
--- a/skia/skia.gyp
+++ b/skia/skia.gyp
@@ -813,7 +813,7 @@
             ],
           },
         },],
-        ['OS=="win" and component=="shared_library"', {
+        ['component=="shared_library"', {
           'defines': [
             'GR_DLL=1',
             'GR_IMPLEMENTATION=1',