Changeset 21291 in webkit

Timestamp:

May 7, 2007 3:15:42 PM (17 years ago)

Author:

justing

Message:

LayoutTests:

Reviewed by darin

<rdar://problem/4895428> Can't drag selected To Do if it is not showing a due date

• editing/selection/4895428-1-expected.checksum: Added.
• editing/selection/4895428-1-expected.png: Added.
• editing/selection/4895428-1-expected.txt: Added.
• editing/selection/4895428-1.html: Added.

WebCore:

Reviewed by darin

<rdar://problem/4895428> Can't drag selected To Do if it is not showing a due date

The code in SelectionController::contains returned false
incorrectly if the selection end just after a table
and the position was inside that table.

• editing/SelectionController.cpp: (WebCore::SelectionController::contains): Compare the position with the ends of the selection and then use Range::comparePoint.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/editing/selection/4895428-1-expected.checksum (added)
• LayoutTests/editing/selection/4895428-1-expected.png (added)
• LayoutTests/editing/selection/4895428-1-expected.txt (added)
• LayoutTests/editing/selection/4895428-1.html (added)
• WebCore/ChangeLog (modified) (1 diff)
• WebCore/editing/SelectionController.cpp (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2007-05-07  Justin Garcia  <justin.garcia@apple.com>
+
+        Reviewed by darin
+        
+        <rdar://problem/4895428> Can't drag selected To Do if it is not showing a due date
+
+        * editing/selection/4895428-1-expected.checksum: Added.
+        * editing/selection/4895428-1-expected.png: Added.
+        * editing/selection/4895428-1-expected.txt: Added.
+        * editing/selection/4895428-1.html: Added.
+
 2007-05-07  Darin Adler  <darin@apple.com>
 

trunk/WebCore/ChangeLog

@@ +1 @@
+2007-05-07  Justin Garcia  <justin.garcia@apple.com>
+
+        Reviewed by darin
+        
+        <rdar://problem/4895428> Can't drag selected To Do if it is not showing a due date
+        
+        The code in SelectionController::contains returned false 
+        incorrectly if the selection end just after a table 
+        and the position was inside that table.
+
+        * editing/SelectionController.cpp:
+        (WebCore::SelectionController::contains): Compare the position with the
+        ends of the selection and then use Range::comparePoint.
+
 2007-05-07  Darin Adler  <darin@apple.com>
 

trunk/WebCore/editing/SelectionController.cpp

@@ -1016 +1016 @@
         return false;
     
-    Position pos(innerNode->renderer()->positionForPoint(result.localPoint()).deepEquivalent());
-    if (pos.isNull())
-        return false;
-
-    Node *n = start().node();
-    while (n) {
-        if (n == pos.node()) {
-            if ((n == start().node() && pos.offset() < start().offset()) ||
-                (n == end().node() && pos.offset() > end().offset())) {
-                return false;
-            }
-            return true;
-        }
-        if (n == end().node())
-            break;
-        n = n->traverseNextNode();
-    }
-
-   return false;
+    VisiblePosition visiblePos(innerNode->renderer()->positionForPoint(result.localPoint()));
+    if (visiblePos.isNull())
+        return false;
+    
+    // A selection doesn't contain it's endpoints.
+    if (visiblePos == m_sel.visibleStart() || visiblePos == m_sel.visibleEnd())
+        return false;
+        
+    RefPtr<Range> range = toRange();
+    ExceptionCode ec = 0;
+    Position p(visiblePos.deepEquivalent());
+    return range->comparePoint(p.node(), p.offset(), ec) == 0 && ec == 0;
 }