summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--ppapi/ppapi_shared_proxy.gypi1
-rw-r--r--ppapi/shared_impl/image_data_impl.cc2
-rw-r--r--skia/config/SkUserConfig.h4
-rw-r--r--skia/ext/google_logging.cc1
-rw-r--r--skia/ext/image_operations.h4
-rw-r--r--skia/ext/platform_canvas.h2
-rw-r--r--skia/ext/platform_device_win.h4
-rw-r--r--skia/ext/skia_utils_win.h4
-rw-r--r--skia/ext/vector_canvas.h2
-rw-r--r--skia/skia.gyp25
10 files changed, 37 insertions, 12 deletions
diff --git a/ppapi/ppapi_shared_proxy.gypi b/ppapi/ppapi_shared_proxy.gypi
index 0d2168c..84f92b5 100644
--- a/ppapi/ppapi_shared_proxy.gypi
+++ b/ppapi/ppapi_shared_proxy.gypi
@@ -10,6 +10,7 @@
'dependencies': [
'ppapi_c',
'../base/base.gyp:base',
+ '../skia/skia.gyp:skia',
'../third_party/icu/icu.gyp:icuuc',
],
'include_dirs': [
diff --git a/ppapi/shared_impl/image_data_impl.cc b/ppapi/shared_impl/image_data_impl.cc
index afdc512..9392927 100644
--- a/ppapi/shared_impl/image_data_impl.cc
+++ b/ppapi/shared_impl/image_data_impl.cc
@@ -4,7 +4,7 @@
#include "ppapi/shared_impl/image_data_impl.h"
-#include "skia/config/SkUserConfig.h"
+#include "third_party/skia/include/core/SkTypes.h"
namespace pp {
namespace shared_impl {
diff --git a/skia/config/SkUserConfig.h b/skia/config/SkUserConfig.h
index ae8015d..d9746b7 100644
--- a/skia/config/SkUserConfig.h
+++ b/skia/config/SkUserConfig.h
@@ -143,8 +143,8 @@
// Log the file and line number for assertions.
#define SkDebugf(...) SkDebugf_FileLine(__FILE__, __LINE__, false, __VA_ARGS__)
-void SkDebugf_FileLine(const char* file, int line, bool fatal,
- const char* format, ...);
+SK_API void SkDebugf_FileLine(const char* file, int line, bool fatal,
+ const char* format, ...);
// Marking the debug print as "fatal" will cause a debug break, so we don't need
// a separate crash call here.
diff --git a/skia/ext/google_logging.cc b/skia/ext/google_logging.cc
index aec809e..b9d8b3a 100644
--- a/skia/ext/google_logging.cc
+++ b/skia/ext/google_logging.cc
@@ -8,6 +8,7 @@
#include "base/logging.h"
#include "base/stringprintf.h"
+#include "third_party/skia/include/core/SkTypes.h"
void SkDebugf_FileLine(const char* file, int line, bool fatal,
const char* format, ...) {
diff --git a/skia/ext/image_operations.h b/skia/ext/image_operations.h
index 07e8b6d..11a8639 100644
--- a/skia/ext/image_operations.h
+++ b/skia/ext/image_operations.h
@@ -6,12 +6,14 @@
#define SKIA_EXT_IMAGE_OPERATIONS_H_
#pragma once
+#include "third_party/skia/include/core/SkTypes.h"
+
class SkBitmap;
struct SkIRect;
namespace skia {
-class ImageOperations {
+class SK_API ImageOperations {
public:
enum ResizeMethod {
//
diff --git a/skia/ext/platform_canvas.h b/skia/ext/platform_canvas.h
index fd65fc0..49d0e21 100644
--- a/skia/ext/platform_canvas.h
+++ b/skia/ext/platform_canvas.h
@@ -16,7 +16,7 @@ namespace skia {
// This class is a specialization of the regular SkCanvas that is designed to
// work with a PlatformDevice to manage platform-specific drawing. It allows
// using both Skia operations and platform-specific operations.
-class PlatformCanvas : public SkCanvas {
+class SK_API PlatformCanvas : public SkCanvas {
public:
// If you use the version with no arguments, you MUST call initialize()
PlatformCanvas();
diff --git a/skia/ext/platform_device_win.h b/skia/ext/platform_device_win.h
index 86f3495f..425f944 100644
--- a/skia/ext/platform_device_win.h
+++ b/skia/ext/platform_device_win.h
@@ -10,7 +10,7 @@
#include <vector>
-#include "SkDevice.h"
+#include "third_party/skia/include/core/SkDevice.h"
class SkMatrix;
class SkPath;
@@ -23,7 +23,7 @@ namespace skia {
// to. It also provides functionality to play well with GDI drawing functions.
// This class is abstract and must be subclassed. It provides the basic
// interface to implement it either with or without a bitmap backend.
-class PlatformDevice : public SkDevice {
+class SK_API PlatformDevice : public SkDevice {
public:
typedef HDC PlatformSurface;
diff --git a/skia/ext/skia_utils_win.h b/skia/ext/skia_utils_win.h
index 3af4e06..bc26060 100644
--- a/skia/ext/skia_utils_win.h
+++ b/skia/ext/skia_utils_win.h
@@ -39,10 +39,10 @@ inline const RECT& SkIRectToRECT(const SkIRect& rect) {
}
// Converts COLORREFs (0BGR) to the ARGB layout Skia expects.
-SkColor COLORREFToSkColor(COLORREF color);
+SK_API SkColor COLORREFToSkColor(COLORREF color);
// Converts ARGB to COLORREFs (0BGR).
-COLORREF SkColorToCOLORREF(SkColor color);
+SK_API COLORREF SkColorToCOLORREF(SkColor color);
} // namespace skia
diff --git a/skia/ext/vector_canvas.h b/skia/ext/vector_canvas.h
index db098c7..4f8bc7a 100644
--- a/skia/ext/vector_canvas.h
+++ b/skia/ext/vector_canvas.h
@@ -19,7 +19,7 @@ namespace skia {
// to work with a VectorDevice to manage platform-specific drawing. It allows
// using both Skia operations and platform-specific operations. It *doesn't*
// support reading back from the bitmap backstore since it is not used.
-class VectorCanvas : public PlatformCanvas {
+class SK_API VectorCanvas : public PlatformCanvas {
public:
VectorCanvas();
explicit VectorCanvas(SkDeviceFactory* factory);
diff --git a/skia/skia.gyp b/skia/skia.gyp
index 3824585..a34bd28 100644
--- a/skia/skia.gyp
+++ b/skia/skia.gyp
@@ -6,7 +6,7 @@
'targets': [
{
'target_name': 'skia',
- 'type': '<(library)',
+ 'type': '<(component)',
'msvs_guid': 'CD9CA56E-4E94-444C-87D4-58CA1E6F300D',
'sources': [
'../third_party/skia/gpu/src/GrAllocPool.cpp',
@@ -54,6 +54,8 @@
'../third_party/skia/gpu/include/GrGLConfig.h',
'../third_party/skia/gpu/include/GrGLConfig_chrome.h',
'../third_party/skia/gpu/include/GrGLIndexBuffer.h',
+ '../third_party/skia/gpu/include/GrGLInterface.h',
+ '../third_party/skia/gpu/include/GrGLPlatformIncludes.h',
'../third_party/skia/gpu/include/GrGLTexture.h',
'../third_party/skia/gpu/include/GrGLVertexBuffer.h',
'../third_party/skia/gpu/include/GrGlyph.h',
@@ -249,12 +251,13 @@
#'../third_party/skia/src/animator/SkTextOnPath.h',
#'../third_party/skia/src/animator/SkTextToPath.cpp',
#'../third_party/skia/src/animator/SkTextToPath.h',
- #'../third_party/skia/src/animator/SkTime.cpp',
#'../third_party/skia/src/animator/SkTypedArray.cpp',
#'../third_party/skia/src/animator/SkTypedArray.h',
#'../third_party/skia/src/animator/SkXMLAnimatorWriter.cpp',
#'../third_party/skia/src/animator/SkXMLAnimatorWriter.h',
+ '../third_party/skia/src/animator/SkTime.cpp',
+
'../third_party/skia/src/core/ARGB32_Clamp_Bilinear_BitmapShader.h',
'../third_party/skia/src/core/Sk64.cpp',
'../third_party/skia/src/core/SkAdvancedTypefaceMetrics.cpp',
@@ -764,6 +767,24 @@
'config/win',
],
},],
+ ['OS=="win" and component=="shared_library"', {
+ 'defines': [
+ 'SKIA_DLL',
+ 'SKIA_IMPLEMENTATION=1',
+ ],
+ 'dependencies': [
+ '../base/base.gyp:base',
+ '../gpu/gpu.gyp:gles2_c_lib',
+ '../gpu/gpu.gyp:gles2_implementation',
+ '../gpu/gpu.gyp:command_buffer_client',
+ '../gpu/gpu.gyp:command_buffer_common',
+ ],
+ 'direct_dependent_settings': {
+ 'defines': [
+ 'SKIA_DLL',
+ ],
+ },
+ },],
],
'dependencies': [
'skia_opts'
generated by cgit v1.1 at 2025-01-18 05:09:38 +0000