[SCM] WebKit Debian packaging branch, debian/unstable, updated. debian/1.1.15-1-40151-g37bb677

darin darin at 268f45cc-cd09-0410-ab3c-d52691b4dbfc
Sat Sep 26 08:30:11 UTC 2009


The following commit has been merged in the debian/unstable branch:
commit 5c035e4ad2394293a96c5256d7590b60d9b62a89
Author: darin <darin at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Fri Mar 19 16:40:19 2004 +0000

            Reviewed by Ken.
    
            - fixed <rdar://problem/3583945>: crash when choosing a file to upload
    
            * kwq/KWQFileButton.mm:
            (-[KWQFileButtonAdapter dealloc]): Removed unneeded method.
            (-[KWQFileButtonAdapter filenameChanged:]): Check for nil.
            (-[KWQFileButtonAdapter focusChanged:]): Ditto.
            (-[KWQFileButtonAdapter clicked]): Ditto.
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@6238 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog-2005-08-23 b/WebCore/ChangeLog-2005-08-23
index 6086276..aaccb6e 100644
--- a/WebCore/ChangeLog-2005-08-23
+++ b/WebCore/ChangeLog-2005-08-23
@@ -1,3 +1,15 @@
+2004-03-19  Darin Adler  <darin at apple.com>
+
+        Reviewed by Ken.
+
+        - fixed <rdar://problem/3583945>: crash when choosing a file to upload
+
+        * kwq/KWQFileButton.mm:
+        (-[KWQFileButtonAdapter dealloc]): Removed unneeded method.
+        (-[KWQFileButtonAdapter filenameChanged:]): Check for nil.
+        (-[KWQFileButtonAdapter focusChanged:]): Ditto.
+        (-[KWQFileButtonAdapter clicked]): Ditto.
+
 2004-03-17  Darin Adler  <darin at apple.com>
 
         Reviewed by John.
diff --git a/WebCore/kwq/KWQFileButton.mm b/WebCore/kwq/KWQFileButton.mm
index 8665637..7fbe7a2 100644
--- a/WebCore/kwq/KWQFileButton.mm
+++ b/WebCore/kwq/KWQFileButton.mm
@@ -179,25 +179,26 @@ void KWQFileButton::clicked()
     return self;
 }
 
-- (void)dealloc
-{
-    [super dealloc];
-}
-
 - (void)filenameChanged:(NSString *)filename
 {
-    button->filenameChanged(QString::fromNSString(filename));
+    if (button) {
+        button->filenameChanged(QString::fromNSString(filename));
+    }
 }
 
 - (void)focusChanged:(BOOL)nowHasFocus
 {
-    button->focusChanged(nowHasFocus);
+    if (button) {
+        button->focusChanged(nowHasFocus);
+    }
 }
 
 -(void)clicked
 {
-    button->sendConsumedMouseUp();
-    button->clicked();
+    if (button) {
+        button->sendConsumedMouseUp();
+        button->clicked();
+    }
 }
 
 @end

-- 
WebKit Debian packaging



More information about the Pkg-webkit-commits mailing list