[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:43 UTC 2010


The following commit has been merged in the debian/experimental branch:
commit dee29bc23b56cf6fb302fd8b0fc52890f36662a1
Author: mitz at apple.com <mitz at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Mon Dec 20 03:05:52 2010 +0000

    Improve the fix for <rdar://problem/8769525>.
    
    Reviewed by Sam Weinig.
    
    * UIProcess/API/mac/WKView.mm:
    (-[WKView performKeyEquivalent:]): Do not retain the view. Doing so is necessary in
    -[WebHTMLView performKeyEquivalent:], which this method was based upon, but not here, because
    there is no way for the web process to cause the WKView to be released while it is handling
    the event.
    
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@74330 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit2/ChangeLog b/WebKit2/ChangeLog
index a6d08b8..e64e3f7 100644
--- a/WebKit2/ChangeLog
+++ b/WebKit2/ChangeLog
@@ -2,6 +2,18 @@
 
         Reviewed by Sam Weinig.
 
+        Improve the fix for <rdar://problem/8769525>.
+
+        * UIProcess/API/mac/WKView.mm:
+        (-[WKView performKeyEquivalent:]): Do not retain the view. Doing so is necessary in
+        -[WebHTMLView performKeyEquivalent:], which this method was based upon, but not here, because
+        there is no way for the web process to cause the WKView to be released while it is handling
+        the event.
+
+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
 
diff --git a/WebKit2/UIProcess/API/mac/WKView.mm b/WebKit2/UIProcess/API/mac/WKView.mm
index a88f229..34dc324 100644
--- a/WebKit2/UIProcess/API/mac/WKView.mm
+++ b/WebKit2/UIProcess/API/mac/WKView.mm
@@ -441,8 +441,6 @@ MOUSE_EVENT_HANDLER(mouseUp)
     
     BOOL eventWasSentToWebCore = (_data->_keyDownEventBeingResent == event);
 
-    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.
     // But don't do it if we have already handled the event.

-- 
WebKit Debian packaging



More information about the Pkg-webkit-commits mailing list