aboutsummaryrefslogtreecommitdiffhomepage
path: root/include/core
diff options
context:
space:
mode:
authorGravatar mtklein <mtklein@chromium.org>2014-12-10 10:49:42 -0800
committerGravatar Commit bot <commit-bot@chromium.org>2014-12-10 10:49:42 -0800
commit59f939eda6b43e5367d2ca80806b51bc4709c554 (patch)
tree5075d0a3df38b8b853a4995f3c7fe0f4ea65800b /include/core
parentcc695fee81613dc92746c1c6bb27f45cfc6ce73e (diff)
Include SkTypes.h from SkDynamicAnnotations.h
This allows us to control SK_DYNAMIC_ANNOTATIONS_ENABLED by Sk*Config.h files. This is a no-op today, because we control it from the compiler command line. BUG=430815 Review URL: https://codereview.chromium.org/787003003
Diffstat (limited to 'include/core')
-rw-r--r--include/core/SkDynamicAnnotations.h3
1 files changed, 3 insertions, 0 deletions
diff --git a/include/core/SkDynamicAnnotations.h b/include/core/SkDynamicAnnotations.h
index 2775b38cec..af8bdb675f 100644
--- a/include/core/SkDynamicAnnotations.h
+++ b/include/core/SkDynamicAnnotations.h
@@ -8,6 +8,9 @@
#ifndef SkDynamicAnnotations_DEFINED
#define SkDynamicAnnotations_DEFINED
+// Make sure we see anything set via SkUserConfig.h (e.g. SK_DYNAMIC_ANNOTATIONS_ENABLED).
+#include "SkTypes.h"
+
// This file contains macros used to send out-of-band signals to dynamic instrumentation systems,
// namely thread sanitizer. This is a cut-down version of the full dynamic_annotations library with
// only the features used by Skia.