From: beidson@apple.com <beidson@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Tue, 17 Apr 2012 00:35:09 +0000 (+0000)
Subject: Followup to http://trac.webkit.org/changeset/114323
X-Git-Tag: 070512121124~6856
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=1e7874b1f7202a74b1b50ce8a365e611244444d8;p=profile%2Fivi%2Fwebkit-efl.git

Followup to trac.webkit.org/changeset/114323

For more correctness, actually include an autorelease pool instead of cleverly trying to avoid its use.

Reviewed by Mark Rowe.

* PluginProcess/mac/PluginProcessMainMac.mm:
(WebKit::PluginProcessMain):

git-svn-id: http://svn.webkit.org/repository/webkit/trunk@114327 268f45cc-cd09-0410-ab3c-d52691b4dbfc
---

diff --git a/Source/WebKit2/ChangeLog b/Source/WebKit2/ChangeLog
index 48542dd..72b233c 100644
--- a/Source/WebKit2/ChangeLog
+++ b/Source/WebKit2/ChangeLog
@@ -1,5 +1,16 @@
 2012-04-16  Brady Eidson  <beidson@apple.com>
 
+        Followup to http://trac.webkit.org/changeset/114323
+
+        For more correctness, actually include an autorelease pool instead of cleverly trying to avoid its use.
+
+        Reviewed by Mark Rowe.
+
+        * PluginProcess/mac/PluginProcessMainMac.mm:
+        (WebKit::PluginProcessMain): 
+
+2012-04-16  Brady Eidson  <beidson@apple.com>
+
         <rdar://problem/11238965> Leak in Plugin Process when launched 32-bit
 
         Reviewed by Jessie Berlin.
diff --git a/Source/WebKit2/PluginProcess/mac/PluginProcessMainMac.mm b/Source/WebKit2/PluginProcess/mac/PluginProcessMainMac.mm
index eee5644..0ee4cb6 100644
--- a/Source/WebKit2/PluginProcess/mac/PluginProcessMainMac.mm
+++ b/Source/WebKit2/PluginProcess/mac/PluginProcessMainMac.mm
@@ -89,9 +89,15 @@ int PluginProcessMain(const CommandLine& commandLine)
         WKSetDefaultLocalization(cfLocalization.get());
 
 #if defined(__i386__)
-    NSDictionary *defaults = [[NSDictionary alloc] initWithObjectsAndKeys:[NSNumber numberWithBool:YES], @"AppleMagnifiedMode", nil];
-    [[NSUserDefaults standardUserDefaults] registerDefaults:defaults];
-    [defaults release];
+    {
+        NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init];
+
+        NSDictionary *defaults = [[NSDictionary alloc] initWithObjectsAndKeys:[NSNumber numberWithBool:YES], @"AppleMagnifiedMode", nil];
+        [[NSUserDefaults standardUserDefaults] registerDefaults:defaults];
+        [defaults release];
+
+        [pool drain];
+    }
 #endif
 
 #if !SHOW_CRASH_REPORTER