commit d28063e4916b489f572eb8358efcb7305f88c2fd
author commit-bot@chromium.org <commit-bot@chromium.org@2bbb7eff-a529-9590-31e7-b0007b416f81> Tue Aug 20 12:23:06 2013 +0000
committer commit-bot@chromium.org <commit-bot@chromium.org@2bbb7eff-a529-9590-31e7-b0007b416f81> Tue Aug 20 12:23:06 2013 +0000
tree 4f9b61988b56e6920d4df1e6149b187455f85bf5
parent a61ba109bf1a60c6de8f9ebea043e782497b88cc

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

include/gpu/GrConfig.h

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 @@
 // 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
 //

include/gpu/GrContext.h

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 GrSoftwarePathRenderer;
 class SkStrokeRec;
 
-class GR_API GrContext : public GrRefCnt {
+class SK_API GrContext : public GrRefCnt {
 public:
     SK_DECLARE_INST_COUNT(GrContext)
 

include/gpu/GrNoncopyable.h

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() {}
 

include/gpu/gl/GrGLInterface.h

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 @@
  * 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 <typename FNPTR_TYPE> class GLPtr {