Add thread affinity and ASSERT() for same-thread restriction to WTF::Function

third_party/WebKit/Source/core/dom/ExecutionContextTask.h

 /*
  * Copyright (C) 2013 Google Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are
  * met:
  *
  *     * Redistributions of source code must retain the above copyright
  * notice, this list of conditions and the following disclaimer.
  *     * Neither the name of Google Inc. nor the names of its
@@ skipping 32 matching lines @@
     USING_FAST_MALLOC(ExecutionContextTask);
 public:
     ExecutionContextTask() { }
     virtual ~ExecutionContextTask() { }
     virtual void performTask(ExecutionContext*) = 0;
     virtual String taskNameForInstrumentation() const { return String(); }
 };
 
 namespace internal {
 
-template<typename T>
+template<typename T, WTF::FunctionThreadAffinity threadAffinity>
 class CallClosureTaskBase : public ExecutionContextTask {
 protected:
-    CallClosureTaskBase(PassOwnPtr<Function<T>> closure, bool isSameThread)
+    explicit CallClosureTaskBase(PassOwnPtr<Function<T, threadAffinity>> closure)
         : m_closure(std::move(closure))
-#if ENABLE(ASSERT)
-        , m_isSameThread(isSameThread)
-        , m_createdThread(currentThread())
-#endif
     {
     }
 
-    void checkThread()
-    {
-#if ENABLE(ASSERT)
-        if (m_isSameThread) {
-            RELEASE_ASSERT(m_createdThread == currentThread());
-        }
-#endif
-    }
-
-    OwnPtr<Function<T>> m_closure;
-
-private:
-#if ENABLE(ASSERT)
-    bool m_isSameThread;
-    ThreadIdentifier m_createdThread;
-#endif
+    OwnPtr<Function<T, threadAffinity>> m_closure;
 };
 
-class CallClosureTask final : public CallClosureTaskBase<void()> {
+template<WTF::FunctionThreadAffinity threadAffinity>
+class CallClosureTask final : public CallClosureTaskBase<void(), threadAffinity> {
 public:
     // Do not use |create| other than in createCrossThreadTask and
     // createSameThreadTask.
     // See http://crbug.com/390851
-    static PassOwnPtr<CallClosureTask> create(PassOwnPtr<Closure> closure, bool isSameThread = false)
+    static PassOwnPtr<CallClosureTask<threadAffinity>> create(PassOwnPtr<Function<void(), threadAffinity>> closure)
     {
-        return adoptPtr(new CallClosureTask(std::move(closure), isSameThread));
+        return adoptPtr(new CallClosureTask<threadAffinity>(std::move(closure)));
     }
 
     void performTask(ExecutionContext*) override
     {
-        checkThread();
-        (*m_closure)();
+        (*this->m_closure)();
     }
 
 private:
-    CallClosureTask(PassOwnPtr<Closure> closure, bool isSameThread)
-        : CallClosureTaskBase<void()>(std::move(closure), isSameThread)
+    explicit CallClosureTask(PassOwnPtr<Function<void(), threadAffinity>> closure)
+        : CallClosureTaskBase<void(), threadAffinity>(std::move(closure))
     {
     }
 };
+
+template<WTF::FunctionThreadAffinity threadAffinity>
+class CallClosureWithExecutionContextTask final : public CallClosureTaskBase<void(ExecutionContext*), threadAffinity> {
+public:
+    // Do not use |create| other than in createCrossThreadTask and
+    // createSameThreadTask.
+    // See http://crbug.com/390851
+    static PassOwnPtr<CallClosureWithExecutionContextTask> create(PassOwnPtr<Function<void(ExecutionContext*), threadAffinity>> closure)
+    {
+        return adoptPtr(new CallClosureWithExecutionContextTask(std::move(closure)));
+    }
+
+    void performTask(ExecutionContext* context) override
+    {
+        (*this->m_closure)(context);
+    }
+
+private:
+    explicit CallClosureWithExecutionContextTask(PassOwnPtr<Function<void(ExecutionContext*), threadAffinity>> closure)
+        : CallClosureTaskBase<void(ExecutionContext*), threadAffinity>(std::move(closure))
+    {
+    }
+};
 
 } // namespace internal
 
 // Create tasks passed within a single thread.
 // When posting tasks within a thread, use |createSameThreadTask| instead
 // of using |bind| directly to state explicitly that there is no need to care
 // about thread safety when posting the task.
 // When posting tasks across threads, use |createCrossThreadTask|.
 template<typename FunctionType, typename... P>
 PassOwnPtr<ExecutionContextTask> createSameThreadTask(
     FunctionType function, const P&... parameters)
 {
-    return internal::CallClosureTask::create(bind(function, parameters...), true);
+    return internal::CallClosureTask<WTF::SameThreadAffinity>::create(bind(function, parameters...));
 }
 
 } // namespace blink
 
 #endif