[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 9f3a78737b0421edda62eee931d97242d8496a1e
Author: darin <darin at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Thu Nov 21 17:06:14 2002 +0000

    	- fixed 3107286 -- REGRESSION: unrepro assertion failure in KWQKHTMLPart.mm keyEvent
    
            * kwq/KWQKHTMLPart.mm: (KWQKHTMLPart::keyEvent):
    	Handle case of nil document as well as case of nil focus node.
    
            * kwq/WebCoreBridge.mm: Tweak whitespace.
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@2803 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog-2002-12-03 b/WebCore/ChangeLog-2002-12-03
index 0fe1159..0934df1 100644
--- a/WebCore/ChangeLog-2002-12-03
+++ b/WebCore/ChangeLog-2002-12-03
@@ -1,3 +1,12 @@
+2002-11-21  Darin Adler  <darin at apple.com>
+
+	- fixed 3107286 -- REGRESSION: unrepro assertion failure in KWQKHTMLPart.mm keyEvent
+
+        * kwq/KWQKHTMLPart.mm: (KWQKHTMLPart::keyEvent):
+	Handle case of nil document as well as case of nil focus node.
+
+        * kwq/WebCoreBridge.mm: Tweak whitespace.
+
 2002-11-20  Darin Adler  <darin at apple.com>
 
 	- fixed 3107383 -- clicking link on cnet.com leads to assertion failure
diff --git a/WebCore/ChangeLog-2003-10-25 b/WebCore/ChangeLog-2003-10-25
index 0fe1159..0934df1 100644
--- a/WebCore/ChangeLog-2003-10-25
+++ b/WebCore/ChangeLog-2003-10-25
@@ -1,3 +1,12 @@
+2002-11-21  Darin Adler  <darin at apple.com>
+
+	- fixed 3107286 -- REGRESSION: unrepro assertion failure in KWQKHTMLPart.mm keyEvent
+
+        * kwq/KWQKHTMLPart.mm: (KWQKHTMLPart::keyEvent):
+	Handle case of nil document as well as case of nil focus node.
+
+        * kwq/WebCoreBridge.mm: Tweak whitespace.
+
 2002-11-20  Darin Adler  <darin at apple.com>
 
 	- fixed 3107383 -- clicking link on cnet.com leads to assertion failure
diff --git a/WebCore/ChangeLog-2005-08-23 b/WebCore/ChangeLog-2005-08-23
index 0fe1159..0934df1 100644
--- a/WebCore/ChangeLog-2005-08-23
+++ b/WebCore/ChangeLog-2005-08-23
@@ -1,3 +1,12 @@
+2002-11-21  Darin Adler  <darin at apple.com>
+
+	- fixed 3107286 -- REGRESSION: unrepro assertion failure in KWQKHTMLPart.mm keyEvent
+
+        * kwq/KWQKHTMLPart.mm: (KWQKHTMLPart::keyEvent):
+	Handle case of nil document as well as case of nil focus node.
+
+        * kwq/WebCoreBridge.mm: Tweak whitespace.
+
 2002-11-20  Darin Adler  <darin at apple.com>
 
 	- fixed 3107383 -- clicking link on cnet.com leads to assertion failure
diff --git a/WebCore/kwq/KWQKHTMLPart.mm b/WebCore/kwq/KWQKHTMLPart.mm
index ef17fa4..b360e00 100644
--- a/WebCore/kwq/KWQKHTMLPart.mm
+++ b/WebCore/kwq/KWQKHTMLPart.mm
@@ -563,15 +563,18 @@ bool KWQKHTMLPart::keyEvent(NSEvent *event)
 		     QString::fromNSString([event characters]),
 		     [event isARepeat]);
 
-    ASSERT(part->xmlDocImpl());
-
-    if (!part->xmlDocImpl()->focusNode()) {
-	// Too early for events - possible unmatched key up from
-	// pressing return in the location bar.
+    // Check for cases where we are too early for events -- possible unmatched key up
+    // from pressing return in the location bar.
+    DocumentImpl *doc = document();
+    if (!doc) {
+        return false;
+    }
+    NodeImpl *node = doc->focusNode();
+    if (!node) {
 	return false;
     }
 
-    bool result = part->xmlDocImpl()->focusNode()->dispatchKeyEvent(&qEvent);
+    bool result = node->dispatchKeyEvent(&qEvent);
 
     // We want to send both a down and a press for the initial key event
     if (![event isARepeat]) {
@@ -582,7 +585,7 @@ bool KWQKHTMLPart::keyEvent(NSEvent *event)
 			 QString::fromNSString([event characters]),
 			 true);
 	
-	result = result && part->xmlDocImpl()->focusNode()->dispatchKeyEvent(&qEvent);
+	result = result && node->dispatchKeyEvent(&qEvent);
     }
 
     return result;
diff --git a/WebCore/kwq/WebCoreBridge.mm b/WebCore/kwq/WebCoreBridge.mm
index 40de49e..7100c80 100644
--- a/WebCore/kwq/WebCoreBridge.mm
+++ b/WebCore/kwq/WebCoreBridge.mm
@@ -820,7 +820,7 @@ static NSAttributedString *attributedString(DOM::NodeImpl *_startNode, int start
 
 - (BOOL)interceptKeyEvent:(NSEvent *)event toView:(NSView *)view
 {
-    return  _part->kwq->keyEvent(event);
+    return _part->kwq->keyEvent(event);
 }
 
 @end

-- 
WebKit Debian packaging