[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-9427-gc2be6fc

beidson at apple.com beidson at apple.com
Wed Dec 22 16:31:28 UTC 2010


The following commit has been merged in the debian/experimental branch:
commit b775a26883af0afd1a14114a623571bf8f4abe5b
Author: beidson at apple.com <beidson at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Thu Nov 25 01:09:21 2010 +0000

    Reviewed implicitly by John Sullivan.
    
    https://bugs.webkit.org/show_bug.cgi?id=50042
    
    * UIProcess/mac/WebContextMenuProxyMac.mm:
    (-[WebUserDataWrapper initWithUserData:WebKit::]): Do the proper self = [super init] dance here.
    
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@72709 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit2/ChangeLog b/WebKit2/ChangeLog
index 8a9e335..ef4c92a 100644
--- a/WebKit2/ChangeLog
+++ b/WebKit2/ChangeLog
@@ -1,5 +1,14 @@
 2010-11-24  Brady Eidson  <beidson at apple.com>
 
+        Reviewed implicitly by John Sullivan.
+
+        https://bugs.webkit.org/show_bug.cgi?id=50042
+
+        * UIProcess/mac/WebContextMenuProxyMac.mm:
+        (-[WebUserDataWrapper initWithUserData:WebKit::]): Do the proper self = [super init] dance here.
+
+2010-11-24  Brady Eidson  <beidson at apple.com>
+
         Reviewed by Dan Bernstein.
 
         More of <rdar://problem/8613727> and https://bugs.webkit.org/show_bug.cgi?id=50042
diff --git a/WebKit2/UIProcess/mac/WebContextMenuProxyMac.mm b/WebKit2/UIProcess/mac/WebContextMenuProxyMac.mm
index dbdd803..b932ea1 100644
--- a/WebKit2/UIProcess/mac/WebContextMenuProxyMac.mm
+++ b/WebKit2/UIProcess/mac/WebContextMenuProxyMac.mm
@@ -45,6 +45,10 @@ using namespace WebCore;
 
 - (id)initWithUserData:(WebKit::APIObject*)userData
 {
+    self = [super init];
+    if (!self)
+        return nil;
+    
     _webUserData = userData;
     return self;
 }

-- 
WebKit Debian packaging



More information about the Pkg-webkit-commits mailing list