Index: third_party/WebKit/Source/platform/heap/Member.h |
diff --git a/third_party/WebKit/Source/platform/heap/Member.h b/third_party/WebKit/Source/platform/heap/Member.h |
index 1a6502d571c610b2aec3ab1be2a09378fe5d2fdf..db16863abd315f1af621ae5d0b4b462e9487f732 100644 |
--- a/third_party/WebKit/Source/platform/heap/Member.h |
+++ b/third_party/WebKit/Source/platform/heap/Member.h |
@@ -136,12 +136,11 @@ class MemberBase { |
// constructor wasn't called. |
if (m_creationThreadState) { |
// Member should point to objects that belong in the same ThreadHeap. |
- DCHECK_EQ(&ThreadState::fromObject(m_raw)->heap(), |
- &m_creationThreadState->heap()); |
+ DCHECK(m_creationThreadState->isOnThreadHeap(m_raw)); |
// Member should point to objects that belong in the same ThreadHeap. |
DCHECK_EQ(¤t->heap(), &m_creationThreadState->heap()); |
} else { |
- DCHECK_EQ(&ThreadState::fromObject(m_raw)->heap(), ¤t->heap()); |
+ DCHECK(current->isOnThreadHeap(m_raw)); |
} |
} |
@@ -361,12 +360,11 @@ class SameThreadCheckedMember : public Member<T> { |
// constructor wasn't called. |
if (m_creationThreadState) { |
// Member should point to objects that belong in the same ThreadHeap. |
- CHECK_EQ(&ThreadState::fromObject(this->m_raw)->heap(), |
- &m_creationThreadState->heap()); |
+ CHECK(m_creationThreadState->isOnThreadHeap(this->m_raw)); |
// Member should point to objects that belong in the same ThreadHeap. |
CHECK_EQ(¤t->heap(), &m_creationThreadState->heap()); |
} else { |
- CHECK_EQ(&ThreadState::fromObject(this->m_raw)->heap(), ¤t->heap()); |
+ CHECK(current->isOnThreadHeap(this->m_raw)); |
} |
} |