Changeset 149415 in webkit

Timestamp:

Apr 30, 2013, 5:02:12 PM (12 years ago)

Author:

andersca@apple.com

Message:

Make RunLoop ref-counted
​https://bugs.webkit.org/show_bug.cgi?id=115384

Reviewed by Benjamin Poulain.

Add a RunLoop::Holder class which creates and holds the ref-counted RunLoop object.

• platform/RunLoop.cpp:

(RunLoop::Holder):
(WebCore::RunLoop::Holder::Holder):
(WebCore::RunLoop::Holder::runLoop):
(WebCore::RunLoop::current):

• platform/RunLoop.h:

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• platform/RunLoop.cpp (modified) (3 diffs)
• platform/RunLoop.h (modified) (4 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2013-04-30  Anders Carlsson  <andersca@apple.com>
+
+        Make RunLoop ref-counted
+        https://bugs.webkit.org/show_bug.cgi?id=115384
+
+        Reviewed by Benjamin Poulain.
+
+        Add a RunLoop::Holder class which creates and holds the ref-counted RunLoop object.
+
+        * platform/RunLoop.cpp:
+        (RunLoop::Holder):
+        (WebCore::RunLoop::Holder::Holder):
+        (WebCore::RunLoop::Holder::runLoop):
+        (WebCore::RunLoop::current):
+        * platform/RunLoop.h:
+
 2013-04-30  Anders Carlsson  <andersca@apple.com>
 

trunk/Source/WebCore/platform/RunLoop.cpp

@@ -28 +28 @@
 
 #include <wtf/StdLibExtras.h>
+#include <wtf/ThreadSpecific.h>
 
 namespace WebCore {
@@ -39 +40 @@
 static RunLoop* s_mainRunLoop;
 
+// Helper class for ThreadSpecificData.
+class RunLoop::Holder {
+public:
+    Holder()
+        : m_runLoop(adoptRef(new RunLoop))
+    {
+    }
+
+    RunLoop* runLoop() const { return m_runLoop.get(); }
+
+private:
+    RefPtr<RunLoop> m_runLoop;
+};
+
 void RunLoop::initializeMainRunLoop()
 {
@@ -48 +63 @@
 RunLoop* RunLoop::current()
 {
-    DEFINE_STATIC_LOCAL(WTF::ThreadSpecific<RunLoop>, runLoopData, ());
-    return &*runLoopData;
+    DEFINE_STATIC_LOCAL(WTF::ThreadSpecific<RunLoop::Holder>, runLoopHolder, ());
+    return runLoopHolder->runLoop();
 }
 

trunk/Source/WebCore/platform/RunLoop.h

@@ -34 +34 @@
 #include <wtf/HashMap.h>
 #include <wtf/RetainPtr.h>
-#include <wtf/ThreadSpecific.h>
 #include <wtf/Threading.h>
 
@@ -47 +46 @@
 namespace WebCore {
 
-class RunLoop {
+class RunLoop : public ThreadSafeRefCounted<RunLoop> {
 public:
     // Must be called from the main thread (except for the Mac platform, where it
@@ -58 +57 @@
     static RunLoop* current();
     static RunLoop* main();
+    ~RunLoop();
 
     void dispatch(const Function<void()>&);
@@ -131 +131 @@
     };
 
+    class Holder;
+
 private:
-    friend class WTF::ThreadSpecific<RunLoop>;
-
     RunLoop();
-    ~RunLoop();
 
     void performWork();