From d28063e4916b489f572eb8358efcb7305f88c2fd Mon Sep 17 00:00:00 2001 From: "commit-bot@chromium.org" Date: Tue, 20 Aug 2013 12:23:06 +0000 Subject: [PATCH] Replace uses of GR_API by SK_API. R=bsalomon@google.com, robertphillips@google.com Author: tfarina@chromium.org Review URL: https://chromiumcodereview.appspot.com/22881005 git-svn-id: http://skia.googlecode.com/svn/trunk@10808 2bbb7eff-a529-9590-31e7-b0007b416f81 --- Makefile.old | 2 -- gyp/common_conditions.gypi | 4 ---- gyp/gpu.gyp | 3 --- include/gpu/GrConfig.h | 30 ------------------------------ include/gpu/GrContext.h | 2 +- include/gpu/GrNoncopyable.h | 4 +--- include/gpu/gl/GrGLInterface.h | 2 +- src/gpu/GrDefaultPathRenderer.h | 2 +- src/gpu/GrPathRenderer.h | 3 +-- 9 files changed, 5 insertions(+), 47 deletions(-) diff --git a/Makefile.old b/Makefile.old index c78c101..47029c4 100644 --- a/Makefile.old +++ b/Makefile.old @@ -33,8 +33,6 @@ else DEFINES += -DSK_RELEASE -DGR_DEBUG=0 endif -DEFINES += -DGR_IMPLEMENTATION=1 - ifneq ($(SKIA_PDF_SUPPORT),false) DEFINES += -DSK_SUPPORT_PDF DEFINES += -DSK_ZLIB_INCLUDE="" diff --git a/gyp/common_conditions.gypi b/gyp/common_conditions.gypi index aa08fa8..a420537 100644 --- a/gyp/common_conditions.gypi +++ b/gyp/common_conditions.gypi @@ -229,8 +229,6 @@ '-fPIC', ], 'defines': [ - 'GR_DLL=1', - 'GR_IMPLEMENTATION=1', 'SKIA_DLL', 'SKIA_IMPLEMENTATION=1', ], @@ -456,8 +454,6 @@ '-fPIC', ], 'defines': [ - 'GR_DLL=1', - 'GR_IMPLEMENTATION=1', 'SKIA_DLL', 'SKIA_IMPLEMENTATION=1', ], diff --git a/gyp/gpu.gyp b/gyp/gpu.gyp index df82cda..7e74bad 100644 --- a/gyp/gpu.gyp +++ b/gyp/gpu.gyp @@ -146,9 +146,6 @@ '<@(skgpu_null_gl_sources)', 'gpu.gypi', # Makes the gypi appear in IDEs (but does not modify the build). ], - 'defines': [ - 'GR_IMPLEMENTATION=1', - ], 'conditions': [ [ 'skia_nv_path_rendering', { 'defines': [ diff --git a/include/gpu/GrConfig.h b/include/gpu/GrConfig.h index df53fa2..d47ccb3 100644 --- a/include/gpu/GrConfig.h +++ b/include/gpu/GrConfig.h @@ -157,36 +157,6 @@ typedef unsigned __int64 uint64_t; // postconfig section: // -// GR_IMPLEMENTATION should be define to 1 when building Gr and 0 when including -// it in another dependent build. The Gr makefile/ide-project should define this -// to 1. -#if !defined(GR_IMPLEMENTATION) - #define GR_IMPLEMENTATION 0 -#endif - -// If Gr is built as a shared library then GR_DLL should be defined to 1 (both -// when building Gr and when including its headers in dependent builds). Only -// currently supported minimally for Chrome's Win32 Multi-DLL build (TODO: -// correctly exort all of the public API correctly and support shared lib on -// other platforms). -#if !defined(GR_DLL) - #define GR_DLL 0 -#endif - -#if GR_DLL - #if GR_WIN32_BUILD - #if GR_IMPLEMENTATION - #define GR_API __declspec(dllexport) - #else - #define GR_API __declspec(dllimport) - #endif - #else - #define GR_API __attribute__((visibility("default"))) - #endif -#else - #define GR_API -#endif - // By now we must have a GR_..._BUILD symbol set to 1, and a decision about // debug -vs- release // diff --git a/include/gpu/GrContext.h b/include/gpu/GrContext.h index 414d2fa..ab38709 100644 --- a/include/gpu/GrContext.h +++ b/include/gpu/GrContext.h @@ -39,7 +39,7 @@ class GrVertexBufferAllocPool; class GrSoftwarePathRenderer; class SkStrokeRec; -class GR_API GrContext : public GrRefCnt { +class SK_API GrContext : public GrRefCnt { public: SK_DECLARE_INST_COUNT(GrContext) diff --git a/include/gpu/GrNoncopyable.h b/include/gpu/GrNoncopyable.h index 3d47170..d35f8d7 100644 --- a/include/gpu/GrNoncopyable.h +++ b/include/gpu/GrNoncopyable.h @@ -6,8 +6,6 @@ * found in the LICENSE file. */ - - #ifndef GrNoncopyable_DEFINED #define GrNoncopyable_DEFINED @@ -17,7 +15,7 @@ * Base for classes that want to disallow copying themselves. It makes its * copy-constructor and assignment operators private (and unimplemented). */ -class GR_API GrNoncopyable { +class SK_API GrNoncopyable { public: GrNoncopyable() {} diff --git a/include/gpu/gl/GrGLInterface.h b/include/gpu/gl/GrGLInterface.h index 852b4bd..3b388f5 100644 --- a/include/gpu/gl/GrGLInterface.h +++ b/include/gpu/gl/GrGLInterface.h @@ -110,7 +110,7 @@ typedef intptr_t GrGLInterfaceCallbackData; * non-NULL or GrContext creation will fail. This can be tested with the * validate() method when the OpenGL context has been made current. */ -struct GR_API GrGLInterface : public GrRefCnt { +struct SK_API GrGLInterface : public GrRefCnt { private: // simple wrapper class that exists only to initialize a pointer to NULL template class GLPtr { diff --git a/src/gpu/GrDefaultPathRenderer.h b/src/gpu/GrDefaultPathRenderer.h index e602fae..c60afcc 100644 --- a/src/gpu/GrDefaultPathRenderer.h +++ b/src/gpu/GrDefaultPathRenderer.h @@ -15,7 +15,7 @@ * Subclass that renders the path using the stencil buffer to resolve fill rules * (e.g. winding, even-odd) */ -class GR_API GrDefaultPathRenderer : public GrPathRenderer { +class SK_API GrDefaultPathRenderer : public GrPathRenderer { public: GrDefaultPathRenderer(bool separateStencilSupport, bool stencilWrapOpsSupport); diff --git a/src/gpu/GrPathRenderer.h b/src/gpu/GrPathRenderer.h index 27fbb3d..c49dd48 100644 --- a/src/gpu/GrPathRenderer.h +++ b/src/gpu/GrPathRenderer.h @@ -6,7 +6,6 @@ * found in the LICENSE file. */ - #ifndef GrPathRenderer_DEFINED #define GrPathRenderer_DEFINED @@ -28,7 +27,7 @@ struct GrPoint; * stages before GrPaint::kTotalStages are reserved for setting up the draw (i.e., textures and * filter masks). */ -class GR_API GrPathRenderer : public GrRefCnt { +class SK_API GrPathRenderer : public GrRefCnt { public: SK_DECLARE_INST_COUNT(GrPathRenderer) -- 2.7.4