summaryrefslogtreecommitdiff
path: root/chromium/gpu/command_buffer/common/id_allocator.cc
diff options
context:
space:
mode:
Diffstat (limited to 'chromium/gpu/command_buffer/common/id_allocator.cc')
-rw-r--r--chromium/gpu/command_buffer/common/id_allocator.cc9
1 files changed, 5 insertions, 4 deletions
diff --git a/chromium/gpu/command_buffer/common/id_allocator.cc b/chromium/gpu/command_buffer/common/id_allocator.cc
index b881e051a5a..7802e1766be 100644
--- a/chromium/gpu/command_buffer/common/id_allocator.cc
+++ b/chromium/gpu/command_buffer/common/id_allocator.cc
@@ -5,7 +5,8 @@
// This file contains the implementation of IdAllocator.
#include "gpu/command_buffer/common/id_allocator.h"
-#include "gpu/command_buffer/common/logging.h"
+
+#include "base/logging.h"
namespace gpu {
@@ -51,7 +52,7 @@ ResourceId IdAllocator::AllocateIDAtOrAbove(ResourceId desired_id) {
}
bool IdAllocator::MarkAsUsed(ResourceId id) {
- GPU_DCHECK(id);
+ DCHECK(id);
free_ids_.erase(id);
std::pair<ResourceIdSet::iterator, bool> result = used_ids_.insert(id);
return result.second;
@@ -106,7 +107,7 @@ ResourceId NonReusedIdAllocator::AllocateIDAtOrAbove(ResourceId desired_id) {
}
bool NonReusedIdAllocator::MarkAsUsed(ResourceId id) {
- GPU_NOTREACHED();
+ NOTREACHED();
return false;
}
@@ -114,7 +115,7 @@ void NonReusedIdAllocator::FreeID(ResourceId id) {
}
bool NonReusedIdAllocator::InUse(ResourceId id) const {
- GPU_NOTREACHED();
+ NOTREACHED();
return false;
}