diff options
| author |  commit-bot@chromium.org <commit-bot@chromium.org@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2014-03-20 20:00:24 +0000 |
|---|---|---|
| committer | commit-bot@chromium.org <commit-bot@chromium.org@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2014-03-20 20:00:24 +0000 |
| commit | 933e65d914eb86b1fbbf8ea9cf1da58ac7c42500 (patch) | |
| tree | 025ed972e8b352631884e052a5f4c8fc8e115733 /include | |
| parent | 7225506621e7102e8c3c5b4c9f29ac20851bc25a (diff) | |
replace old SK_TRACE_EVENT macros with new TRACE_EVENT ones, and then remove them entirely!
BUG=skia:353
R=tomhudson@google.com, epoger@google.com, reed@google.com, egdaniel@google.com, bsalomon@google.com
Author: humper@google.com
Review URL: https://codereview.chromium.org/196133033
git-svn-id: http://skia.googlecode.com/svn/trunk@13884 2bbb7eff-a529-9590-31e7-b0007b416f81
Diffstat (limited to 'include')
| -rw-r--r-- | include/config/SkUserConfig.h | 12 | ||||
| -rw-r--r-- | include/core/SkTrace.h | 45 |
2 files changed, 0 insertions, 57 deletions
diff --git a/include/config/SkUserConfig.h b/include/config/SkUserConfig.h index ec791d9a50..81033f3fa5 100644 --- a/include/config/SkUserConfig.h +++ b/include/config/SkUserConfig.h @@ -139,18 +139,6 @@ //#define SK_SUPPORT_UNITTEST #endif -/* If your system embeds skia and has complex event logging, define this - symbol to name a file that maps the following macros to your system's - equivalents: - SK_TRACE_EVENT0(event) - SK_TRACE_EVENT1(event, name1, value1) - SK_TRACE_EVENT2(event, name1, value1, name2, value2) - src/utils/SkDebugTrace.h has a trivial implementation that writes to - the debug output stream. If SK_USER_TRACE_INCLUDE_FILE is not defined, - SkTrace.h will define the above three macros to do nothing. -*/ -//#undef SK_USER_TRACE_INCLUDE_FILE - /* Change the ordering to work in X windows. */ #ifdef SK_SAMPLES_FOR_X diff --git a/include/core/SkTrace.h b/include/core/SkTrace.h deleted file mode 100644 index e6e7e2ccae..0000000000 --- a/include/core/SkTrace.h +++ /dev/null @@ -1,45 +0,0 @@ - -/* - * Copyright 2011 Google Inc. - * - * Use of this source code is governed by a BSD-style license that can be - * found in the LICENSE file. - */ - -#ifndef SkTrace_DEFINED -#define SkTrace_DEFINED - -#ifdef SK_USER_TRACE_INCLUDE_FILE - -/* If your system embeds skia and has complex event logging, in - src/config/SkUserConfig.h: - - define the three SK_TRACE_EVENT macros to map to your system's - equivalents, - - define the name of the include file in SK_USER_TRACE_INCLUDE_FILE - A trivial example is given in src/utils/SkDebugTrace.h. - - All arguments are const char*. Skia typically passes the name of - the object and function (and sometimes region of interest within - the function) separated by double colons for 'event'. - - SK_TRACE_EVENT1 and SK_TRACE_EVENT2 take one or two arbitrary - name-value pairs that you also want to log. SkStringPrintf() is useful - for formatting these values. - - For example: - SK_TRACE_EVENT0("GrContext::createAndLockTexture"); - SK_TRACE_EVENT1("GrDefaultPathRenderer::onDrawPath::renderPasses", - "verts", SkStringPrintf("%i", vert - base).c_str()); -*/ - - #include SK_USER_TRACE_INCLUDE_FILE - -#else - - #define SK_TRACE_EVENT0(event) - #define SK_TRACE_EVENT1(event, name1, value1) - #define SK_TRACE_EVENT2(event, name1, value1, name2, value2) - -#endif - -#endif |