commit d63d090ea138dc48c61c3cf0154820a0179044e5
author ddkilzer@apple.com <ddkilzer@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc> Thu Apr 02 19:16:06 2020 +0000
committer ddkilzer@apple.com <ddkilzer@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc> Thu Apr 02 19:16:06 2020 +0000
tree 575cb2f5f048fb25bd617c670b3a789e4bcd5f66
parent 93614ab67ef69a9fa7c4815ff98a815511863e9c

REGRESSION (r234685): Leak of CALayer in createCoreAnimationLayer() in PluginObjectMac.mm
<https://webkit.org/b/209915>

Reviewed by Darin Adler.

* DumpRenderTree/TestNetscapePlugIn/PluginObjectMac.mm:
(createCoreAnimationLayer): Use RetainPtr<> to fix leak.


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

Tools/ChangeLog

diff --git a/Tools/ChangeLog b/Tools/ChangeLog
index c026fd8..3ae8d4a 100644
--- a/Tools/ChangeLog
+++ b/Tools/ChangeLog
@@ -1,5 +1,15 @@
 2020-04-02  David Kilzer  <ddkilzer@apple.com>
 
+        REGRESSION (r234685): Leak of CALayer in createCoreAnimationLayer() in PluginObjectMac.mm
+        <https://webkit.org/b/209915>
+
+        Reviewed by Darin Adler.
+
+        * DumpRenderTree/TestNetscapePlugIn/PluginObjectMac.mm:
+        (createCoreAnimationLayer): Use RetainPtr<> to fix leak.
+
+2020-04-02  David Kilzer  <ddkilzer@apple.com>
+
         API::PageConfiguration may have conflicting preference values between WebPreferences and WebPreferencesStore::ValueMap instance variables
         <https://webkit.org/b/209678>
         <rdar://problem/60981271>

Tools/DumpRenderTree/TestNetscapePlugIn/PluginObjectMac.mm

diff --git a/Tools/DumpRenderTree/TestNetscapePlugIn/PluginObjectMac.mm b/Tools/DumpRenderTree/TestNetscapePlugIn/PluginObjectMac.mm
index ef2b7d9..a6457a0 100644
--- a/Tools/DumpRenderTree/TestNetscapePlugIn/PluginObjectMac.mm
+++ b/Tools/DumpRenderTree/TestNetscapePlugIn/PluginObjectMac.mm
@@ -26,6 +26,7 @@
 #include "PluginObject.h"
 
 #include <QuartzCore/QuartzCore.h>
+#include <wtf/RetainPtr.h>
 
 @interface TestPluginLayer : CALayer
 @end
@@ -44,7 +45,7 @@
 
 CFTypeRef createCoreAnimationLayer()
 {
-    CALayer *caLayer = [[TestPluginLayer alloc] init];
+    RetainPtr<CALayer> caLayer = adoptNS([[TestPluginLayer alloc] init]);
 
     NSNull *nullValue = [NSNull null];
     NSDictionary *actions = [NSDictionary dictionaryWithObjectsAndKeys:
@@ -93,5 +94,5 @@
                                                       attribute:kCAConstraintMaxX]];
 
     [caLayer addSublayer:sublayer];
-    return CFBridgingRetain(caLayer);
+    return CFBridgingRetain(caLayer.get());
 }