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

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

Issue 2640163004: Replace ENABLE(ASSERT) with DCHECK_IS_ON(). (Closed)
Patch Set: m_domTreeVersion initialization Created 3 years, 11 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 794753c93dd8661116a915453cb52540a94db514..3fe022c0d501394e5d665b62fd59cc5242a22f6e 100644
--- a/third_party/WebKit/Source/platform/heap/Persistent.h
+++ b/third_party/WebKit/Source/platform/heap/Persistent.h
@@ -225,7 +225,7 @@ class PersistentBase {
ASSERT(state->checkThread());
m_persistentNode = state->getPersistentRegion()->allocatePersistentNode(
this, traceCallback);
-#if ENABLE(ASSERT)
+#if DCHECK_IS_ON()
m_state = state;
#endif
}
@@ -314,10 +314,8 @@ class PersistentBase {
// m_raw is accessed most, so put it at the first field.
T* m_raw;
PersistentNode* m_persistentNode = nullptr;
-#if ENABLE(ASSERT)
- ThreadState* m_state = nullptr;
-#endif
#if DCHECK_IS_ON()
+ ThreadState* m_state = nullptr;
const ThreadState* m_creationThreadState;
#endif
};
@@ -617,7 +615,7 @@ class PersistentHeapCollectionBase : public Collection {
TraceMethodDelegate<PersistentHeapCollectionBase<Collection>,
&PersistentHeapCollectionBase<
Collection>::tracePersistent>::trampoline);
-#if ENABLE(ASSERT)
+#if DCHECK_IS_ON()
m_state = state;
#endif
}
@@ -634,7 +632,7 @@ class PersistentHeapCollectionBase : public Collection {
}
PersistentNode* m_persistentNode;
-#if ENABLE(ASSERT)
+#if DCHECK_IS_ON()
ThreadState* m_state;
#endif
};
« no previous file with comments | « third_party/WebKit/Source/platform/heap/PagePool.cpp ('k') | third_party/WebKit/Source/platform/heap/PersistentNode.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698