[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-10851-g50815da
mitz at apple.com
mitz at apple.com
Wed Dec 22 18:48:42 UTC 2010
The following commit has been merged in the debian/experimental branch:
commit 80bae154ea831760153df47c26dd1b3d3c30fe25
Author: mitz at apple.com <mitz at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Mon Dec 20 02:42:52 2010 +0000
<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.
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@74329 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/WebKit2/ChangeLog b/WebKit2/ChangeLog
index 4d72055..a6d08b8 100644
--- a/WebKit2/ChangeLog
+++ b/WebKit2/ChangeLog
@@ -1,3 +1,14 @@
+2010-12-19 Dan Bernstein <mitz at 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 at nokia.com>
Reviewed by Kenneth Rohde Christiansen.
diff --git a/WebKit2/UIProcess/API/mac/WKView.mm b/WebKit2/UIProcess/API/mac/WKView.mm
index 56026fa..a88f229 100644
--- a/WebKit2/UIProcess/API/mac/WKView.mm
+++ b/WebKit2/UIProcess/API/mac/WKView.mm
@@ -440,9 +440,8 @@ MOUSE_EVENT_HANDLER(mouseUp)
[[event retain] autorelease];
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
// this event. This lets web pages have a crack at intercepting key-modified keypresses.
@@ -456,11 +455,7 @@ MOUSE_EVENT_HANDLER(mouseUp)
return YES;
}
- ret = [self _handleStyleKeyEquivalent:event] || [super performKeyEquivalent:event];
-
- [self release];
-
- return ret;
+ return [self _handleStyleKeyEquivalent:event] || [super performKeyEquivalent:event];
}
- (void)_setEventBeingResent:(NSEvent *)event
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list