diff options
author | thakis@chromium.org <thakis@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-11-05 21:49:37 +0000 |
---|---|---|
committer | thakis@chromium.org <thakis@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-11-05 21:49:37 +0000 |
commit | cf1aa980fbfb3e35efdfc079be4e4a7c1717a8cd (patch) | |
tree | 00282ec9fa81a72338e694cc63ffbb8ae522fd0c /gpu/command_buffer/client/fenced_allocator.h | |
parent | 11780356e666b6dfe875f7ac610d368c18fd21e3 (diff) | |
download | chromium_src-cf1aa980fbfb3e35efdfc079be4e4a7c1717a8cd.zip chromium_src-cf1aa980fbfb3e35efdfc079be4e4a7c1717a8cd.tar.gz chromium_src-cf1aa980fbfb3e35efdfc079be4e4a7c1717a8cd.tar.bz2 |
Delete gpu/command_buffer/common/logging.h
command_buffer was historically included in nacl-compiled things, and base
wasn't. These days, base is included in nacl-compiled things too, so the
duplication can be removed.
This will remove 1 static initializer.
BUG=94925
R=piman@chromium.org
Review URL: https://codereview.chromium.org/58823003
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@233092 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'gpu/command_buffer/client/fenced_allocator.h')
-rw-r--r-- | gpu/command_buffer/client/fenced_allocator.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/gpu/command_buffer/client/fenced_allocator.h b/gpu/command_buffer/client/fenced_allocator.h index 71e6178..bb5c551 100644 --- a/gpu/command_buffer/client/fenced_allocator.h +++ b/gpu/command_buffer/client/fenced_allocator.h @@ -9,7 +9,7 @@ #include <vector> -#include "gpu/command_buffer/common/logging.h" +#include "base/logging.h" #include "gpu/command_buffer/common/types.h" #include "gpu/gpu_export.h" @@ -187,7 +187,7 @@ class FencedAllocatorWrapper { // Parameters: // pointer: the pointer to the memory block to free. void Free(void *pointer) { - GPU_DCHECK(pointer); + DCHECK(pointer); allocator_.Free(GetOffset(pointer)); } @@ -198,7 +198,7 @@ class FencedAllocatorWrapper { // pointer: the pointer to the memory block to free. // token: the token value to wait for before re-using the memory. void FreePendingToken(void *pointer, int32 token) { - GPU_DCHECK(pointer); + DCHECK(pointer); allocator_.FreePendingToken(GetOffset(pointer), token); } |