Changeset 19463 in webkit

Timestamp:

Feb 6, 2007 11:40:59 PM (17 years ago)

Author:

aliceli1

Message:

Reviewed by Maciej.

Added editing command functions for scrolling by page and moving the caret

• editing/Editor.cpp: (WebCore::execMoveUpByPageAndModifyCaret): (WebCore::execMoveDownByPageAndModifyCaret): (WebCore::CommandEntry::):

Location:

trunk/WebCore

Files:

• ChangeLog (modified) (1 diff)
• editing/Editor.cpp (modified) (3 diffs)

trunk/WebCore/ChangeLog

@@ +1 @@
+2007-02-06  Alice Liu  <alice.liu@apple.com>
+
+        Reviewed by Maciej.
+
+        Added editing command functions for scrolling by page and moving the caret
+
+        * editing/Editor.cpp:
+        (WebCore::execMoveUpByPageAndModifyCaret):
+        (WebCore::execMoveDownByPageAndModifyCaret):
+        (WebCore::CommandEntry::):
+
 2007-02-06  Justin Garcia  <justin.garcia@apple.com>
 

trunk/WebCore/editing/Editor.cpp

@@ -797 +797 @@
 }
 
+static bool execMoveUpByPageAndModifyCaret(Frame* frame)
+{
+    RenderObject* renderer = frame->document()->focusedNode()->renderer();
+    if (renderer->style()->overflowY() == OSCROLL
+        || renderer->style()->overflowY() == OAUTO
+        || renderer->isTextArea()) {
+        int height = -(frame->document()->focusedNode()->renderer()->clientHeight()-PAGE_KEEP);
+        bool handledScroll = renderer->scroll(ScrollUp, ScrollByPage);
+        bool handledCaretMove = frame->selectionController()->modify(SelectionController::MOVE, height);
+        return handledScroll || handledCaretMove;
+    }
+    return false;
+}
+
 static bool execMoveDown(Frame* frame)
 {
@@ -819 +833 @@
     frame->selectionController()->modify(SelectionController::EXTEND, SelectionController::FORWARD, CharacterGranularity, true);
     return true;
+}
+
+static bool execMoveDownByPageAndModifyCaret(Frame* frame)
+{
+    RenderObject* renderer = frame->document()->focusedNode()->renderer();
+    if (renderer->style()->overflowY() == OSCROLL
+        || renderer->style()->overflowY() == OAUTO
+        || renderer->isTextArea()) {
+        int height = frame->document()->focusedNode()->renderer()->clientHeight()-PAGE_KEEP;
+        bool handledScroll = renderer->scroll(ScrollDown, ScrollByPage);
+        bool handledCaretMove = frame->selectionController()->modify(SelectionController::MOVE, height);
+        return handledScroll || handledCaretMove;
+    }
+    return false;
 }
 
@@ -1122 +1150 @@
         { "MoveBackward", { hasEditableSelection, execMoveBackward } },
         { "MoveBackwardAndModifySelection", { hasEditableSelection, execMoveBackwardAndModifySelection } },
+        { "MoveUpByPageAndModifyCaret", { hasEditableSelection, execMoveUpByPageAndModifyCaret } },
         { "MoveDown", { hasEditableSelection, execMoveDown } },
         { "MoveDownAndModifySelection", { hasEditableSelection, execMoveDownAndModifySelection } },
         { "MoveForward", { hasEditableSelection, execMoveForward } },
         { "MoveForwardAndModifySelection", { hasEditableSelection, execMoveForwardAndModifySelection } },
+        { "MoveDownByPageAndModifyCaret", { hasEditableSelection, execMoveDownByPageAndModifyCaret } },
         { "MoveLeft", { hasEditableSelection, execMoveLeft } },
         { "MoveLeftAndModifySelection", { hasEditableSelection, execMoveLeftAndModifySelection } },