Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(656)

Unified Diff: third_party/WebKit/Source/platform/graphics/ContiguousContainer.cpp

Issue 2807923002: Replace ASSERT, ASSERT_NOT_REACHED, and RELEASE_ASSERT in platform/graphics (Closed)
Patch Set: fix typo Created 3 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: third_party/WebKit/Source/platform/graphics/ContiguousContainer.cpp
diff --git a/third_party/WebKit/Source/platform/graphics/ContiguousContainer.cpp b/third_party/WebKit/Source/platform/graphics/ContiguousContainer.cpp
index 2d995face63b3c7ad01e64dfcda39e4d0a456a6c..960e780ad73a551ed8bd2834d6fad3dd3b7a97a2 100644
--- a/third_party/WebKit/Source/platform/graphics/ContiguousContainer.cpp
+++ b/third_party/WebKit/Source/platform/graphics/ContiguousContainer.cpp
@@ -40,7 +40,7 @@ class ContiguousContainerBase::Buffer {
bool IsEmpty() const { return UsedCapacity() == 0; }
void* Allocate(size_t object_size) {
- ASSERT(UnusedCapacity() >= object_size);
+ DCHECK_GE(UnusedCapacity(), object_size);
ANNOTATE_CHANGE_SIZE(begin_, capacity_, UsedCapacity(),
UsedCapacity() + object_size);
void* result = end_;
@@ -49,7 +49,8 @@ class ContiguousContainerBase::Buffer {
}
void DeallocateLastObject(void* object) {
- RELEASE_ASSERT(begin_ <= object && object < end_);
+ CHECK_LE(begin_, object);
+ CHECK_LT(object, end_);
ANNOTATE_CHANGE_SIZE(begin_, capacity_, UsedCapacity(),
static_cast<char*>(object) - begin_);
end_ = static_cast<char*>(object);
@@ -105,7 +106,7 @@ void ContiguousContainerBase::ReserveInitialCapacity(size_t buffer_size,
void* ContiguousContainerBase::Allocate(size_t object_size,
const char* type_name) {
- ASSERT(object_size <= max_object_size_);
+ DCHECK_LE(object_size, max_object_size_);
Buffer* buffer_for_alloc = nullptr;
if (!buffers_.IsEmpty()) {
@@ -168,7 +169,7 @@ ContiguousContainerBase::Buffer*
ContiguousContainerBase::AllocateNewBufferForNextAllocation(
size_t buffer_size,
const char* type_name) {
- ASSERT(buffers_.IsEmpty() || end_index_ == buffers_.size() - 1);
+ DCHECK(buffers_.IsEmpty() || end_index_ == buffers_.size() - 1);
std::unique_ptr<Buffer> new_buffer =
WTF::MakeUnique<Buffer>(buffer_size, type_name);
Buffer* buffer_to_return = new_buffer.get();

Powered by Google App Engine
This is Rietveld 408576698