diff options
| author | robertphillips@google.com <robertphillips@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-12-19 13:19:24 +0000 |
|---|---|---|
| committer | robertphillips@google.com <robertphillips@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-12-19 13:19:24 +0000 |
| commit | 98eea11e8a2c293c1841c00f787e0eff3c62fdfd (patch) | |
| tree | 4a0d9c91eb6f7cc827a0160e0e0423921105095b /skia/config | |
| parent | 870f557cb832e9ff5740329827c1da59fed7b765 (diff) | |
| download | chromium_src-98eea11e8a2c293c1841c00f787e0eff3c62fdfd.zip chromium_src-98eea11e8a2c293c1841c00f787e0eff3c62fdfd.tar.gz chromium_src-98eea11e8a2c293c1841c00f787e0eff3c62fdfd.tar.bz2 | |
Roll Skia DEPS to r12762
R=rmistry@google.com
Review URL: https://codereview.chromium.org/100133006
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@241848 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'skia/config')
| -rw-r--r-- | skia/config/SkUserConfig.h | 18 |
1 files changed, 18 insertions, 0 deletions
diff --git a/skia/config/SkUserConfig.h b/skia/config/SkUserConfig.h index d15882c..052c5c1 100644 --- a/skia/config/SkUserConfig.h +++ b/skia/config/SkUserConfig.h @@ -226,6 +226,24 @@ SK_API void SkDebugf_FileLine(const char* file, int line, bool fatal, // tracing. // #define SK_USER_TRACE_INCLUDE_FILE "skia/ext/skia_trace_shim.h" +#ifndef SK_ATOMICS_PLATFORM_H +# if defined(SK_BUILD_FOR_WIN) +# define SK_ATOMICS_PLATFORM_H "third_party/skia/src/ports/SkAtomics_win.h" +# elif defined(SK_BUILD_FOR_ANDROID_FRAMEWORK) +# define SK_ATOMICS_PLATFORM_H "third_party/skia/src/ports/SkAtomics_android.h" +# else +# define SK_ATOMICS_PLATFORM_H "third_party/skia/src/ports/SkAtomics_sync.h" +# endif +#endif + +#ifndef SK_MUTEX_PLATFORM_H +# if defined(SK_BUILD_FOR_WIN) +# define SK_MUTEX_PLATFORM_H "third_party/skia/src/ports/SkMutex_win.h" +# else +# define SK_MUTEX_PLATFORM_H "third_party/skia/src/ports/SkMutex_pthread.h" +# endif +#endif + // ===== End Chrome-specific definitions ===== #endif |