Changeset 89293 in webkit
- Timestamp:
- Jun 20, 2011 3:03:28 PM (13 years ago)
- Location:
- trunk/Source/WebCore
- Files:
-
- 8 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/Source/WebCore/ChangeLog
r89292 r89293 1 2011-06-20 Ryosuke Niwa <rniwa@webkit.org> 2 3 Reviewed by Darin Adler. 4 5 Various editing functions take boolean userTriggered but should be replaced by an enum 6 https://bugs.webkit.org/show_bug.cgi?id=62933 7 8 Replaced boolean userTriggered in many functions by new EUserTriggered enum. 9 10 * WebCore.exp.in: FrameSelection::modify's signature changed. 11 * accessibility/AccessibilityRenderObject.cpp: 12 (WebCore::AccessibilityRenderObject::setSelectedVisiblePositionRange): Calls FrameSelection::moveTo. 13 * editing/EditorCommand.cpp: 14 (WebCore::executeMoveBackward): Calls FrameSelection::modify. 15 (WebCore::executeMoveBackwardAndModifySelection): Ditto. 16 (WebCore::executeMoveDown): Ditto. 17 (WebCore::executeMoveDownAndModifySelection): Ditto. 18 (WebCore::executeMoveForward): Ditto. 19 (WebCore::executeMoveForwardAndModifySelection): Ditto. 20 (WebCore::executeMoveLeft): Ditto. 21 (WebCore::executeMoveLeftAndModifySelection): Ditto. 22 (WebCore::executeMovePageDown): Ditto. 23 (WebCore::executeMovePageDownAndModifySelection): Ditto. 24 (WebCore::executeMovePageUp): Ditto. 25 (WebCore::executeMovePageUpAndModifySelection): Ditto. 26 (WebCore::executeMoveRight): Ditto. 27 (WebCore::executeMoveRightAndModifySelection): Ditto. 28 (WebCore::executeMoveToBeginningOfDocument): Ditto. 29 (WebCore::executeMoveToBeginningOfDocumentAndModifySelection): Ditto. 30 (WebCore::executeMoveToBeginningOfLine): Ditto. 31 (WebCore::executeMoveToBeginningOfLineAndModifySelection): Ditto. 32 (WebCore::executeMoveToBeginningOfParagraph): Ditto. 33 (WebCore::executeMoveToBeginningOfParagraphAndModifySelection): Ditto. 34 (WebCore::executeMoveToBeginningOfSentence): Ditto. 35 (WebCore::executeMoveToBeginningOfSentenceAndModifySelection): Ditto. 36 (WebCore::executeMoveToEndOfDocument): Ditto. 37 (WebCore::executeMoveToEndOfDocumentAndModifySelection): Ditto. 38 (WebCore::executeMoveToEndOfSentence): Ditto. 39 (WebCore::executeMoveToEndOfSentenceAndModifySelection): Ditto. 40 (WebCore::executeMoveToEndOfLine): Ditto. 41 (WebCore::executeMoveToEndOfLineAndModifySelection): Ditto. 42 (WebCore::executeMoveToEndOfParagraph): Ditto. 43 (WebCore::executeMoveToEndOfParagraphAndModifySelection): Ditto. 44 (WebCore::executeMoveParagraphBackwardAndModifySelection): Ditto. 45 (WebCore::executeMoveParagraphForwardAndModifySelection): Ditto. 46 (WebCore::executeMoveUp): Ditto. 47 (WebCore::executeMoveUpAndModifySelection): Ditto. 48 (WebCore::executeMoveWordBackward): Ditto. 49 (WebCore::executeMoveWordBackwardAndModifySelection): Ditto. 50 (WebCore::executeMoveWordForward): Ditto. 51 (WebCore::executeMoveWordForwardAndModifySelection): Ditto. 52 (WebCore::executeMoveWordLeft): Ditto. 53 (WebCore::executeMoveWordLeftAndModifySelection): Ditto. 54 (WebCore::executeMoveWordRight): Ditto. 55 (WebCore::executeMoveWordRightAndModifySelection): Ditto. 56 (WebCore::executeMoveToLeftEndOfLine): Ditto. 57 (WebCore::executeMoveToLeftEndOfLineAndModifySelection): Ditto. 58 (WebCore::executeMoveToRightEndOfLine): Ditto. 59 (WebCore::executeMoveToRightEndOfLineAndModifySelection): Ditto. 60 * editing/FrameSelection.cpp: 61 (WebCore::FrameSelection::moveTo): Takes EUserTriggered instead of a boolean. 62 (WebCore::FrameSelection::setSelection): Ditto. 63 (WebCore::FrameSelection::modify): Ditto. 64 (WebCore::FrameSelection::setStart): Ditto. 65 (WebCore::FrameSelection::setEnd): Ditto. 66 (WebCore::FrameSelection::setBase): Ditto. 67 (WebCore::FrameSelection::setExtent): Ditto. 68 (WebCore::FrameSelection::selectAll): Ditto. 69 (WebCore::FrameSelection::notifyRendererOfSelectionChange): Ditto. 70 * editing/FrameSelection.h: Extracted EUserTriggered out of SetSelectionOption; SetSelectionOptions 71 now takes the union of values of SetSelectionOption and EUserTriggered. 72 (WebCore::FrameSelection::selectionOptionsToUserTriggered): Converts SetSelectionOptions to 73 EUserTriggered. 74 * page/DOMSelection.cpp: 75 (WebCore::DOMSelection::modify): Calls FrameSelection::modify. 76 * page/EventHandler.cpp: 77 (WebCore::EventHandler::handleMouseReleaseEvent): Ditto. 78 (WebCore::handleKeyboardSelectionMovement): Ditto. 79 1 80 2011-06-20 Jer Noble <jer.noble@apple.com> 2 81 -
trunk/Source/WebCore/WebCore.exp.in
r89271 r89293 355 355 __ZN7WebCore14FrameSelection20setSelectionFromNoneEv 356 356 __ZN7WebCore14FrameSelection5clearEv 357 __ZN7WebCore14FrameSelection6modifyENS0_11EAlterationENS_18SelectionDirectionENS_15TextGranularityE b357 __ZN7WebCore14FrameSelection6modifyENS0_11EAlterationENS_18SelectionDirectionENS_15TextGranularityENS_14EUserTriggeredE 358 358 __ZN7WebCore14FrameSelection9selectAllEv 359 359 __ZN7WebCore14FrameSelectionC1EPNS_5FrameE -
trunk/Source/WebCore/accessibility/AccessibilityRenderObject.cpp
r89204 r89293 2576 2576 // make selection and tell the document to use it. if it's zero length, then move to that position 2577 2577 if (range.start == range.end) 2578 m_renderer->frame()->selection()->moveTo(range.start, true);2578 m_renderer->frame()->selection()->moveTo(range.start, UserTriggered); 2579 2579 else { 2580 2580 VisibleSelection newSelection = VisibleSelection(range.start, range.end); -
trunk/Source/WebCore/editing/EditorCommand.cpp
r89263 r89293 607 607 static bool executeMoveBackward(Frame* frame, Event*, EditorCommandSource, const String&) 608 608 { 609 frame->selection()->modify(FrameSelection::AlterationMove, DirectionBackward, CharacterGranularity, true);609 frame->selection()->modify(FrameSelection::AlterationMove, DirectionBackward, CharacterGranularity, UserTriggered); 610 610 return true; 611 611 } … … 613 613 static bool executeMoveBackwardAndModifySelection(Frame* frame, Event*, EditorCommandSource, const String&) 614 614 { 615 frame->selection()->modify(FrameSelection::AlterationExtend, DirectionBackward, CharacterGranularity, true);615 frame->selection()->modify(FrameSelection::AlterationExtend, DirectionBackward, CharacterGranularity, UserTriggered); 616 616 return true; 617 617 } … … 619 619 static bool executeMoveDown(Frame* frame, Event*, EditorCommandSource, const String&) 620 620 { 621 return frame->selection()->modify(FrameSelection::AlterationMove, DirectionForward, LineGranularity, true);621 return frame->selection()->modify(FrameSelection::AlterationMove, DirectionForward, LineGranularity, UserTriggered); 622 622 } 623 623 624 624 static bool executeMoveDownAndModifySelection(Frame* frame, Event*, EditorCommandSource, const String&) 625 625 { 626 frame->selection()->modify(FrameSelection::AlterationExtend, DirectionForward, LineGranularity, true);626 frame->selection()->modify(FrameSelection::AlterationExtend, DirectionForward, LineGranularity, UserTriggered); 627 627 return true; 628 628 } … … 630 630 static bool executeMoveForward(Frame* frame, Event*, EditorCommandSource, const String&) 631 631 { 632 frame->selection()->modify(FrameSelection::AlterationMove, DirectionForward, CharacterGranularity, true);632 frame->selection()->modify(FrameSelection::AlterationMove, DirectionForward, CharacterGranularity, UserTriggered); 633 633 return true; 634 634 } … … 636 636 static bool executeMoveForwardAndModifySelection(Frame* frame, Event*, EditorCommandSource, const String&) 637 637 { 638 frame->selection()->modify(FrameSelection::AlterationExtend, DirectionForward, CharacterGranularity, true);638 frame->selection()->modify(FrameSelection::AlterationExtend, DirectionForward, CharacterGranularity, UserTriggered); 639 639 return true; 640 640 } … … 642 642 static bool executeMoveLeft(Frame* frame, Event*, EditorCommandSource, const String&) 643 643 { 644 return frame->selection()->modify(FrameSelection::AlterationMove, DirectionLeft, CharacterGranularity, true);644 return frame->selection()->modify(FrameSelection::AlterationMove, DirectionLeft, CharacterGranularity, UserTriggered); 645 645 } 646 646 647 647 static bool executeMoveLeftAndModifySelection(Frame* frame, Event*, EditorCommandSource, const String&) 648 648 { 649 frame->selection()->modify(FrameSelection::AlterationExtend, DirectionLeft, CharacterGranularity, true);649 frame->selection()->modify(FrameSelection::AlterationExtend, DirectionLeft, CharacterGranularity, UserTriggered); 650 650 return true; 651 651 } … … 656 656 if (!distance) 657 657 return false; 658 return frame->selection()->modify(FrameSelection::AlterationMove, distance, FrameSelection::DirectionDown, true, FrameSelection::AlignCursorOnScrollAlways); 658 return frame->selection()->modify(FrameSelection::AlterationMove, distance, FrameSelection::DirectionDown, 659 UserTriggered, FrameSelection::AlignCursorOnScrollAlways); 659 660 } 660 661 … … 664 665 if (!distance) 665 666 return false; 666 return frame->selection()->modify(FrameSelection::AlterationExtend, distance, FrameSelection::DirectionDown, true, FrameSelection::AlignCursorOnScrollAlways); 667 return frame->selection()->modify(FrameSelection::AlterationExtend, distance, FrameSelection::DirectionDown, 668 UserTriggered, FrameSelection::AlignCursorOnScrollAlways); 667 669 } 668 670 … … 672 674 if (!distance) 673 675 return false; 674 return frame->selection()->modify(FrameSelection::AlterationMove, distance, FrameSelection::DirectionUp, true, FrameSelection::AlignCursorOnScrollAlways); 676 return frame->selection()->modify(FrameSelection::AlterationMove, distance, FrameSelection::DirectionUp, 677 UserTriggered, FrameSelection::AlignCursorOnScrollAlways); 675 678 } 676 679 … … 680 683 if (!distance) 681 684 return false; 682 return frame->selection()->modify(FrameSelection::AlterationExtend, distance, FrameSelection::DirectionUp, true, FrameSelection::AlignCursorOnScrollAlways); 685 return frame->selection()->modify(FrameSelection::AlterationExtend, distance, FrameSelection::DirectionUp, 686 UserTriggered, FrameSelection::AlignCursorOnScrollAlways); 683 687 } 684 688 685 689 static bool executeMoveRight(Frame* frame, Event*, EditorCommandSource, const String&) 686 690 { 687 return frame->selection()->modify(FrameSelection::AlterationMove, DirectionRight, CharacterGranularity, true);691 return frame->selection()->modify(FrameSelection::AlterationMove, DirectionRight, CharacterGranularity, UserTriggered); 688 692 } 689 693 690 694 static bool executeMoveRightAndModifySelection(Frame* frame, Event*, EditorCommandSource, const String&) 691 695 { 692 frame->selection()->modify(FrameSelection::AlterationExtend, DirectionRight, CharacterGranularity, true);696 frame->selection()->modify(FrameSelection::AlterationExtend, DirectionRight, CharacterGranularity, UserTriggered); 693 697 return true; 694 698 } … … 696 700 static bool executeMoveToBeginningOfDocument(Frame* frame, Event*, EditorCommandSource, const String&) 697 701 { 698 frame->selection()->modify(FrameSelection::AlterationMove, DirectionBackward, DocumentBoundary, true);702 frame->selection()->modify(FrameSelection::AlterationMove, DirectionBackward, DocumentBoundary, UserTriggered); 699 703 return true; 700 704 } … … 702 706 static bool executeMoveToBeginningOfDocumentAndModifySelection(Frame* frame, Event*, EditorCommandSource, const String&) 703 707 { 704 frame->selection()->modify(FrameSelection::AlterationExtend, DirectionBackward, DocumentBoundary, true);708 frame->selection()->modify(FrameSelection::AlterationExtend, DirectionBackward, DocumentBoundary, UserTriggered); 705 709 return true; 706 710 } … … 708 712 static bool executeMoveToBeginningOfLine(Frame* frame, Event*, EditorCommandSource, const String&) 709 713 { 710 frame->selection()->modify(FrameSelection::AlterationMove, DirectionBackward, LineBoundary, true);714 frame->selection()->modify(FrameSelection::AlterationMove, DirectionBackward, LineBoundary, UserTriggered); 711 715 return true; 712 716 } … … 714 718 static bool executeMoveToBeginningOfLineAndModifySelection(Frame* frame, Event*, EditorCommandSource, const String&) 715 719 { 716 frame->selection()->modify(FrameSelection::AlterationExtend, DirectionBackward, LineBoundary, true);720 frame->selection()->modify(FrameSelection::AlterationExtend, DirectionBackward, LineBoundary, UserTriggered); 717 721 return true; 718 722 } … … 720 724 static bool executeMoveToBeginningOfParagraph(Frame* frame, Event*, EditorCommandSource, const String&) 721 725 { 722 frame->selection()->modify(FrameSelection::AlterationMove, DirectionBackward, ParagraphBoundary, true);726 frame->selection()->modify(FrameSelection::AlterationMove, DirectionBackward, ParagraphBoundary, UserTriggered); 723 727 return true; 724 728 } … … 726 730 static bool executeMoveToBeginningOfParagraphAndModifySelection(Frame* frame, Event*, EditorCommandSource, const String&) 727 731 { 728 frame->selection()->modify(FrameSelection::AlterationExtend, DirectionBackward, ParagraphBoundary, true);732 frame->selection()->modify(FrameSelection::AlterationExtend, DirectionBackward, ParagraphBoundary, UserTriggered); 729 733 return true; 730 734 } … … 732 736 static bool executeMoveToBeginningOfSentence(Frame* frame, Event*, EditorCommandSource, const String&) 733 737 { 734 frame->selection()->modify(FrameSelection::AlterationMove, DirectionBackward, SentenceBoundary, true);738 frame->selection()->modify(FrameSelection::AlterationMove, DirectionBackward, SentenceBoundary, UserTriggered); 735 739 return true; 736 740 } … … 738 742 static bool executeMoveToBeginningOfSentenceAndModifySelection(Frame* frame, Event*, EditorCommandSource, const String&) 739 743 { 740 frame->selection()->modify(FrameSelection::AlterationExtend, DirectionBackward, SentenceBoundary, true);744 frame->selection()->modify(FrameSelection::AlterationExtend, DirectionBackward, SentenceBoundary, UserTriggered); 741 745 return true; 742 746 } … … 744 748 static bool executeMoveToEndOfDocument(Frame* frame, Event*, EditorCommandSource, const String&) 745 749 { 746 frame->selection()->modify(FrameSelection::AlterationMove, DirectionForward, DocumentBoundary, true);750 frame->selection()->modify(FrameSelection::AlterationMove, DirectionForward, DocumentBoundary, UserTriggered); 747 751 return true; 748 752 } … … 750 754 static bool executeMoveToEndOfDocumentAndModifySelection(Frame* frame, Event*, EditorCommandSource, const String&) 751 755 { 752 frame->selection()->modify(FrameSelection::AlterationExtend, DirectionForward, DocumentBoundary, true);756 frame->selection()->modify(FrameSelection::AlterationExtend, DirectionForward, DocumentBoundary, UserTriggered); 753 757 return true; 754 758 } … … 756 760 static bool executeMoveToEndOfSentence(Frame* frame, Event*, EditorCommandSource, const String&) 757 761 { 758 frame->selection()->modify(FrameSelection::AlterationMove, DirectionForward, SentenceBoundary, true);762 frame->selection()->modify(FrameSelection::AlterationMove, DirectionForward, SentenceBoundary, UserTriggered); 759 763 return true; 760 764 } … … 762 766 static bool executeMoveToEndOfSentenceAndModifySelection(Frame* frame, Event*, EditorCommandSource, const String&) 763 767 { 764 frame->selection()->modify(FrameSelection::AlterationExtend, DirectionForward, SentenceBoundary, true);768 frame->selection()->modify(FrameSelection::AlterationExtend, DirectionForward, SentenceBoundary, UserTriggered); 765 769 return true; 766 770 } … … 768 772 static bool executeMoveToEndOfLine(Frame* frame, Event*, EditorCommandSource, const String&) 769 773 { 770 frame->selection()->modify(FrameSelection::AlterationMove, DirectionForward, LineBoundary, true);774 frame->selection()->modify(FrameSelection::AlterationMove, DirectionForward, LineBoundary, UserTriggered); 771 775 return true; 772 776 } … … 774 778 static bool executeMoveToEndOfLineAndModifySelection(Frame* frame, Event*, EditorCommandSource, const String&) 775 779 { 776 frame->selection()->modify(FrameSelection::AlterationExtend, DirectionForward, LineBoundary, true);780 frame->selection()->modify(FrameSelection::AlterationExtend, DirectionForward, LineBoundary, UserTriggered); 777 781 return true; 778 782 } … … 780 784 static bool executeMoveToEndOfParagraph(Frame* frame, Event*, EditorCommandSource, const String&) 781 785 { 782 frame->selection()->modify(FrameSelection::AlterationMove, DirectionForward, ParagraphBoundary, true);786 frame->selection()->modify(FrameSelection::AlterationMove, DirectionForward, ParagraphBoundary, UserTriggered); 783 787 return true; 784 788 } … … 786 790 static bool executeMoveToEndOfParagraphAndModifySelection(Frame* frame, Event*, EditorCommandSource, const String&) 787 791 { 788 frame->selection()->modify(FrameSelection::AlterationExtend, DirectionForward, ParagraphBoundary, true);792 frame->selection()->modify(FrameSelection::AlterationExtend, DirectionForward, ParagraphBoundary, UserTriggered); 789 793 return true; 790 794 } … … 792 796 static bool executeMoveParagraphBackwardAndModifySelection(Frame* frame, Event*, EditorCommandSource, const String&) 793 797 { 794 frame->selection()->modify(FrameSelection::AlterationExtend, DirectionBackward, ParagraphGranularity, true);798 frame->selection()->modify(FrameSelection::AlterationExtend, DirectionBackward, ParagraphGranularity, UserTriggered); 795 799 return true; 796 800 } … … 798 802 static bool executeMoveParagraphForwardAndModifySelection(Frame* frame, Event*, EditorCommandSource, const String&) 799 803 { 800 frame->selection()->modify(FrameSelection::AlterationExtend, DirectionForward, ParagraphGranularity, true);804 frame->selection()->modify(FrameSelection::AlterationExtend, DirectionForward, ParagraphGranularity, UserTriggered); 801 805 return true; 802 806 } … … 804 808 static bool executeMoveUp(Frame* frame, Event*, EditorCommandSource, const String&) 805 809 { 806 return frame->selection()->modify(FrameSelection::AlterationMove, DirectionBackward, LineGranularity, true);810 return frame->selection()->modify(FrameSelection::AlterationMove, DirectionBackward, LineGranularity, UserTriggered); 807 811 } 808 812 809 813 static bool executeMoveUpAndModifySelection(Frame* frame, Event*, EditorCommandSource, const String&) 810 814 { 811 frame->selection()->modify(FrameSelection::AlterationExtend, DirectionBackward, LineGranularity, true);815 frame->selection()->modify(FrameSelection::AlterationExtend, DirectionBackward, LineGranularity, UserTriggered); 812 816 return true; 813 817 } … … 815 819 static bool executeMoveWordBackward(Frame* frame, Event*, EditorCommandSource, const String&) 816 820 { 817 frame->selection()->modify(FrameSelection::AlterationMove, DirectionBackward, WordGranularity, true);821 frame->selection()->modify(FrameSelection::AlterationMove, DirectionBackward, WordGranularity, UserTriggered); 818 822 return true; 819 823 } … … 821 825 static bool executeMoveWordBackwardAndModifySelection(Frame* frame, Event*, EditorCommandSource, const String&) 822 826 { 823 frame->selection()->modify(FrameSelection::AlterationExtend, DirectionBackward, WordGranularity, true);827 frame->selection()->modify(FrameSelection::AlterationExtend, DirectionBackward, WordGranularity, UserTriggered); 824 828 return true; 825 829 } … … 827 831 static bool executeMoveWordForward(Frame* frame, Event*, EditorCommandSource, const String&) 828 832 { 829 frame->selection()->modify(FrameSelection::AlterationMove, DirectionForward, WordGranularity, true);833 frame->selection()->modify(FrameSelection::AlterationMove, DirectionForward, WordGranularity, UserTriggered); 830 834 return true; 831 835 } … … 833 837 static bool executeMoveWordForwardAndModifySelection(Frame* frame, Event*, EditorCommandSource, const String&) 834 838 { 835 frame->selection()->modify(FrameSelection::AlterationExtend, DirectionForward, WordGranularity, true);839 frame->selection()->modify(FrameSelection::AlterationExtend, DirectionForward, WordGranularity, UserTriggered); 836 840 return true; 837 841 } … … 839 843 static bool executeMoveWordLeft(Frame* frame, Event*, EditorCommandSource, const String&) 840 844 { 841 frame->selection()->modify(FrameSelection::AlterationMove, DirectionLeft, WordGranularity, true);845 frame->selection()->modify(FrameSelection::AlterationMove, DirectionLeft, WordGranularity, UserTriggered); 842 846 return true; 843 847 } … … 845 849 static bool executeMoveWordLeftAndModifySelection(Frame* frame, Event*, EditorCommandSource, const String&) 846 850 { 847 frame->selection()->modify(FrameSelection::AlterationExtend, DirectionLeft, WordGranularity, true);851 frame->selection()->modify(FrameSelection::AlterationExtend, DirectionLeft, WordGranularity, UserTriggered); 848 852 return true; 849 853 } … … 851 855 static bool executeMoveWordRight(Frame* frame, Event*, EditorCommandSource, const String&) 852 856 { 853 frame->selection()->modify(FrameSelection::AlterationMove, DirectionRight, WordGranularity, true);857 frame->selection()->modify(FrameSelection::AlterationMove, DirectionRight, WordGranularity, UserTriggered); 854 858 return true; 855 859 } … … 857 861 static bool executeMoveWordRightAndModifySelection(Frame* frame, Event*, EditorCommandSource, const String&) 858 862 { 859 frame->selection()->modify(FrameSelection::AlterationExtend, DirectionRight, WordGranularity, true);863 frame->selection()->modify(FrameSelection::AlterationExtend, DirectionRight, WordGranularity, UserTriggered); 860 864 return true; 861 865 } … … 863 867 static bool executeMoveToLeftEndOfLine(Frame* frame, Event*, EditorCommandSource, const String&) 864 868 { 865 frame->selection()->modify(FrameSelection::AlterationMove, DirectionLeft, LineBoundary, true);869 frame->selection()->modify(FrameSelection::AlterationMove, DirectionLeft, LineBoundary, UserTriggered); 866 870 return true; 867 871 } … … 869 873 static bool executeMoveToLeftEndOfLineAndModifySelection(Frame* frame, Event*, EditorCommandSource, const String&) 870 874 { 871 frame->selection()->modify(FrameSelection::AlterationExtend, DirectionLeft, LineBoundary, true);875 frame->selection()->modify(FrameSelection::AlterationExtend, DirectionLeft, LineBoundary, UserTriggered); 872 876 return true; 873 877 } … … 875 879 static bool executeMoveToRightEndOfLine(Frame* frame, Event*, EditorCommandSource, const String&) 876 880 { 877 frame->selection()->modify(FrameSelection::AlterationMove, DirectionRight, LineBoundary, true);881 frame->selection()->modify(FrameSelection::AlterationMove, DirectionRight, LineBoundary, UserTriggered); 878 882 return true; 879 883 } … … 881 885 static bool executeMoveToRightEndOfLineAndModifySelection(Frame* frame, Event*, EditorCommandSource, const String&) 882 886 { 883 frame->selection()->modify(FrameSelection::AlterationExtend, DirectionRight, LineBoundary, true);887 frame->selection()->modify(FrameSelection::AlterationExtend, DirectionRight, LineBoundary, UserTriggered); 884 888 return true; 885 889 } -
trunk/Source/WebCore/editing/FrameSelection.cpp
r89263 r89293 104 104 } 105 105 106 void FrameSelection::moveTo(const VisiblePosition &pos, bool userTriggered, CursorAlignOnScroll align) 107 { 108 SetSelectionOptions options = CloseTyping | ClearTypingStyle; 109 if (userTriggered) 110 options |= UserTriggered; 106 void FrameSelection::moveTo(const VisiblePosition &pos, EUserTriggered userTriggered, CursorAlignOnScroll align) 107 { 108 SetSelectionOptions options = CloseTyping | ClearTypingStyle | userTriggered; 111 109 setSelection(VisibleSelection(pos.deepEquivalent(), pos.deepEquivalent(), pos.affinity()), options, align); 112 110 } 113 111 114 void FrameSelection::moveTo(const VisiblePosition &base, const VisiblePosition &extent, bool userTriggered) 115 { 116 SetSelectionOptions options = CloseTyping | ClearTypingStyle; 117 if (userTriggered) 118 options |= UserTriggered; 112 void FrameSelection::moveTo(const VisiblePosition &base, const VisiblePosition &extent, EUserTriggered userTriggered) 113 { 114 SetSelectionOptions options = CloseTyping | ClearTypingStyle | userTriggered; 119 115 setSelection(VisibleSelection(base.deepEquivalent(), extent.deepEquivalent(), base.affinity()), options); 120 116 } 121 117 122 void FrameSelection::moveTo(const Position &pos, EAffinity affinity, bool userTriggered) 123 { 124 SetSelectionOptions options = CloseTyping | ClearTypingStyle; 125 if (userTriggered) 126 options |= UserTriggered; 118 void FrameSelection::moveTo(const Position &pos, EAffinity affinity, EUserTriggered userTriggered) 119 { 120 SetSelectionOptions options = CloseTyping | ClearTypingStyle | userTriggered; 127 121 setSelection(VisibleSelection(pos, affinity), options); 128 122 } 129 123 130 void FrameSelection::moveTo(const Range *r, EAffinity affinity, bool userTriggered) 131 { 132 SetSelectionOptions options = CloseTyping | ClearTypingStyle; 133 if (userTriggered) 134 options |= UserTriggered; 124 void FrameSelection::moveTo(const Range *r, EAffinity affinity, EUserTriggered userTriggered) 125 { 126 SetSelectionOptions options = CloseTyping | ClearTypingStyle | userTriggered; 135 127 VisibleSelection selection = r ? VisibleSelection(r->startPosition(), r->endPosition(), affinity) : VisibleSelection(Position(), Position(), affinity); 136 128 setSelection(selection, options); 137 129 } 138 130 139 void FrameSelection::moveTo(const Position &base, const Position &extent, EAffinity affinity, bool userTriggered) 140 { 141 SetSelectionOptions options = CloseTyping | ClearTypingStyle; 142 if (userTriggered) 143 options |= UserTriggered; 131 void FrameSelection::moveTo(const Position &base, const Position &extent, EAffinity affinity, EUserTriggered userTriggered) 132 { 133 SetSelectionOptions options = CloseTyping | ClearTypingStyle | userTriggered; 144 134 setSelection(VisibleSelection(base, extent, affinity), options); 145 135 } … … 168 158 bool closeTyping = options & CloseTyping; 169 159 bool shouldClearTypingStyle = options & ClearTypingStyle; 170 bool userTriggered = options & UserTriggered;160 EUserTriggered userTriggered = selectionOptionsToUserTriggered(options); 171 161 172 162 setIsDirectional(directionalityPolicy == MakeDirectionalSelection); … … 215 205 notifyRendererOfSelectionChange(userTriggered); 216 206 m_frame->editor()->respondToChangedSelection(oldSelection, options); 217 if (userTriggered ) {207 if (userTriggered == UserTriggered) { 218 208 ScrollAlignment alignment; 219 209 … … 788 778 } 789 779 790 bool FrameSelection::modify(EAlteration alter, SelectionDirection direction, TextGranularity granularity, booluserTriggered)791 { 792 if (userTriggered ) {780 bool FrameSelection::modify(EAlteration alter, SelectionDirection direction, TextGranularity granularity, EUserTriggered userTriggered) 781 { 782 if (userTriggered == UserTriggered) { 793 783 FrameSelection trialFrameSelection; 794 784 trialFrameSelection.setSelection(m_selection); 795 785 trialFrameSelection.setIsDirectional(m_isDirectional); 796 trialFrameSelection.modify(alter, direction, granularity, false);786 trialFrameSelection.modify(alter, direction, granularity, NotUserTriggered); 797 787 798 788 bool change = shouldChangeSelection(trialFrameSelection.selection()); … … 868 858 m_xPosForVerticalArrowNavigation = x; 869 859 870 if (userTriggered )860 if (userTriggered == UserTriggered) 871 861 m_granularity = CharacterGranularity; 872 862 … … 889 879 } 890 880 891 bool FrameSelection::modify(EAlteration alter, unsigned verticalDistance, VerticalDirection direction, booluserTriggered, CursorAlignOnScroll align)881 bool FrameSelection::modify(EAlteration alter, unsigned verticalDistance, VerticalDirection direction, EUserTriggered userTriggered, CursorAlignOnScroll align) 892 882 { 893 883 if (!verticalDistance) 894 884 return false; 895 885 896 if (userTriggered ) {886 if (userTriggered == UserTriggered) { 897 887 FrameSelection trialFrameSelection; 898 888 trialFrameSelection.setSelection(m_selection); 899 889 trialFrameSelection.setIsDirectional(m_isDirectional); 900 trialFrameSelection.modify(alter, verticalDistance, direction, false);890 trialFrameSelection.modify(alter, verticalDistance, direction, NotUserTriggered); 901 891 902 892 bool change = shouldChangeSelection(trialFrameSelection.selection()); … … 960 950 } 961 951 962 if (userTriggered )952 if (userTriggered == UserTriggered) 963 953 m_granularity = CharacterGranularity; 964 954 … … 1013 1003 } 1014 1004 1015 void FrameSelection::setStart(const VisiblePosition &pos, bool userTriggered)1005 void FrameSelection::setStart(const VisiblePosition &pos, EUserTriggered trigger) 1016 1006 { 1017 1007 if (m_selection.isBaseFirst()) 1018 setBase(pos, userTriggered);1008 setBase(pos, trigger); 1019 1009 else 1020 setExtent(pos, userTriggered);1021 } 1022 1023 void FrameSelection::setEnd(const VisiblePosition &pos, bool userTriggered)1010 setExtent(pos, trigger); 1011 } 1012 1013 void FrameSelection::setEnd(const VisiblePosition &pos, EUserTriggered trigger) 1024 1014 { 1025 1015 if (m_selection.isBaseFirst()) 1026 setExtent(pos, userTriggered);1016 setExtent(pos, trigger); 1027 1017 else 1028 setBase(pos, userTriggered); 1029 } 1030 1031 void FrameSelection::setBase(const VisiblePosition &pos, bool userTriggered) 1032 { 1033 SetSelectionOptions options = CloseTyping | ClearTypingStyle; 1034 if (userTriggered) 1035 options |= UserTriggered; 1036 setSelection(VisibleSelection(pos.deepEquivalent(), m_selection.extent(), pos.affinity()), options); 1037 } 1038 1039 void FrameSelection::setExtent(const VisiblePosition &pos, bool userTriggered) 1040 { 1041 SetSelectionOptions options = CloseTyping | ClearTypingStyle; 1042 if (userTriggered) 1043 options |= UserTriggered; 1044 setSelection(VisibleSelection(m_selection.base(), pos.deepEquivalent(), pos.affinity()), options); 1045 } 1046 1047 void FrameSelection::setBase(const Position &pos, EAffinity affinity, bool userTriggered) 1048 { 1049 SetSelectionOptions options = CloseTyping | ClearTypingStyle; 1050 if (userTriggered) 1051 options |= UserTriggered; 1052 setSelection(VisibleSelection(pos, m_selection.extent(), affinity), options); 1053 } 1054 1055 void FrameSelection::setExtent(const Position &pos, EAffinity affinity, bool userTriggered) 1056 { 1057 SetSelectionOptions options = CloseTyping | ClearTypingStyle; 1058 if (userTriggered) 1059 options |= UserTriggered; 1060 setSelection(VisibleSelection(m_selection.base(), pos, affinity), options); 1018 setBase(pos, trigger); 1019 } 1020 1021 void FrameSelection::setBase(const VisiblePosition &pos, EUserTriggered userTriggered) 1022 { 1023 setSelection(VisibleSelection(pos.deepEquivalent(), m_selection.extent(), pos.affinity()), CloseTyping | ClearTypingStyle | userTriggered); 1024 } 1025 1026 void FrameSelection::setExtent(const VisiblePosition &pos, EUserTriggered userTriggered) 1027 { 1028 setSelection(VisibleSelection(m_selection.base(), pos.deepEquivalent(), pos.affinity()), CloseTyping | ClearTypingStyle | userTriggered); 1029 } 1030 1031 void FrameSelection::setBase(const Position &pos, EAffinity affinity, EUserTriggered userTriggered) 1032 { 1033 setSelection(VisibleSelection(pos, m_selection.extent(), affinity), CloseTyping | ClearTypingStyle | userTriggered); 1034 } 1035 1036 void FrameSelection::setExtent(const Position &pos, EAffinity affinity, EUserTriggered userTriggered) 1037 { 1038 setSelection(VisibleSelection(m_selection.base(), pos, affinity), CloseTyping | ClearTypingStyle | userTriggered); 1061 1039 } 1062 1040 … … 1480 1458 1481 1459 selectFrameElementInParentIfFullySelected(); 1482 notifyRendererOfSelectionChange( true);1460 notifyRendererOfSelectionChange(UserTriggered); 1483 1461 } 1484 1462 … … 1705 1683 } 1706 1684 1707 void FrameSelection::notifyRendererOfSelectionChange( booluserTriggered)1685 void FrameSelection::notifyRendererOfSelectionChange(EUserTriggered userTriggered) 1708 1686 { 1709 1687 m_frame->document()->updateStyleIfNeeded(); … … 1716 1694 return; 1717 1695 1718 toRenderTextControl(renderer)->selectionChanged(userTriggered );1696 toRenderTextControl(renderer)->selectionChanged(userTriggered == UserTriggered); 1719 1697 } 1720 1698 -
trunk/Source/WebCore/editing/FrameSelection.h
r89263 r89293 48 48 49 49 enum DirectionalityPolicy { MakeNonDirectionalSelection, MakeDirectionalSelection }; 50 enum EUserTriggered { NotUserTriggered = 0, UserTriggered = 1 }; 50 51 51 52 class CaretBase { … … 112 113 enum SetSelectionOption { 113 114 CloseTyping = 1 << 0, 114 ClearTypingStyle = 1 << 1,115 UserTriggered= 1 << 2,115 // 1 << 1 is reserved for EUserTriggered 116 ClearTypingStyle = 1 << 2, 116 117 SpellCorrectionTriggered = 1 << 3, 117 118 }; 118 typedef unsigned SetSelectionOptions; 119 typedef unsigned SetSelectionOptions; // Union of values in SetSelectionOption and EUserTriggered 120 static inline EUserTriggered selectionOptionsToUserTriggered(SetSelectionOptions options) 121 { 122 return static_cast<EUserTriggered>(options & UserTriggered); 123 } 119 124 120 125 FrameSelection(Frame* = 0); … … 124 129 bool isContentRichlyEditable() const { return m_selection.isContentRichlyEditable(); } 125 130 126 void moveTo(const Range*, EAffinity, bool userTriggered = false);127 void moveTo(const VisiblePosition&, bool userTriggered = false, CursorAlignOnScroll = AlignCursorOnScrollIfNeeded);128 void moveTo(const VisiblePosition&, const VisiblePosition&, bool userTriggered = false);129 void moveTo(const Position&, EAffinity, bool userTriggered = false);130 void moveTo(const Position&, const Position&, EAffinity, bool userTriggered = false);131 void moveTo(const Range*, EAffinity, EUserTriggered = NotUserTriggered); 132 void moveTo(const VisiblePosition&, EUserTriggered = NotUserTriggered, CursorAlignOnScroll = AlignCursorOnScrollIfNeeded); 133 void moveTo(const VisiblePosition&, const VisiblePosition&, EUserTriggered = NotUserTriggered); 134 void moveTo(const Position&, EAffinity, EUserTriggered = NotUserTriggered); 135 void moveTo(const Position&, const Position&, EAffinity, EUserTriggered = NotUserTriggered); 131 136 132 137 const VisibleSelection& selection() const { return m_selection; } … … 146 151 EAffinity affinity() const { return m_selection.affinity(); } 147 152 148 bool modify(EAlteration, SelectionDirection, TextGranularity, bool userTriggered = false);153 bool modify(EAlteration, SelectionDirection, TextGranularity, EUserTriggered = NotUserTriggered); 149 154 enum VerticalDirection { DirectionUp, DirectionDown }; 150 bool modify(EAlteration, unsigned verticalDistance, VerticalDirection, bool userTriggered = false, CursorAlignOnScroll = AlignCursorOnScrollIfNeeded); 155 bool modify(EAlteration, unsigned verticalDistance, VerticalDirection, EUserTriggered = NotUserTriggered, CursorAlignOnScroll = AlignCursorOnScrollIfNeeded); 156 151 157 TextGranularity granularity() const { return m_granularity; } 152 158 153 void setStart(const VisiblePosition &, bool userTriggered = false);154 void setEnd(const VisiblePosition &, bool userTriggered = false);159 void setStart(const VisiblePosition &, EUserTriggered = NotUserTriggered); 160 void setEnd(const VisiblePosition &, EUserTriggered = NotUserTriggered); 155 161 156 void setBase(const VisiblePosition&, bool userTriggered = false);157 void setBase(const Position&, EAffinity, bool userTriggered = false);158 void setExtent(const VisiblePosition&, bool userTriggered = false);159 void setExtent(const Position&, EAffinity, bool userTriggered = false);162 void setBase(const VisiblePosition&, EUserTriggered = NotUserTriggered); 163 void setBase(const Position&, EAffinity, EUserTriggered = NotUserTriggered); 164 void setExtent(const VisiblePosition&, EUserTriggered = NotUserTriggered); 165 void setExtent(const Position&, EAffinity, EUserTriggered = NotUserTriggered); 160 166 161 167 Position base() const { return m_selection.base(); } … … 220 226 bool shouldDeleteSelection(const VisibleSelection&) const; 221 227 void setFocusedNodeIfNeeded(); 222 void notifyRendererOfSelectionChange( bool userTriggered);228 void notifyRendererOfSelectionChange(EUserTriggered); 223 229 224 230 void paintDragCaret(GraphicsContext*, const IntPoint&, const IntRect& clipRect) const; -
trunk/Source/WebCore/page/DOMSelection.cpp
r86325 r89293 339 339 return; 340 340 341 m_frame->selection()->modify(alter, direction, granularity , false);341 m_frame->selection()->modify(alter, direction, granularity); 342 342 } 343 343 -
trunk/Source/WebCore/page/EventHandler.cpp
r89212 r89293 774 774 } 775 775 776 m_frame->selection()->notifyRendererOfSelectionChange( true);776 m_frame->selection()->notifyRendererOfSelectionChange(UserTriggered); 777 777 778 778 m_frame->selection()->selectFrameElementInParentIfFullySelected(); … … 2648 2648 2649 2649 FrameSelection::EAlteration alternation = event->getModifierState("Shift") ? FrameSelection::AlterationExtend : FrameSelection::AlterationMove; 2650 selection->modify(alternation, direction, granularity, true);2650 selection->modify(alternation, direction, granularity, UserTriggered); 2651 2651 event->setDefaultHandled(); 2652 2652 }
Note: See TracChangeset
for help on using the changeset viewer.