[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 4869a712a727c95626ff5105dab8bcb962b166d8
Author: kocienda <kocienda at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Fri Apr 23 17:02:31 2004 +0000

            Reviewed by Darin
    
            * khtml/editing/htmlediting_impl.cpp:
            (DeleteSelectionCommandImpl::doApply): Fix editing test
            regression with deleting whitespace at the end of the line.
            I just made this "improvement" yesterday, and the concept
            of the change is a good one, but instead of short-circuiting
            if the selection after deleting collapsible whitespace is a
            range (which can be confused by "significant" collapsed
            whitespace at the end of a line), short-circuit if the
            upstream start position equals the downstream end position.
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@6467 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog-2005-08-23 b/WebCore/ChangeLog-2005-08-23
index 2f1bda4..cbf346c 100644
--- a/WebCore/ChangeLog-2005-08-23
+++ b/WebCore/ChangeLog-2005-08-23
@@ -1,3 +1,17 @@
+2004-04-23  Ken Kocienda  <kocienda at apple.com>
+
+        Reviewed by Darin
+
+        * khtml/editing/htmlediting_impl.cpp:
+        (DeleteSelectionCommandImpl::doApply): Fix editing test
+        regression with deleting whitespace at the end of the line.
+        I just made this "improvement" yesterday, and the concept
+        of the change is a good one, but instead of short-circuiting
+        if the selection after deleting collapsible whitespace is a
+        range (which can be confused by "significant" collapsed 
+        whitespace at the end of a line), short-circuit if the 
+        upstream start position equals the downstream end position.
+
 === Safari-138 ===
 
 2004-04-23  Ken Kocienda  <kocienda at apple.com>
diff --git a/WebCore/khtml/editing/htmlediting_impl.cpp b/WebCore/khtml/editing/htmlediting_impl.cpp
index 48a810d..376f0f7 100644
--- a/WebCore/khtml/editing/htmlediting_impl.cpp
+++ b/WebCore/khtml/editing/htmlediting_impl.cpp
@@ -841,18 +841,18 @@ 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;
-
     Position upstreamStart(selection.start().equivalentUpstreamPosition());
     Position downstreamStart(selection.start().equivalentDownstreamPosition());
     Position upstreamEnd(selection.end().equivalentUpstreamPosition());
     Position downstreamEnd(selection.end().equivalentDownstreamPosition());
 
+    if (upstreamStart == downstreamEnd)
+        // after collapsing whitespace, selection is empty...no work to do
+        return;
+
+    Position endingPosition;
+    bool adjustEndingPositionDownstream = false;
+
     bool onlyWhitespace = containsOnlyWhitespace(upstreamStart, downstreamEnd);
  
     bool startCompletelySelected = !onlyWhitespace &&

-- 
WebKit Debian packaging