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

Unified Diff: third_party/WebKit/Source/platform/heap/Persistent.h

Issue 2816033003: Replace ASSERT with DHCECK_op in platform/heap (Closed)
Patch Set: Replace ASSERT with CHECK_op in platform/heap 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/heap/Persistent.h
diff --git a/third_party/WebKit/Source/platform/heap/Persistent.h b/third_party/WebKit/Source/platform/heap/Persistent.h
index 536111bbc79a0fb61b10d0999000b1f44b345212..443de36eb9f9e360d602286ba3e8cb99fee6aeef 100644
--- a/third_party/WebKit/Source/platform/heap/Persistent.h
+++ b/third_party/WebKit/Source/platform/heap/Persistent.h
@@ -166,7 +166,7 @@ class PersistentBase {
// needing to be cleared out before the thread is terminated.
PersistentBase* RegisterAsStaticReference() {
if (persistent_node_) {
- ASSERT(ThreadState::Current());
+ DCHECK(ThreadState::Current());
ThreadState::Current()->RegisterStaticPersistentNode(persistent_node_,
nullptr);
LEAK_SANITIZER_IGNORE_OBJECT(this);
@@ -214,7 +214,7 @@ class PersistentBase {
NO_SANITIZE_ADDRESS
void Initialize() {
- ASSERT(!persistent_node_);
+ DCHECK(!persistent_node_);
if (!raw_ || IsHashTableDeletedValue())
return;
@@ -228,7 +228,7 @@ class PersistentBase {
}
ThreadState* state =
ThreadStateFor<ThreadingTrait<T>::kAffinity>::GetState();
- ASSERT(state->CheckThread());
+ DCHECK(state->CheckThread());
persistent_node_ = state->GetPersistentRegion()->AllocatePersistentNode(
this, trace_callback);
#if DCHECK_IS_ON()
@@ -248,9 +248,11 @@ class PersistentBase {
return;
ThreadState* state =
ThreadStateFor<ThreadingTrait<T>::kAffinity>::GetState();
- ASSERT(state->CheckThread());
+ DCHECK(state->CheckThread());
// Persistent handle must be created and destructed in the same thread.
- ASSERT(state_ == state);
+#if DCHECK_IS_ON()
+ DCHECK_EQ(state_, state);
+#endif
state->FreePersistentNode(persistent_node_);
persistent_node_ = nullptr;
}
@@ -567,7 +569,7 @@ class PersistentHeapCollectionBase : public Collection {
// See PersistentBase::registerAsStaticReference() comment.
PersistentHeapCollectionBase* RegisterAsStaticReference() {
if (persistent_node_) {
- ASSERT(ThreadState::Current());
+ DCHECK(ThreadState::Current());
ThreadState::Current()->RegisterStaticPersistentNode(
persistent_node_,
&PersistentHeapCollectionBase<Collection>::ClearPersistentNode);
@@ -596,7 +598,7 @@ class PersistentHeapCollectionBase : public Collection {
void Initialize() {
// FIXME: Derive affinity based on the collection.
ThreadState* state = ThreadState::Current();
- ASSERT(state->CheckThread());
+ DCHECK(state->CheckThread());
persistent_node_ = state->GetPersistentRegion()->AllocatePersistentNode(
this,
TraceMethodDelegate<PersistentHeapCollectionBase<Collection>,
@@ -611,9 +613,11 @@ class PersistentHeapCollectionBase : public Collection {
if (!persistent_node_)
return;
ThreadState* state = ThreadState::Current();
- ASSERT(state->CheckThread());
+ DCHECK(state->CheckThread());
// Persistent handle must be created and destructed in the same thread.
- ASSERT(state_ == state);
+#if DCHECK_IS_ON()
+ DCHECK_EQ(state_, state);
+#endif
state->FreePersistentNode(persistent_node_);
persistent_node_ = nullptr;
}

Powered by Google App Engine
This is Rietveld 408576698