diff options
| author |  djsollen <djsollen@google.com> | 2016-04-27 13:37:23 -0700 |
|---|---|---|
| committer |  Commit bot <commit-bot@chromium.org> | 2016-04-27 13:37:23 -0700 |
| commit | 48d6f88479e72efaf9b9d8f9c0769acb1ba773db (patch) | |
| tree | f18ff1170d5b1ded3c666cd550f58b9a803f026a /include | |
| parent | 2f1c42e8448bbbadeb3df1c626faa90aa33f8907 (diff) | |
Repurpose Release_Developer BUILDTYPE and remove SK_DEVELOPER.
The Release_Developer build type is now used to build Skia with
release level optimizations but still enable SK_DEBUG. This in turn
means that SkASSERTS and SkRTConf are available in this mode.
Further we can then remove SK_DEVELOPER as a define as it is true
iff SK_DEBUG is true.
GOLD_TRYBOT_URL= https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&issue=1927583002
DOCS_PREVIEW= https://skia.org/?cl=1927583002
Review-Url: https://codereview.chromium.org/1927583002
Diffstat (limited to 'include')
| -rw-r--r-- | include/core/SkClipStack.h | 4 | ||||
| -rw-r--r-- | include/core/SkTypes.h | 6 | ||||
| -rw-r--r-- | include/gpu/GrConfig.h | 4 | ||||
| -rw-r--r-- | include/utils/SkDumpCanvas.h | 2 | ||||
| -rw-r--r-- | include/utils/SkRTConf.h | 2 |
5 files changed, 6 insertions, 12 deletions
diff --git a/include/core/SkClipStack.h b/include/core/SkClipStack.h index 973f70a42b..3156941125 100644 --- a/include/core/SkClipStack.h +++ b/include/core/SkClipStack.h @@ -170,7 +170,7 @@ public: */ void replay(SkCanvasClipVisitor*) const; -#ifdef SK_DEVELOPER +#ifdef SK_DEBUG /** * Dumps the element to SkDebugf. This is intended for Skia development debugging * Don't rely on the existence of this function or the formatting of its output. @@ -353,7 +353,7 @@ public: int32_t getTopmostGenID() const; -#ifdef SK_DEVELOPER +#ifdef SK_DEBUG /** * Dumps the contents of the clip stack to SkDebugf. This is intended for Skia development * debugging. Don't rely on the existence of this function or the formatting of its output. diff --git a/include/core/SkTypes.h b/include/core/SkTypes.h index a94a59233f..f9d0c533d3 100644 --- a/include/core/SkTypes.h +++ b/include/core/SkTypes.h @@ -161,12 +161,6 @@ inline void operator delete(void* p) { // and if it's true the assert passes; if it's false, we'll print the message and the assert fails. #define SkASSERTF(cond, fmt, ...) SkASSERT((cond) || (SkDebugf(fmt"\n", __VA_ARGS__), false)) -#ifdef SK_DEVELOPER - #define SkDEVCODE(code) code -#else - #define SkDEVCODE(code) -#endif - #ifdef SK_IGNORE_TO_STRING #define SK_TO_STRING_NONVIRT() #define SK_TO_STRING_VIRT() diff --git a/include/gpu/GrConfig.h b/include/gpu/GrConfig.h index 8e0efbd472..acdff3af2b 100644 --- a/include/gpu/GrConfig.h +++ b/include/gpu/GrConfig.h @@ -33,7 +33,7 @@ */ #if !defined(GR_CACHE_STATS) - #if defined(SK_DEVELOPER) || defined(SK_DEBUG) || defined(SK_DUMP_STATS) + #if defined(SK_DEBUG) || defined(SK_DUMP_STATS) #define GR_CACHE_STATS 1 #else #define GR_CACHE_STATS 0 @@ -41,7 +41,7 @@ #endif #if !defined(GR_GPU_STATS) - #if defined(SK_DEVELOPER) || defined(SK_DEBUG) || defined(SK_DUMP_STATS) + #if defined(SK_DEBUG) || defined(SK_DUMP_STATS) #define GR_GPU_STATS 1 #else #define GR_GPU_STATS 0 diff --git a/include/utils/SkDumpCanvas.h b/include/utils/SkDumpCanvas.h index 1c16bf3f03..2cf37c3b8c 100644 --- a/include/utils/SkDumpCanvas.h +++ b/include/utils/SkDumpCanvas.h @@ -10,7 +10,7 @@ #include "SkCanvas.h" -#ifdef SK_DEVELOPER +#ifdef SK_DEBUG /** This class overrides all the draw methods on SkCanvas, and formats them as text, and then sends that to a Dumper helper object. diff --git a/include/utils/SkRTConf.h b/include/utils/SkRTConf.h index c3e97ef5e3..d80e418419 100644 --- a/include/utils/SkRTConf.h +++ b/include/utils/SkRTConf.h @@ -49,7 +49,7 @@ protected: SkString fDescription; }; -#ifdef SK_DEVELOPER +#ifdef SK_DEBUG #define SK_CONF_DECLARE(confType, varName, confName, defaultValue, description) static SkRTConf<confType> varName(confName, defaultValue, description) #define SK_CONF_SET(confname, value) \ skRTConfRegistry().set(confname, value, true) |