Changeset 74329 in webkit

Timestamp:

Dec 19, 2010 6:42:52 PM (13 years ago)

Author:

mitz@apple.com

Message:

<rdar://problem/8769525> WKView leak when performing key equivalents
​https://bugs.webkit.org/show_bug.cgi?id=51315

Reviewed by Sam Weinig.

• UIProcess/API/mac/WKView.mm:

(-[WKView performKeyEquivalent:]): Use a RetainPtr to ensure that the view is released in the
early return code path.

Location:

trunk/WebKit2

Files:

• ChangeLog (modified) (1 diff)
• UIProcess/API/mac/WKView.mm (modified) (2 diffs)

trunk/WebKit2/ChangeLog

@@ +1 @@
+2010-12-19  Dan Bernstein  <mitz@apple.com>
+
+        Reviewed by Sam Weinig.
+
+        <rdar://problem/8769525> WKView leak when performing key equivalents
+        https://bugs.webkit.org/show_bug.cgi?id=51315
+
+        * UIProcess/API/mac/WKView.mm:
+        (-[WKView performKeyEquivalent:]): Use a RetainPtr to ensure that the view is released in the
+        early return code path.
+
 2010-12-19  Benjamin Poulain  <benjamin.poulain@nokia.com>
 

trunk/WebKit2/UIProcess/API/mac/WKView.mm

@@ -441 +441 @@
     
     BOOL eventWasSentToWebCore = (_data->_keyDownEventBeingResent == event);
-    BOOL ret = NO;
-    
-    [self retain];
+
+    RetainPtr<WKView> retainedSelf = self;
     
     // Pass key combos through WebCore if there is a key binding available for
@@ -457 +456 @@
     }
     
-    ret = [self _handleStyleKeyEquivalent:event] || [super performKeyEquivalent:event];
-    
-    [self release];
-    
-    return ret;
+    return [self _handleStyleKeyEquivalent:event] || [super performKeyEquivalent:event];
 }