[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 57b1566fade8f8efb076613ac593b6a9431187be
Author: kocienda <kocienda at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Thu Apr 22 21:49:21 2004 +0000

            Reviewed by Hyatt
    
            * khtml/editing/htmlediting_impl.cpp:
            (DeleteSelectionCommandImpl::doApply): Short-circuit return if the selection
            is not a range after collapsing whitespace.
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@6458 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog-2005-08-23 b/WebCore/ChangeLog-2005-08-23
index 0692b94..45373a9 100644
--- a/WebCore/ChangeLog-2005-08-23
+++ b/WebCore/ChangeLog-2005-08-23
@@ -2,6 +2,14 @@
 
         Reviewed by Hyatt
 
+        * khtml/editing/htmlediting_impl.cpp:
+        (DeleteSelectionCommandImpl::doApply): Short-circuit return if the selection
+        is not a range after collapsing whitespace.
+
+2004-04-22  Ken Kocienda  <kocienda at apple.com>
+
+        Reviewed by Hyatt
+
         More work to bring code up to date with the latest API proposal.
 
         * khtml/xml/dom_selection.h: Fix typo in comment.
diff --git a/WebCore/khtml/editing/htmlediting_impl.cpp b/WebCore/khtml/editing/htmlediting_impl.cpp
index 1b80262..48a810d 100644
--- a/WebCore/khtml/editing/htmlediting_impl.cpp
+++ b/WebCore/khtml/editing/htmlediting_impl.cpp
@@ -841,6 +841,10 @@ void DeleteSelectionCommandImpl::doApply()
     deleteCollapsibleWhitespace(m_selectionToDelete);
     Selection selection = endingSelection();
 
+    if (selection.state() != Selection::RANGE)
+        // after collapsing whitespace, selection is not a range...no work to do
+        return;
+
     Position endingPosition;
     bool adjustEndingPositionDownstream = false;
 

-- 
WebKit Debian packaging