autorelease message pumps

base/message_pump_mac.mm

 // Copyright (c) 2008 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "base/message_pump_mac.h"
 
 #import <AppKit/AppKit.h>
 #import <Foundation/Foundation.h>
 #include <float.h>
 
+#include "base/scoped_nsautorelease_pool.h"
+
 namespace {
 
 void NoOp(void* info) {
 }
 
 }  // namespace
 
 namespace base {
 
 // Must be called on the run loop thread.
@@ skipping 188 matching lines @@
 // Called by CFRunLoopBase::DoRun.  If other CFRunLoopRun loops were running
 // lower on the run loop thread's stack when this object was created, the same
 // number of CFRunLoopRun loops must be running for the outermost call to Run.
 // Run/DoRun are reentrant after that point.
 void MessagePumpCFRunLoop::DoRun(Delegate* delegate) {
   // nesting_level_ will be incremented in EnterExitRunLoop, so set
   // innermost_quittable_ accordingly.
   int last_innermost_quittable = innermost_quittable_;
   innermost_quittable_ = nesting_level_ + 1;
 
-  CFRunLoopRun();
+  // This is completely identical to calling CFRunLoopRun(), except autorelease
+  // pool management is introduced.
+  int result;
+  do {
+    ScopedNSAutoreleasePool autorelease_pool;
+    result = CFRunLoopRunInMode(kCFRunLoopDefaultMode, DBL_MAX, false);
+  } while (result != kCFRunLoopRunStopped && result != kCFRunLoopRunFinished);
 
   // Restore the previous state of the object.
   innermost_quittable_ = last_innermost_quittable;
 }
 
 // Must be called on the run loop thread.
 void MessagePumpCFRunLoop::Quit() {
   // Stop the innermost run loop managed by this MessagePumpCFRunLoop object.
   if (nesting_level_ == innermost_quittable_) {
     // This object is running the innermost loop, just stop it.
@@ skipping 78 matching lines @@
 
   [NSApplication sharedApplication];
 
   if (![NSApp isRunning]) {
     running_own_loop_ = false;
     // NSApplication manages autorelease pools itself when run this way.
     [NSApp run];
   } else {
     running_own_loop_ = true;
     while (keep_running_) {
-      NSAutoreleasePool* autorelease_pool = [[NSAutoreleasePool alloc] init];
+      ScopedNSAutoreleasePool autorelease_pool;
       NSEvent* event = [NSApp nextEventMatchingMask:NSAnyEventMask
                                           untilDate:[NSDate distantFuture]
                                              inMode:NSDefaultRunLoopMode
                                             dequeue:YES];
       if (event) {
         [NSApp sendEvent:event];
       }
-      [autorelease_pool drain];
     }
     keep_running_ = true;
   }
 
   running_own_loop_ = last_running_own_loop_;
 }
 
 void MessagePumpNSApplication::Quit() {
   if (!running_own_loop_) {
     [NSApp stop:nil];
@@ skipping 17 matching lines @@
 // static
 MessagePump* MessagePumpMac::Create() {
   if ([NSThread isMainThread]) {
     return new MessagePumpNSApplication;
   }
 
   return new MessagePumpNSRunLoop;
 }
 
 }  // namespace base