Changeset 85248 in webkit

Timestamp:

Apr 28, 2011 3:31:04 PM (13 years ago)

Author:

ddkilzer@apple.com

Message:

<​http://webkit.org/b/59725> -[WebFullscreenWindow initWithContentRect:styleMask:backing:defer:] leaks a CALayer

Reviewed by Dan Bernstein.

• WebView/WebFullScreenController.mm:

(-[WebFullscreenWindow initWithContentRect:styleMask:backing:defer:]):
Use a RetainPtr to hold the CALayer and to fix the leak.

Location:

trunk/Source/WebKit/mac

Files:

• ChangeLog (modified) (1 diff)
• WebView/WebFullScreenController.mm (modified) (3 diffs)

trunk/Source/WebKit/mac/ChangeLog

@@ +1 @@
+2011-04-28  David Kilzer  <ddkilzer@apple.com>
+
+        <http://webkit.org/b/59725> -[WebFullscreenWindow initWithContentRect:styleMask:backing:defer:] leaks a CALayer
+
+        Reviewed by Dan Bernstein.
+
+        * WebView/WebFullScreenController.mm:
+        (-[WebFullscreenWindow initWithContentRect:styleMask:backing:defer:]):
+        Use a RetainPtr to hold the CALayer and to fix the leak.
+
 2011-04-28  David Kilzer  <ddkilzer@apple.com>
 

trunk/Source/WebKit/mac/WebView/WebFullScreenController.mm

@@ -53 +53 @@
 #import <WebCore/RenderLayerBacking.h>
 #import <objc/objc-runtime.h>
+#import <wtf/RetainPtr.h>
 #import <wtf/UnusedParam.h>
 
@@ -800 +801 @@
     _animationView = [[NSView alloc] initWithFrame:[contentView bounds]];
     
-    CALayer* contentLayer = [[CALayer alloc] init];
-    [_animationView setLayer:contentLayer];
+    RetainPtr<CALayer> contentLayer(AdoptNS, [[CALayer alloc] init]);
+    [_animationView setLayer:contentLayer.get()];
     [_animationView setWantsLayer:YES];
     [_animationView setAutoresizingMask:NSViewWidthSizable|NSViewHeightSizable];
@@ -807 +808 @@
     
     _backgroundLayer = [[CALayer alloc] init];
-    [contentLayer addSublayer:_backgroundLayer];
+    [contentLayer.get() addSublayer:_backgroundLayer];
 #ifndef BUILDING_ON_LEOPARD
-    [contentLayer setGeometryFlipped:YES];
+    [contentLayer.get() setGeometryFlipped:YES];
 #else
-    [contentLayer setSublayerTransform:CATransform3DMakeScale(1, -1, 1)];
+    [contentLayer.get() setSublayerTransform:CATransform3DMakeScale(1, -1, 1)];
 #endif
-    [contentLayer setOpacity:0];
+    [contentLayer.get() setOpacity:0];
     
     [_backgroundLayer setBackgroundColor:CGColorGetConstantColor(kCGColorBlack)];