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

[mjs]

The following commit has been merged in the debian/unstable branch:
commit a6351b4bd5be5310c80c1f5af1777857893acb1d
Author: mjs <mjs at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Sun Mar 30 00:46:16 2003 +0000

            Reviewed by Ken.
    
    	- improved on Darin's fix for 3211289 - REGRESSION: nil-deref in bridgeForWidget
    
            * kwq/KWQKHTMLPart.mm:
            (KWQKHTMLPart::bridgeForWidget): Special-case KHTMLView - this is
    	the only kind of widget in the program that's not a form control
    	(so nodeForWidget would return nil for it).
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@3960 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog-2003-10-25 b/WebCore/ChangeLog-2003-10-25
index 00a7907..274a032 100644
--- a/WebCore/ChangeLog-2003-10-25
+++ b/WebCore/ChangeLog-2003-10-25
@@ -1,3 +1,14 @@
+2003-03-28  Maciej Stachowiak  <mjs at apple.com>
+
+        Reviewed by Richard.
+
+	- improved on Darin's fix for 3211289 - REGRESSION: nil-deref in bridgeForWidget 
+	
+        * kwq/KWQKHTMLPart.mm:
+        (KWQKHTMLPart::bridgeForWidget): Special-case KHTMLView - this is
+	the only kind of widget in the program that's not a form control
+	(so nodeForWidget would return nil for it).
+
 2003-03-28  David Hyatt  <hyatt at apple.com>
 
 	Fix a regression caused by my addition of nearestFloatBottom
diff --git a/WebCore/ChangeLog-2005-08-23 b/WebCore/ChangeLog-2005-08-23
index 00a7907..274a032 100644
--- a/WebCore/ChangeLog-2005-08-23
+++ b/WebCore/ChangeLog-2005-08-23
@@ -1,3 +1,14 @@
+2003-03-28  Maciej Stachowiak  <mjs at apple.com>
+
+        Reviewed by Richard.
+
+	- improved on Darin's fix for 3211289 - REGRESSION: nil-deref in bridgeForWidget 
+	
+        * kwq/KWQKHTMLPart.mm:
+        (KWQKHTMLPart::bridgeForWidget): Special-case KHTMLView - this is
+	the only kind of widget in the program that's not a form control
+	(so nodeForWidget would return nil for it).
+
 2003-03-28  David Hyatt  <hyatt at apple.com>
 
 	Fix a regression caused by my addition of nearestFloatBottom
diff --git a/WebCore/kwq/KWQKHTMLPart.mm b/WebCore/kwq/KWQKHTMLPart.mm
index 51fcea0..fe09c50 100644
--- a/WebCore/kwq/KWQKHTMLPart.mm
+++ b/WebCore/kwq/KWQKHTMLPart.mm
@@ -874,8 +874,16 @@ void KWQKHTMLPart::openURLFromPageCache(KWQPageState *state)
 WebCoreBridge *KWQKHTMLPart::bridgeForWidget(const QWidget *widget)
 {
     ASSERT_ARG(widget, widget);
+
     NodeImpl *node = nodeForWidget(widget);
-    return node ? partForNode(node)->bridge() : 0;
+    if (node) {
+	return partForNode(node)->bridge() ;
+    }
+    
+    // Assume all widgets are either form controls, or KHTMLViews.
+    const KHTMLView *view = dynamic_cast<const KHTMLView *>(widget);
+    ASSERT(view);
+    return KWQ(view->part())->bridge();
 }
 
 KWQKHTMLPart *KWQKHTMLPart::partForNode(NodeImpl *node)

-- 
WebKit Debian packaging