Reviewed by me, coded by Darin

        - fixed <rdar://problem/3818305> REGRESSION (Mail): Shift + page up has no effect; should modify selection

        * khtml/editing/selection.cpp: (khtml::Selection::modify): Fix problem where vertical distance
        was used as a distance threshold, but was a negative number. Now make it positive at the start
        of the function (and make a couple related changes).

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@7735 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog-2005-08-23 b/WebCore/ChangeLog-2005-08-23
index 10c7c3efdf6d99db7d1b88e2383a4d7d5de6ab50..381a3d6e66260e10b7f8cc73b8908c4919649c29 100644 (file)
--- a/WebCore/ChangeLog-2005-08-23
+++ b/WebCore/ChangeLog-2005-08-23
@@ -1,3 +1,13 @@
+2004-09-30  Ken Kocienda  <kocienda@apple.com>
+
+        Reviewed by me, coded by Darin
+
+        - fixed <rdar://problem/3818305> REGRESSION (Mail): Shift + page up has no effect; should modify selection
+
+        * khtml/editing/selection.cpp: (khtml::Selection::modify): Fix problem where vertical distance
+        was used as a distance threshold, but was a negative number. Now make it positive at the start
+        of the function (and make a couple related changes).
+
 2004-09-29  Richard Williamson   <rjw@apple.com>
 
        Fixed <rdar://problem/3779998> bringing window to front or sending to back does not send focus/blur events to JavaScript window object

diff --git a/WebCore/khtml/editing/SelectionController.cpp b/WebCore/khtml/editing/SelectionController.cpp
index ebaa9831049d13a27834efb99098dad5fc26d6b8..b53bc03c378b95248cb9f1ba5b751ee6abb0cd6a 100644 (file)
--- a/WebCore/khtml/editing/SelectionController.cpp
+++ b/WebCore/khtml/editing/SelectionController.cpp
@@ -403,19 +403,22 @@ static bool caretY(const VisiblePosition &c, int &y)
 
 bool Selection::modify(EAlter alter, int verticalDistance)
 {
-    if (verticalDistance == 0) {
+    if (verticalDistance == 0)
         return false;
-    }
 
-    setModifyBias(alter, verticalDistance > 0 ? FORWARD : BACKWARD);
+    bool up = verticalDistance < 0;
+    if (up)
+        verticalDistance = -verticalDistance;
 
-    VisiblePosition pos;
+    setModifyBias(alter, up ? BACKWARD : FORWARD);
 
+    VisiblePosition pos;
     int xPos = 0; /* initialized only to make compiler happy */
+
     switch (alter) {
         case MOVE:
-            pos = VisiblePosition(verticalDistance > 0 ? m_end : m_start);
-            xPos = xPosForVerticalArrowNavigation(verticalDistance > 0 ? END : START, isRange());
+            pos = VisiblePosition(up ? m_start : m_end);
+            xPos = xPosForVerticalArrowNavigation(up ? START : END, isRange());
             break;
         case EXTEND:
             pos = VisiblePosition(m_extent);
@@ -426,7 +429,7 @@ bool Selection::modify(EAlter alter, int verticalDistance)
     int startY;
     if (!caretY(pos, startY))
         return false;
-    if (verticalDistance < 0)
+    if (up)
         startY = -startY;
     int lastY = startY;
 
@@ -434,15 +437,13 @@ bool Selection::modify(EAlter alter, int verticalDistance)
 
     VisiblePosition next;
     for (VisiblePosition p = pos; ; p = next) {
-        next = verticalDistance > 0
-            ? nextLinePosition(p, xPos)
-            : previousLinePosition(p, xPos);
+        next = (up ? previousLinePosition : nextLinePosition)(p, xPos);
         if (next.isNull() || next == p)
             break;
         int nextY;
         if (!caretY(next, nextY))
             break;
-        if (verticalDistance < 0)
+        if (up)
             nextY = -nextY;
         if (nextY - startY > verticalDistance)
             break;

diff --git a/WebCore/khtml/editing/selection.cpp b/WebCore/khtml/editing/selection.cpp
index ebaa9831049d13a27834efb99098dad5fc26d6b8..b53bc03c378b95248cb9f1ba5b751ee6abb0cd6a 100644 (file)
--- a/WebCore/khtml/editing/selection.cpp
+++ b/WebCore/khtml/editing/selection.cpp
@@ -403,19 +403,22 @@ static bool caretY(const VisiblePosition &c, int &y)
 
 bool Selection::modify(EAlter alter, int verticalDistance)
 {
-    if (verticalDistance == 0) {
+    if (verticalDistance == 0)
         return false;
-    }
 
-    setModifyBias(alter, verticalDistance > 0 ? FORWARD : BACKWARD);
+    bool up = verticalDistance < 0;
+    if (up)
+        verticalDistance = -verticalDistance;
 
-    VisiblePosition pos;
+    setModifyBias(alter, up ? BACKWARD : FORWARD);
 
+    VisiblePosition pos;
     int xPos = 0; /* initialized only to make compiler happy */
+
     switch (alter) {
         case MOVE:
-            pos = VisiblePosition(verticalDistance > 0 ? m_end : m_start);
-            xPos = xPosForVerticalArrowNavigation(verticalDistance > 0 ? END : START, isRange());
+            pos = VisiblePosition(up ? m_start : m_end);
+            xPos = xPosForVerticalArrowNavigation(up ? START : END, isRange());
             break;
         case EXTEND:
             pos = VisiblePosition(m_extent);
@@ -426,7 +429,7 @@ bool Selection::modify(EAlter alter, int verticalDistance)
     int startY;
     if (!caretY(pos, startY))
         return false;
-    if (verticalDistance < 0)
+    if (up)
         startY = -startY;
     int lastY = startY;
 
@@ -434,15 +437,13 @@ bool Selection::modify(EAlter alter, int verticalDistance)
 
     VisiblePosition next;
     for (VisiblePosition p = pos; ; p = next) {
-        next = verticalDistance > 0
-            ? nextLinePosition(p, xPos)
-            : previousLinePosition(p, xPos);
+        next = (up ? previousLinePosition : nextLinePosition)(p, xPos);
         if (next.isNull() || next == p)
             break;
         int nextY;
         if (!caretY(next, nextY))
             break;
-        if (verticalDistance < 0)
+        if (up)
             nextY = -nextY;
         if (nextY - startY > verticalDistance)
             break;