[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 6acf1805370558326fa89ae614f72e86195f6d85
Author: darin <darin at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Fri Dec 20 19:48:55 2002 +0000

            Reviewed by John.
    
    	- fixed 3129824 -- crash in QWidget::getView in KWQKHTMLPart::passSubframeEventToSubframe
    
            * kwq/KWQKHTMLPart.mm: (KWQKHTMLPart::passWidgetMouseDownEventToWidget):
    	Check for a nil QWidget in a RenderWidget, and ERROR and return true in that case.
    	We don't want to return false because otherwise the KHTML code will try to draw a frame splitter.
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@3150 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog-2003-10-25 b/WebCore/ChangeLog-2003-10-25
index b9c6a0c..9a78a6c 100644
--- a/WebCore/ChangeLog-2003-10-25
+++ b/WebCore/ChangeLog-2003-10-25
@@ -2,6 +2,16 @@
 
         Reviewed by John.
 
+	- fixed 3129824 -- crash in QWidget::getView in KWQKHTMLPart::passSubframeEventToSubframe
+
+        * kwq/KWQKHTMLPart.mm: (KWQKHTMLPart::passWidgetMouseDownEventToWidget):
+	Check for a nil QWidget in a RenderWidget, and ERROR and return true in that case.
+	We don't want to return false because otherwise the KHTML code will try to draw a frame splitter.
+
+2002-12-20  Darin Adler  <darin at apple.com>
+
+        Reviewed by John.
+
 	- fixed 3131449 -- crash in DOMNamedNodesCollection::tryGet opening a new window from JavaScript
 
         * khtml/ecma/kjs_dom.cpp: (DOMNamedNodesCollection::tryGet):
diff --git a/WebCore/ChangeLog-2005-08-23 b/WebCore/ChangeLog-2005-08-23
index b9c6a0c..9a78a6c 100644
--- a/WebCore/ChangeLog-2005-08-23
+++ b/WebCore/ChangeLog-2005-08-23
@@ -2,6 +2,16 @@
 
         Reviewed by John.
 
+	- fixed 3129824 -- crash in QWidget::getView in KWQKHTMLPart::passSubframeEventToSubframe
+
+        * kwq/KWQKHTMLPart.mm: (KWQKHTMLPart::passWidgetMouseDownEventToWidget):
+	Check for a nil QWidget in a RenderWidget, and ERROR and return true in that case.
+	We don't want to return false because otherwise the KHTML code will try to draw a frame splitter.
+
+2002-12-20  Darin Adler  <darin at apple.com>
+
+        Reviewed by John.
+
 	- fixed 3131449 -- crash in DOMNamedNodesCollection::tryGet opening a new window from JavaScript
 
         * khtml/ecma/kjs_dom.cpp: (DOMNamedNodesCollection::tryGet):
diff --git a/WebCore/kwq/KWQKHTMLPart.mm b/WebCore/kwq/KWQKHTMLPart.mm
index 0ca64cf..ab856c5 100644
--- a/WebCore/kwq/KWQKHTMLPart.mm
+++ b/WebCore/kwq/KWQKHTMLPart.mm
@@ -757,7 +757,12 @@ bool KWQKHTMLPart::passWidgetMouseDownEventToWidget(khtml::MouseEvent *event)
 
 bool KWQKHTMLPart::passWidgetMouseDownEventToWidget(RenderWidget *renderWidget)
 {
-    NSView *nodeView = renderWidget->widget()->getView();
+    QWidget *widget = renderWidget->widget();
+    if (!widget) {
+        ERROR("hit a RenderWidget without a corresponding QWidget, means a frame is half-constructed");
+        return true;
+    }
+    NSView *nodeView = widget->getView();
     ASSERT(nodeView);
     ASSERT([nodeView superview]);
     NSView *topView = nodeView;
@@ -768,7 +773,7 @@ bool KWQKHTMLPart::passWidgetMouseDownEventToWidget(RenderWidget *renderWidget)
     NSView *view = [nodeView hitTest:[[nodeView superview] convertPoint:[_currentEvent locationInWindow] fromView:topView]];
     if (view == nil) {
         ERROR("KHTML says we hit a RenderWidget, but AppKit doesn't agree we hit the corresponding NSView");
-        return false;
+        return true;
     }
     
     NSWindow *window = [view window];

-- 
WebKit Debian packaging