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

[kocienda]

The following commit has been merged in the debian/unstable branch:
commit 026c8df1df71f47ff2d0fd981ade08da6f555e31
Author: kocienda <kocienda at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Fri Jul 16 20:37:56 2004 +0000

            Reviewed by Hyatt
    
            Fix for this bug:
    
            <rdar://problem/3687216> editable inline causes crash when focused
    
            * khtml/xml/dom_docimpl.cpp:
            (DocumentImpl::relinquishesEditingFocus): Add null check for rootEditableElement.
            (DocumentImpl::acceptsEditingFocus): Ditto.
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@7041 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog-2005-08-23 b/WebCore/ChangeLog-2005-08-23
index 062d566..5061164 100644
--- a/WebCore/ChangeLog-2005-08-23
+++ b/WebCore/ChangeLog-2005-08-23
@@ -1,3 +1,15 @@
+2004-07-16  Ken Kocienda  <kocienda at apple.com>
+
+        Reviewed by Hyatt
+
+        Fix for this bug:
+        
+        <rdar://problem/3687216> editable inline causes crash when focused
+
+        * khtml/xml/dom_docimpl.cpp:
+        (DocumentImpl::relinquishesEditingFocus): Add null check for rootEditableElement.
+        (DocumentImpl::acceptsEditingFocus): Ditto.
+
 2004-07-16  David Hyatt  <hyatt at apple.com>
 
 	Fix for 3709337, crash when using display: compact.  Need to make sure that the isCompact() check in bidi.cpp is
diff --git a/WebCore/khtml/xml/dom_docimpl.cpp b/WebCore/khtml/xml/dom_docimpl.cpp
index 8c10196..7a54efb 100644
--- a/WebCore/khtml/xml/dom_docimpl.cpp
+++ b/WebCore/khtml/xml/dom_docimpl.cpp
@@ -2296,10 +2296,10 @@ bool DocumentImpl::relinquishesEditingFocus(NodeImpl *node)
     assert(node);
     assert(node->isContentEditable());
 
-    if (!part())
-        return true;
-    
     NodeImpl *rootImpl = node->rootEditableElement();
+    if (!part() || !rootImpl)
+        return false;
+
     Node root(rootImpl);
     Range range(root, 0, root, rootImpl->childNodeCount());
     return part()->shouldEndEditing(range);
@@ -2310,10 +2310,10 @@ bool DocumentImpl::acceptsEditingFocus(NodeImpl *node)
     assert(node);
     assert(node->isContentEditable());
 
-    if (!part())
-        return true;
-
     NodeImpl *rootImpl = node->rootEditableElement();
+    if (!part() || !rootImpl)
+        return false;
+
     Node root(rootImpl);
     Range range(root, 0, root, rootImpl->childNodeCount());
     return part()->shouldBeginEditing(range);

-- 
WebKit Debian packaging