diff options
| author |  Mike Klein <mtklein@chromium.org> | 2017-12-19 09:09:33 -0500 |
|---|---|---|
| committer |  Skia Commit-Bot <skia-commit-bot@chromium.org> | 2017-12-19 14:42:16 +0000 |
| commit | 6613cc5186c200e053c5df9bd8f051ffba6e3564 (patch) | |
| tree | 1c7533d9f63a7a1805a96d8eb37bebf87ffc614f /include | |
| parent | 84bfc9589878a95c2a017698398f153a53e54412 (diff) | |
GOOGLE3 -> SK_BUILD_FOR_GOOGLE3
This is more consistent with our other SK_BUILD_FOR_... macros,
and less likely to collide with other preprocessor logic.
(Luckily, this was defined in public.bzl, so we can do this
all in one CL in the Skia repo.)
Change-Id: I5f232888288c9c53fad445545d983d0fb0b4add8
Reviewed-on: https://skia-review.googlesource.com/86940
Reviewed-by: Mike Klein <mtklein@chromium.org>
Commit-Queue: Mike Klein <mtklein@chromium.org>
Diffstat (limited to 'include')
| -rw-r--r-- | include/core/SkEncodedImageFormat.h | 2 | ||||
| -rw-r--r-- | include/core/SkPostConfig.h | 2 | ||||
| -rw-r--r-- | include/core/SkRefCnt.h | 2 | ||||
| -rw-r--r-- | include/private/SkTemplates.h | 8 |
4 files changed, 7 insertions, 7 deletions
diff --git a/include/core/SkEncodedImageFormat.h b/include/core/SkEncodedImageFormat.h index c391053739..d0a9e5e0ca 100644 --- a/include/core/SkEncodedImageFormat.h +++ b/include/core/SkEncodedImageFormat.h @@ -14,7 +14,7 @@ * Enum describing format of encoded data. */ enum class SkEncodedImageFormat { -#ifdef GOOGLE3 +#ifdef SK_BUILD_FOR_GOOGLE3 kUnknown, #endif kBMP, diff --git a/include/core/SkPostConfig.h b/include/core/SkPostConfig.h index ecfcdd5bbf..61296e868d 100644 --- a/include/core/SkPostConfig.h +++ b/include/core/SkPostConfig.h @@ -129,7 +129,7 @@ # #endif -#if defined(GOOGLE3) +#if defined(SK_BUILD_FOR_GOOGLE3) void SkDebugfForDumpStackTrace(const char* data, void* unused); void DumpStackTrace(int skip_count, void w(const char*, void*), void* arg); # define SK_DUMP_GOOGLE3_STACK() DumpStackTrace(0, SkDebugfForDumpStackTrace, nullptr) diff --git a/include/core/SkRefCnt.h b/include/core/SkRefCnt.h index 7b12f6a6e1..01580abe1a 100644 --- a/include/core/SkRefCnt.h +++ b/include/core/SkRefCnt.h @@ -124,7 +124,7 @@ private: #else class SK_API SkRefCnt : public SkRefCntBase { // "#include SK_REF_CNT_MIXIN_INCLUDE" doesn't work with this build system. - #if defined(GOOGLE3) + #if defined(SK_BUILD_FOR_GOOGLE3) public: void deref() const { this->unref(); } #endif diff --git a/include/private/SkTemplates.h b/include/private/SkTemplates.h index efe2ed306b..8a605fbd02 100644 --- a/include/private/SkTemplates.h +++ b/include/private/SkTemplates.h @@ -221,8 +221,8 @@ public: } private: -#if defined(GOOGLE3) - // Stack frame size is limited for GOOGLE3. 4k is less than the actual max, but some functions +#if defined(SK_BUILD_FOR_GOOGLE3) + // Stack frame size is limited for SK_BUILD_FOR_GOOGLE3. 4k is less than the actual max, but some functions // have multiple large stack allocations. static const int kMaxBytes = 4 * 1024; static const int kCount = kCountRequested * sizeof(T) > kMaxBytes @@ -390,8 +390,8 @@ public: private: // Since we use uint32_t storage, we might be able to get more elements for free. static const size_t kCountWithPadding = SkAlign4(kCountRequested*sizeof(T)) / sizeof(T); -#if defined(GOOGLE3) - // Stack frame size is limited for GOOGLE3. 4k is less than the actual max, but some functions +#if defined(SK_BUILD_FOR_GOOGLE3) + // Stack frame size is limited for SK_BUILD_FOR_GOOGLE3. 4k is less than the actual max, but some functions // have multiple large stack allocations. static const size_t kMaxBytes = 4 * 1024; static const size_t kCount = kCountRequested * sizeof(T) > kMaxBytes |