aboutsummaryrefslogtreecommitdiffhomepage
path: root/include
diff options
context:
space:
mode:
authorGravatar Derek Sollenberger <djsollen@google.com>2017-09-20 15:51:08 -0400
committerGravatar Skia Commit-Bot <skia-commit-bot@chromium.org>2017-09-21 18:14:36 +0000
commit2fbf1bc8c96f749a4c098bcfc827053445c2e12d (patch)
tree0271e86a08bec62b58b71d661c86bc0af325488e /include
parentf4b9bf7d9e688f1afedcf4a960a31582ddb56f4a (diff)
Add SK_API to APIs used by the android framework.
This CL enables us to set the default visibility of the symbols on Android to hidden. It is the intent that all of he SK_APIs that have been added to /src directies should be removed as soon as we can remove their callers within Android. Bug: b/31971097 Change-Id: Ic787f94df0fb0c2b8d941aa7095a12b317c4b5de Reviewed-on: https://skia-review.googlesource.com/49501 Reviewed-by: Mike Reed <reed@google.com> Commit-Queue: Derek Sollenberger <djsollen@google.com>
Diffstat (limited to 'include')
-rw-r--r--include/android/SkBitmapRegionDecoder.h2
-rw-r--r--include/codec/SkAndroidCodec.h2
-rw-r--r--include/core/SkColor.h2
-rw-r--r--include/core/SkDrawable.h2
-rw-r--r--include/core/SkVertices.h2
-rw-r--r--include/effects/SkBlurDrawLooper.h2
-rw-r--r--include/utils/SkCamera.h2
-rw-r--r--include/utils/SkFrontBufferedStream.h2
-rw-r--r--include/utils/SkInterpolator.h4
-rw-r--r--include/utils/SkShadowUtils.h2
10 files changed, 11 insertions, 11 deletions
diff --git a/include/android/SkBitmapRegionDecoder.h b/include/android/SkBitmapRegionDecoder.h
index c41d11247b..b5a4c813bb 100644
--- a/include/android/SkBitmapRegionDecoder.h
+++ b/include/android/SkBitmapRegionDecoder.h
@@ -17,7 +17,7 @@
* This class aims to provide an interface to test multiple implementations of
* SkBitmapRegionDecoder.
*/
-class SkBitmapRegionDecoder {
+class SK_API SkBitmapRegionDecoder {
public:
enum Strategy {
diff --git a/include/codec/SkAndroidCodec.h b/include/codec/SkAndroidCodec.h
index cc93bf18c4..8dfa8ba5fe 100644
--- a/include/codec/SkAndroidCodec.h
+++ b/include/codec/SkAndroidCodec.h
@@ -17,7 +17,7 @@
* Abstract interface defining image codec functionality that is necessary for
* Android.
*/
-class SkAndroidCodec : SkNoncopyable {
+class SK_API SkAndroidCodec : SkNoncopyable {
public:
/**
* If this stream represents an encoded image that we know how to decode,
diff --git a/include/core/SkColor.h b/include/core/SkColor.h
index 8197408739..c8c6a6acf3 100644
--- a/include/core/SkColor.h
+++ b/include/core/SkColor.h
@@ -175,7 +175,7 @@ struct SkPM4f;
/*
* The float values are 0...1 unpremultiplied
*/
-struct SkColor4f {
+struct SK_API SkColor4f {
float fR;
float fG;
float fB;
diff --git a/include/core/SkDrawable.h b/include/core/SkDrawable.h
index f466d0a59c..6b9bf7ee34 100644
--- a/include/core/SkDrawable.h
+++ b/include/core/SkDrawable.h
@@ -23,7 +23,7 @@ struct SkRect;
* allow for clients of the drawable that may want to cache the results, the drawable must
* change its generation ID whenever its internal state changes such that it will draw differently.
*/
-class SkDrawable : public SkFlattenable {
+class SK_API SkDrawable : public SkFlattenable {
public:
SkDrawable();
diff --git a/include/core/SkVertices.h b/include/core/SkVertices.h
index a245c18502..13aab5b3a8 100644
--- a/include/core/SkVertices.h
+++ b/include/core/SkVertices.h
@@ -17,7 +17,7 @@
/**
* An immutable set of vertex data that can be used with SkCanvas::drawVertices.
*/
-class SkVertices : public SkNVRefCnt<SkVertices> {
+class SK_API SkVertices : public SkNVRefCnt<SkVertices> {
public:
enum VertexMode {
kTriangles_VertexMode,
diff --git a/include/effects/SkBlurDrawLooper.h b/include/effects/SkBlurDrawLooper.h
index 45289c8941..08e77666b9 100644
--- a/include/effects/SkBlurDrawLooper.h
+++ b/include/effects/SkBlurDrawLooper.h
@@ -16,7 +16,7 @@
* its original position.
*/
namespace SkBlurDrawLooper {
- sk_sp<SkDrawLooper> Make(SkColor color, SkScalar sigma, SkScalar dx, SkScalar dy);
+ sk_sp<SkDrawLooper> SK_API Make(SkColor color, SkScalar sigma, SkScalar dx, SkScalar dy);
};
#endif
diff --git a/include/utils/SkCamera.h b/include/utils/SkCamera.h
index 911ff15031..db7235f0b8 100644
--- a/include/utils/SkCamera.h
+++ b/include/utils/SkCamera.h
@@ -115,7 +115,7 @@ private:
void doUpdate() const;
};
-class Sk3DView : SkNoncopyable {
+class SK_API Sk3DView : SkNoncopyable {
public:
Sk3DView();
~Sk3DView();
diff --git a/include/utils/SkFrontBufferedStream.h b/include/utils/SkFrontBufferedStream.h
index 228c6cbab1..e504dc5da6 100644
--- a/include/utils/SkFrontBufferedStream.h
+++ b/include/utils/SkFrontBufferedStream.h
@@ -19,7 +19,7 @@
* X bytes (inclusive), and the wrapped stream is not necessarily
* able to rewind at all.
*/
-class SkFrontBufferedStream {
+class SK_API SkFrontBufferedStream {
public:
/**
* Creates a new stream that wraps and buffers an SkStream.
diff --git a/include/utils/SkInterpolator.h b/include/utils/SkInterpolator.h
index 61e652519a..31d50eeac7 100644
--- a/include/utils/SkInterpolator.h
+++ b/include/utils/SkInterpolator.h
@@ -12,7 +12,7 @@
#include "SkScalar.h"
-class SkInterpolatorBase : SkNoncopyable {
+class SK_API SkInterpolatorBase : SkNoncopyable {
public:
enum Result {
kNormal_Result,
@@ -84,7 +84,7 @@ protected:
#endif
};
-class SkInterpolator : public SkInterpolatorBase {
+class SK_API SkInterpolator : public SkInterpolatorBase {
public:
SkInterpolator();
SkInterpolator(int elemCount, int frameCount);
diff --git a/include/utils/SkShadowUtils.h b/include/utils/SkShadowUtils.h
index 659908961a..c362488f15 100644
--- a/include/utils/SkShadowUtils.h
+++ b/include/utils/SkShadowUtils.h
@@ -17,7 +17,7 @@ class SkCanvas;
class SkPath;
class SkResourceCache;
-class SkShadowUtils {
+class SK_API SkShadowUtils {
public:
/**
* Draw an offset spot shadow and outlining ambient shadow for the given path using a disc