Changeset 24974 in webkit

Timestamp:

Aug 9, 2007 8:56:17 PM (17 years ago)

Author:

bdash

Message:

2007-08-09 Mitz Pettel <​mitz@webkit.org>

Reviewed by Justin Garcia.

• fix ​http://bugs.webkit.org/show_bug.cgi?id=14347 REGRESSION (r21291): Initiating a drag near the edge of a selection deselects it

Test: editing/selection/contains-boundaries.html

• editing/SelectionController.cpp: (WebCore::SelectionController::contains): Changed to return true for the selection boundaries too.

2007-08-09 Mitz Pettel <​mitz@webkit.org>

Reviewed by Justin Garcia.

• test for ​http://bugs.webkit.org/show_bug.cgi?id=14347 REGRESSION (r21291): Initiating a drag near the edge of a selection deselects it

• editing/selection/contains-boundaries-expected.checksum: Added.
• editing/selection/contains-boundaries-expected.png: Added.
• editing/selection/contains-boundaries-expected.txt: Added.
• editing/selection/contains-boundaries.html: Added.

Location:

trunk

Files:

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

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2007-08-09  Mitz Pettel  <mitz@webkit.org>
+
+        Reviewed by Justin Garcia.
+
+        - test for http://bugs.webkit.org/show_bug.cgi?id=14347
+          REGRESSION (r21291): Initiating a drag near the edge of a selection deselects it
+
+        * editing/selection/contains-boundaries-expected.checksum: Added.
+        * editing/selection/contains-boundaries-expected.png: Added.
+        * editing/selection/contains-boundaries-expected.txt: Added.
+        * editing/selection/contains-boundaries.html: Added.
+
 2007-08-09  Mitz Pettel  <mitz@webkit.org>
 

trunk/WebCore/ChangeLog

@@ +1 @@
+2007-08-09  Mitz Pettel  <mitz@webkit.org>
+
+        Reviewed by Justin Garcia.
+
+        - fix http://bugs.webkit.org/show_bug.cgi?id=14347
+          REGRESSION (r21291): Initiating a drag near the edge of a selection deselects it
+
+        Test: editing/selection/contains-boundaries.html
+
+        * editing/SelectionController.cpp:
+        (WebCore::SelectionController::contains): Changed to return true for the
+        selection boundaries too.
+
 2007-08-09  Mitz Pettel  <mitz@webkit.org>
 

trunk/WebCore/editing/SelectionController.cpp

@@ -1091 +1091 @@
     HitTestResult result(point);
     document->renderer()->layer()->hitTest(request, result);
-    Node *innerNode = result.innerNode();
+    Node* innerNode = result.innerNode();
     if (!innerNode || !innerNode->renderer())
         return false;
@@ -1105 +1105 @@
     Position end(m_sel.visibleEnd().deepEquivalent());
     Position p(visiblePos.deepEquivalent());
-    // A selection doesn't contain its endpoints.
-    return comparePositions(start, p) < 0 && comparePositions(p, end) < 0;
+
+    return comparePositions(start, p) <= 0 && comparePositions(p, end) <= 0;
 }