Changeset 64800 in webkit for trunk/JavaScriptCore/runtime/GCActivityCallbackCF.cpp

Timestamp:

Aug 5, 2010, 5:13:36 PM (15 years ago)

Author:

[email protected]

Message:

Fixed leak seen on buildbot.

Reviewed by Mark Rowe.

• runtime/GCActivityCallbackCF.cpp:

(JSC::DefaultGCActivityCallback::DefaultGCActivityCallback):
(JSC::DefaultGCActivityCallback::~DefaultGCActivityCallback):
(JSC::DefaultGCActivityCallback::operator()): Make out timer a RetainPtr,
since anything less would be uncivilized.

File:

• trunk/JavaScriptCore/runtime/GCActivityCallbackCF.cpp (modified) (4 diffs)

trunk/JavaScriptCore/runtime/GCActivityCallbackCF.cpp

@@ -32 +32 @@
 #include "Collector.h"
 #include "JSLock.h"
+#include <wtf/RetainPtr.h>
 #include <CoreFoundation/CoreFoundation.h>
 
@@ -43 +44 @@
     static void trigger(CFRunLoopTimerRef, void *info);
 
-    CFRunLoopTimerRef timer;
+    RetainPtr<CFRunLoopTimerRef> timer;
     CFRunLoopTimerContext context;
 };
@@ -63 +64 @@
     memset(&d->context, '\0', sizeof(CFRunLoopTimerContext));
     d->context.info = heap;
-    d->timer = CFRunLoopTimerCreate(0, decade, decade, 0, 0, DefaultGCActivityCallbackPlatformData::trigger, &d->context);
-    CFRunLoopAddTimer(CFRunLoopGetCurrent(), d->timer, kCFRunLoopCommonModes);
+    d->timer.adoptCF(CFRunLoopTimerCreate(0, decade, decade, 0, 0, DefaultGCActivityCallbackPlatformData::trigger, &d->context));
+    CFRunLoopAddTimer(CFRunLoopGetCurrent(), d->timer.get(), kCFRunLoopCommonModes);
 }
 
 DefaultGCActivityCallback::~DefaultGCActivityCallback()
 {
-    CFRunLoopRemoveTimer(CFRunLoopGetCurrent(), d->timer, kCFRunLoopCommonModes);
-    CFRunLoopTimerInvalidate(d->timer);
+    CFRunLoopRemoveTimer(CFRunLoopGetCurrent(), d->timer.get(), kCFRunLoopCommonModes);
+    CFRunLoopTimerInvalidate(d->timer.get());
     d->context.info = 0;
     d->timer = 0;
@@ -77 +78 @@
 void DefaultGCActivityCallback::operator()()
 {
-    CFRunLoopTimerSetNextFireDate(d->timer, CFAbsoluteTimeGetCurrent() + 2);
+    CFRunLoopTimerSetNextFireDate(d->timer.get(), CFAbsoluteTimeGetCurrent() + 2);
 }