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

[darin]

The following commit has been merged in the debian/unstable branch:
commit 0fc6fad9bcae430efae76ecef9137331a156716d
Author: darin <darin at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Thu Jun 12 17:19:29 2003 +0000

            Reviewed by John.
    
    	- fixed 3289405 -- repro crash in KWQPopUpButtonCell at umax.de
    
            * kwq/KWQComboBox.mm: (-[KWQPopUpButtonCell trackMouse:inRect:ofView:untilMouseUp:]):
            Use the bridge that we got earlier in the function to find the right part. This is
            simpler, and more reliable. The old way would run into trouble if the widget or
            any of the other objects in the chain got destroyed during the event handling.
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@4529 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog-2003-10-25 b/WebCore/ChangeLog-2003-10-25
index 03de186..f487827 100644
--- a/WebCore/ChangeLog-2003-10-25
+++ b/WebCore/ChangeLog-2003-10-25
@@ -1,5 +1,16 @@
 2003-06-12  Darin Adler  <darin at apple.com>
 
+        Reviewed by John.
+
+	- fixed 3289405 -- repro crash in KWQPopUpButtonCell at umax.de
+
+        * kwq/KWQComboBox.mm: (-[KWQPopUpButtonCell trackMouse:inRect:ofView:untilMouseUp:]):
+        Use the bridge that we got earlier in the function to find the right part. This is
+        simpler, and more reliable. The old way would run into trouble if the widget or
+        any of the other objects in the chain got destroyed during the event handling.
+
+2003-06-12  Darin Adler  <darin at apple.com>
+
         Fixed by Richard, reviewed by me.
 
 	- fixed 3289047 -- REGRESSION: can't go back after using form at attwireless.com
diff --git a/WebCore/ChangeLog-2005-08-23 b/WebCore/ChangeLog-2005-08-23
index 03de186..f487827 100644
--- a/WebCore/ChangeLog-2005-08-23
+++ b/WebCore/ChangeLog-2005-08-23
@@ -1,5 +1,16 @@
 2003-06-12  Darin Adler  <darin at apple.com>
 
+        Reviewed by John.
+
+	- fixed 3289405 -- repro crash in KWQPopUpButtonCell at umax.de
+
+        * kwq/KWQComboBox.mm: (-[KWQPopUpButtonCell trackMouse:inRect:ofView:untilMouseUp:]):
+        Use the bridge that we got earlier in the function to find the right part. This is
+        simpler, and more reliable. The old way would run into trouble if the widget or
+        any of the other objects in the chain got destroyed during the event handling.
+
+2003-06-12  Darin Adler  <darin at apple.com>
+
         Fixed by Richard, reviewed by me.
 
 	- fixed 3289047 -- REGRESSION: can't go back after using form at attwireless.com
diff --git a/WebCore/kwq/KWQComboBox.mm b/WebCore/kwq/KWQComboBox.mm
index 5869928..7ea3dc3 100644
--- a/WebCore/kwq/KWQComboBox.mm
+++ b/WebCore/kwq/KWQComboBox.mm
@@ -238,7 +238,7 @@ void QComboBox::itemSelected()
     // use a Carbon implementation, and it uses the default run loop mode.
     // See bugs 3021018 and 3242460 for some more information.
     
-    WebCoreBridge *bridge = KWQKHTMLPart::bridgeForWidget(widget);
+    WebCoreBridge *bridge = [KWQKHTMLPart::bridgeForWidget(widget) retain];
     BOOL wasDeferringLoading = [bridge defersLoading];
     if (!wasDeferringLoading) {
         [bridge setDefersLoading:YES];
@@ -258,9 +258,9 @@ void QComboBox::itemSelected()
         // Give khtml a chance to fix up its event state, since the popup eats all the
         // events during tracking.  [NSApp currentEvent] is still the original mouseDown
         // at this point!
-        RenderWidget *renderWidget = dynamic_cast<RenderWidget *>(const_cast<QObject *>(widget->eventFilterObject()));
-        KWQ(renderWidget->view()->part())->doFakeMouseUpAfterWidgetTracking(event);
+        [bridge part]->doFakeMouseUpAfterWidgetTracking(event);
     }
+    [bridge release];
     return result;
 }
 

-- 
WebKit Debian packaging