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

Unified Diff: sky/engine/platform/heap/Handle.h

Issue 681963002: Remove heap/*.cpp files (Closed) Base URL: git@github.com:domokit/mojo.git@master
Patch Set: Created 6 years, 2 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
« no previous file with comments | « sky/engine/platform/heap/BUILD.gn ('k') | sky/engine/platform/heap/Handle.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: sky/engine/platform/heap/Handle.h
diff --git a/sky/engine/platform/heap/Handle.h b/sky/engine/platform/heap/Handle.h
index 02630bc9b9bfd21cbf7a4da3d7137bef1116d3e4..bda8aaaaea987c34ed2d8ed0bb0286b4ae1d437f 100644
--- a/sky/engine/platform/heap/Handle.h
+++ b/sky/engine/platform/heap/Handle.h
@@ -104,21 +104,6 @@ private:
static ThreadState* state() { return ThreadStateFor<Affinity>::state(); }
};
-// RootsAccessor for Persistent that provides synchronized access to global
-// list of persistent handles. Can be used for persistent handles that are
-// passed between threads.
-class GlobalPersistents {
-public:
- static PersistentNode* roots() { return ThreadState::globalRoots(); }
-
- class Lock {
- public:
- Lock() : m_locker(ThreadState::globalRootsMutex()) { }
- private:
- MutexLocker m_locker;
- };
-};
-
// Base class for persistent handles. RootsAccessor specifies which list to
// link resulting handle into. Owner specifies the class containing trace
// method.
@@ -158,7 +143,6 @@ protected:
{
// We don't support allocation of thread local Persistents while doing
// thread shutdown/cleanup.
- ASSERT(!ThreadState::current()->isTerminating());
typename RootsAccessor::Lock lock;
ASSERT(otherref.m_roots == m_roots); // Handles must belong to the same list.
PersistentBase* other = const_cast<PersistentBase*>(&otherref);
@@ -212,17 +196,6 @@ private:
friend class ThreadState;
};
-#if ENABLE(ASSERT)
- // For global persistent handles we cannot check that the
- // pointer is in the heap because that would involve
- // inspecting the heap of running threads.
-#define ASSERT_IS_VALID_PERSISTENT_POINTER(pointer) \
- bool isGlobalPersistent = WTF::IsSubclass<RootsAccessor, GlobalPersistents>::value; \
- ASSERT(!pointer || isGlobalPersistent || ThreadStateFor<ThreadingTrait<T>::Affinity>::state()->contains(pointer))
-#else
-#define ASSERT_IS_VALID_PERSISTENT_POINTER(pointer)
-#endif
-
template<typename T>
class CrossThreadPersistent;
@@ -251,13 +224,11 @@ public:
Persistent(T* raw) : m_raw(raw)
{
- ASSERT_IS_VALID_PERSISTENT_POINTER(m_raw);
recordBacktrace();
}
explicit Persistent(T& raw) : m_raw(&raw)
{
- ASSERT_IS_VALID_PERSISTENT_POINTER(m_raw);
recordBacktrace();
}
@@ -373,18 +344,6 @@ private:
friend class CrossThreadPersistent<T>;
};
-// Unlike Persistent, we can destruct a CrossThreadPersistent in a thread
-// different from the construction thread.
-template<typename T>
-class CrossThreadPersistent : public Persistent<T, GlobalPersistents> {
- WTF_DISALLOW_CONSTRUCTION_FROM_ZERO(CrossThreadPersistent);
- WTF_DISALLOW_ZERO_ASSIGNMENT(CrossThreadPersistent);
-public:
- CrossThreadPersistent(T* raw) : Persistent<T, GlobalPersistents>(raw) { }
-
- using Persistent<T, GlobalPersistents>::operator=;
-};
-
// FIXME: derive affinity based on the collection.
template<typename Collection, ThreadAffinity Affinity = AnyThread>
class PersistentHeapCollectionBase
« no previous file with comments | « sky/engine/platform/heap/BUILD.gn ('k') | sky/engine/platform/heap/Handle.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698