diff options
| author | alokp@chromium.org <alokp@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-04-21 15:38:52 +0000 |
|---|---|---|
| committer | alokp@chromium.org <alokp@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-04-21 15:38:52 +0000 |
| commit | 5587489cf4688fccbf21b8cbe7593b8ea6448b11 (patch) | |
| tree | 72dd7febeb77daf7579318f20478d7cdba155fd1 /gpu/command_buffer/common/logging.h | |
| parent | 836b3b307a796d3a5d44f5b6b3ade30a6dbdb4e2 (diff) | |
| download | chromium_src-5587489cf4688fccbf21b8cbe7593b8ea6448b11.zip chromium_src-5587489cf4688fccbf21b8cbe7593b8ea6448b11.tar.gz chromium_src-5587489cf4688fccbf21b8cbe7593b8ea6448b11.tar.bz2 | |
Added facility to stub log and check. It is still not ideal but workable.
Review URL: http://codereview.chromium.org/1697002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@45192 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'gpu/command_buffer/common/logging.h')
| -rw-r--r-- | gpu/command_buffer/common/logging.h | 28 |
1 files changed, 9 insertions, 19 deletions
diff --git a/gpu/command_buffer/common/logging.h b/gpu/command_buffer/common/logging.h index 83f3245..476fd79 100644 --- a/gpu/command_buffer/common/logging.h +++ b/gpu/command_buffer/common/logging.h @@ -2,30 +2,18 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -// This file abstracts differences in logging between NaCl and host -// environment. +// This file provides ability to stub LOG and CHECK. #ifndef GPU_COMMAND_BUFFER_COMMON_LOGGING_H_ #define GPU_COMMAND_BUFFER_COMMON_LOGGING_H_ -#ifndef __native_client__ -#if defined(TRUSTED_GPU_LIBRARY_BUILD) -// Turn off base/logging macros for the trusted library build. -// TODO(dspringer): remove this once building trusted plugins in the Native -// Client SDK is no longer needed. -#define OMIT_DLOG_AND_DCHECK 1 -#define GPU_LOG DLOG -#define GPU_CHECK DCHECK -#else -#define GPU_LOG LOG -#define GPU_CHECK CHECK -#endif // defined(TRUSTED_GPU_LIBRARY_BUILD) -#include "base/logging.h" -#else +#if defined(__native_client__) +#define STUB_LOG_AND_CHECK 1 +#endif // __native_client__ + +#if defined STUB_LOG_AND_CHECK #include <sstream> -#define GPU_LOG LOG -#define GPU_CHECK CHECK // TODO: implement logging through nacl's debug service runtime if // available. #define CHECK(X) do {} while (0) @@ -49,6 +37,8 @@ #define NOTREACHED() DCHECK(false) -#endif +#else // STUB_LOG_AND_CHECK +#include "base/logging.h" +#endif // STUB_LOG_AND_CHECK #endif // GPU_COMMAND_BUFFER_COMMON_LOGGING_H_ |