Changeset 89293 in webkit


Ignore:
Timestamp:
Jun 20, 2011 3:03:28 PM (13 years ago)
Author:
rniwa@webkit.org
Message:

2011-06-20 Ryosuke Niwa <rniwa@webkit.org>

Reviewed by Darin Adler.

Various editing functions take boolean userTriggered but should be replaced by an enum
https://bugs.webkit.org/show_bug.cgi?id=62933

Replaced boolean userTriggered in many functions by new EUserTriggered enum.

  • WebCore.exp.in: FrameSelection::modify's signature changed.
  • accessibility/AccessibilityRenderObject.cpp: (WebCore::AccessibilityRenderObject::setSelectedVisiblePositionRange): Calls FrameSelection::moveTo.
  • editing/EditorCommand.cpp: (WebCore::executeMoveBackward): Calls FrameSelection::modify. (WebCore::executeMoveBackwardAndModifySelection): Ditto. (WebCore::executeMoveDown): Ditto. (WebCore::executeMoveDownAndModifySelection): Ditto. (WebCore::executeMoveForward): Ditto. (WebCore::executeMoveForwardAndModifySelection): Ditto. (WebCore::executeMoveLeft): Ditto. (WebCore::executeMoveLeftAndModifySelection): Ditto. (WebCore::executeMovePageDown): Ditto. (WebCore::executeMovePageDownAndModifySelection): Ditto. (WebCore::executeMovePageUp): Ditto. (WebCore::executeMovePageUpAndModifySelection): Ditto. (WebCore::executeMoveRight): Ditto. (WebCore::executeMoveRightAndModifySelection): Ditto. (WebCore::executeMoveToBeginningOfDocument): Ditto. (WebCore::executeMoveToBeginningOfDocumentAndModifySelection): Ditto. (WebCore::executeMoveToBeginningOfLine): Ditto. (WebCore::executeMoveToBeginningOfLineAndModifySelection): Ditto. (WebCore::executeMoveToBeginningOfParagraph): Ditto. (WebCore::executeMoveToBeginningOfParagraphAndModifySelection): Ditto. (WebCore::executeMoveToBeginningOfSentence): Ditto. (WebCore::executeMoveToBeginningOfSentenceAndModifySelection): Ditto. (WebCore::executeMoveToEndOfDocument): Ditto. (WebCore::executeMoveToEndOfDocumentAndModifySelection): Ditto. (WebCore::executeMoveToEndOfSentence): Ditto. (WebCore::executeMoveToEndOfSentenceAndModifySelection): Ditto. (WebCore::executeMoveToEndOfLine): Ditto. (WebCore::executeMoveToEndOfLineAndModifySelection): Ditto. (WebCore::executeMoveToEndOfParagraph): Ditto. (WebCore::executeMoveToEndOfParagraphAndModifySelection): Ditto. (WebCore::executeMoveParagraphBackwardAndModifySelection): Ditto. (WebCore::executeMoveParagraphForwardAndModifySelection): Ditto. (WebCore::executeMoveUp): Ditto. (WebCore::executeMoveUpAndModifySelection): Ditto. (WebCore::executeMoveWordBackward): Ditto. (WebCore::executeMoveWordBackwardAndModifySelection): Ditto. (WebCore::executeMoveWordForward): Ditto. (WebCore::executeMoveWordForwardAndModifySelection): Ditto. (WebCore::executeMoveWordLeft): Ditto. (WebCore::executeMoveWordLeftAndModifySelection): Ditto. (WebCore::executeMoveWordRight): Ditto. (WebCore::executeMoveWordRightAndModifySelection): Ditto. (WebCore::executeMoveToLeftEndOfLine): Ditto. (WebCore::executeMoveToLeftEndOfLineAndModifySelection): Ditto. (WebCore::executeMoveToRightEndOfLine): Ditto. (WebCore::executeMoveToRightEndOfLineAndModifySelection): Ditto.
  • editing/FrameSelection.cpp: (WebCore::FrameSelection::moveTo): Takes EUserTriggered instead of a boolean. (WebCore::FrameSelection::setSelection): Ditto. (WebCore::FrameSelection::modify): Ditto. (WebCore::FrameSelection::setStart): Ditto. (WebCore::FrameSelection::setEnd): Ditto. (WebCore::FrameSelection::setBase): Ditto. (WebCore::FrameSelection::setExtent): Ditto. (WebCore::FrameSelection::selectAll): Ditto. (WebCore::FrameSelection::notifyRendererOfSelectionChange): Ditto.
  • editing/FrameSelection.h: Extracted EUserTriggered out of SetSelectionOption; SetSelectionOptions now takes the union of values of SetSelectionOption and EUserTriggered. (WebCore::FrameSelection::selectionOptionsToUserTriggered): Converts SetSelectionOptions to EUserTriggered.
  • page/DOMSelection.cpp: (WebCore::DOMSelection::modify): Calls FrameSelection::modify.
  • page/EventHandler.cpp: (WebCore::EventHandler::handleMouseReleaseEvent): Ditto. (WebCore::handleKeyboardSelectionMovement): Ditto.
Location:
trunk/Source/WebCore
Files:
8 edited

Legend:

Unmodified
Added
Removed
  • trunk/Source/WebCore/ChangeLog

    r89292 r89293  
     12011-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
    1802011-06-20  Jer Noble  <jer.noble@apple.com>
    281
  • trunk/Source/WebCore/WebCore.exp.in

    r89271 r89293  
    355355__ZN7WebCore14FrameSelection20setSelectionFromNoneEv
    356356__ZN7WebCore14FrameSelection5clearEv
    357 __ZN7WebCore14FrameSelection6modifyENS0_11EAlterationENS_18SelectionDirectionENS_15TextGranularityEb
     357__ZN7WebCore14FrameSelection6modifyENS0_11EAlterationENS_18SelectionDirectionENS_15TextGranularityENS_14EUserTriggeredE
    358358__ZN7WebCore14FrameSelection9selectAllEv
    359359__ZN7WebCore14FrameSelectionC1EPNS_5FrameE
  • trunk/Source/WebCore/accessibility/AccessibilityRenderObject.cpp

    r89204 r89293  
    25762576    // make selection and tell the document to use it. if it's zero length, then move to that position
    25772577    if (range.start == range.end)
    2578         m_renderer->frame()->selection()->moveTo(range.start, true);
     2578        m_renderer->frame()->selection()->moveTo(range.start, UserTriggered);
    25792579    else {
    25802580        VisibleSelection newSelection = VisibleSelection(range.start, range.end);
  • trunk/Source/WebCore/editing/EditorCommand.cpp

    r89263 r89293  
    607607static bool executeMoveBackward(Frame* frame, Event*, EditorCommandSource, const String&)
    608608{
    609     frame->selection()->modify(FrameSelection::AlterationMove, DirectionBackward, CharacterGranularity, true);
     609    frame->selection()->modify(FrameSelection::AlterationMove, DirectionBackward, CharacterGranularity, UserTriggered);
    610610    return true;
    611611}
     
    613613static bool executeMoveBackwardAndModifySelection(Frame* frame, Event*, EditorCommandSource, const String&)
    614614{
    615     frame->selection()->modify(FrameSelection::AlterationExtend, DirectionBackward, CharacterGranularity, true);
     615    frame->selection()->modify(FrameSelection::AlterationExtend, DirectionBackward, CharacterGranularity, UserTriggered);
    616616    return true;
    617617}
     
    619619static bool executeMoveDown(Frame* frame, Event*, EditorCommandSource, const String&)
    620620{
    621     return frame->selection()->modify(FrameSelection::AlterationMove, DirectionForward, LineGranularity, true);
     621    return frame->selection()->modify(FrameSelection::AlterationMove, DirectionForward, LineGranularity, UserTriggered);
    622622}
    623623
    624624static bool executeMoveDownAndModifySelection(Frame* frame, Event*, EditorCommandSource, const String&)
    625625{
    626     frame->selection()->modify(FrameSelection::AlterationExtend, DirectionForward, LineGranularity, true);
     626    frame->selection()->modify(FrameSelection::AlterationExtend, DirectionForward, LineGranularity, UserTriggered);
    627627    return true;
    628628}
     
    630630static bool executeMoveForward(Frame* frame, Event*, EditorCommandSource, const String&)
    631631{
    632     frame->selection()->modify(FrameSelection::AlterationMove, DirectionForward, CharacterGranularity, true);
     632    frame->selection()->modify(FrameSelection::AlterationMove, DirectionForward, CharacterGranularity, UserTriggered);
    633633    return true;
    634634}
     
    636636static bool executeMoveForwardAndModifySelection(Frame* frame, Event*, EditorCommandSource, const String&)
    637637{
    638     frame->selection()->modify(FrameSelection::AlterationExtend, DirectionForward, CharacterGranularity, true);
     638    frame->selection()->modify(FrameSelection::AlterationExtend, DirectionForward, CharacterGranularity, UserTriggered);
    639639    return true;
    640640}
     
    642642static bool executeMoveLeft(Frame* frame, Event*, EditorCommandSource, const String&)
    643643{
    644     return frame->selection()->modify(FrameSelection::AlterationMove, DirectionLeft, CharacterGranularity, true);
     644    return frame->selection()->modify(FrameSelection::AlterationMove, DirectionLeft, CharacterGranularity, UserTriggered);
    645645}
    646646
    647647static bool executeMoveLeftAndModifySelection(Frame* frame, Event*, EditorCommandSource, const String&)
    648648{
    649     frame->selection()->modify(FrameSelection::AlterationExtend, DirectionLeft, CharacterGranularity, true);
     649    frame->selection()->modify(FrameSelection::AlterationExtend, DirectionLeft, CharacterGranularity, UserTriggered);
    650650    return true;
    651651}
     
    656656    if (!distance)
    657657        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);
    659660}
    660661
     
    664665    if (!distance)
    665666        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);
    667669}
    668670
     
    672674    if (!distance)
    673675        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);
    675678}
    676679
     
    680683    if (!distance)
    681684        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);
    683687}
    684688
    685689static bool executeMoveRight(Frame* frame, Event*, EditorCommandSource, const String&)
    686690{
    687     return frame->selection()->modify(FrameSelection::AlterationMove, DirectionRight, CharacterGranularity, true);
     691    return frame->selection()->modify(FrameSelection::AlterationMove, DirectionRight, CharacterGranularity, UserTriggered);
    688692}
    689693
    690694static bool executeMoveRightAndModifySelection(Frame* frame, Event*, EditorCommandSource, const String&)
    691695{
    692     frame->selection()->modify(FrameSelection::AlterationExtend, DirectionRight, CharacterGranularity, true);
     696    frame->selection()->modify(FrameSelection::AlterationExtend, DirectionRight, CharacterGranularity, UserTriggered);
    693697    return true;
    694698}
     
    696700static bool executeMoveToBeginningOfDocument(Frame* frame, Event*, EditorCommandSource, const String&)
    697701{
    698     frame->selection()->modify(FrameSelection::AlterationMove, DirectionBackward, DocumentBoundary, true);
     702    frame->selection()->modify(FrameSelection::AlterationMove, DirectionBackward, DocumentBoundary, UserTriggered);
    699703    return true;
    700704}
     
    702706static bool executeMoveToBeginningOfDocumentAndModifySelection(Frame* frame, Event*, EditorCommandSource, const String&)
    703707{
    704     frame->selection()->modify(FrameSelection::AlterationExtend, DirectionBackward, DocumentBoundary, true);
     708    frame->selection()->modify(FrameSelection::AlterationExtend, DirectionBackward, DocumentBoundary, UserTriggered);
    705709    return true;
    706710}
     
    708712static bool executeMoveToBeginningOfLine(Frame* frame, Event*, EditorCommandSource, const String&)
    709713{
    710     frame->selection()->modify(FrameSelection::AlterationMove, DirectionBackward, LineBoundary, true);
     714    frame->selection()->modify(FrameSelection::AlterationMove, DirectionBackward, LineBoundary, UserTriggered);
    711715    return true;
    712716}
     
    714718static bool executeMoveToBeginningOfLineAndModifySelection(Frame* frame, Event*, EditorCommandSource, const String&)
    715719{
    716     frame->selection()->modify(FrameSelection::AlterationExtend, DirectionBackward, LineBoundary, true);
     720    frame->selection()->modify(FrameSelection::AlterationExtend, DirectionBackward, LineBoundary, UserTriggered);
    717721    return true;
    718722}
     
    720724static bool executeMoveToBeginningOfParagraph(Frame* frame, Event*, EditorCommandSource, const String&)
    721725{
    722     frame->selection()->modify(FrameSelection::AlterationMove, DirectionBackward, ParagraphBoundary, true);
     726    frame->selection()->modify(FrameSelection::AlterationMove, DirectionBackward, ParagraphBoundary, UserTriggered);
    723727    return true;
    724728}
     
    726730static bool executeMoveToBeginningOfParagraphAndModifySelection(Frame* frame, Event*, EditorCommandSource, const String&)
    727731{
    728     frame->selection()->modify(FrameSelection::AlterationExtend, DirectionBackward, ParagraphBoundary, true);
     732    frame->selection()->modify(FrameSelection::AlterationExtend, DirectionBackward, ParagraphBoundary, UserTriggered);
    729733    return true;
    730734}
     
    732736static bool executeMoveToBeginningOfSentence(Frame* frame, Event*, EditorCommandSource, const String&)
    733737{
    734     frame->selection()->modify(FrameSelection::AlterationMove, DirectionBackward, SentenceBoundary, true);
     738    frame->selection()->modify(FrameSelection::AlterationMove, DirectionBackward, SentenceBoundary, UserTriggered);
    735739    return true;
    736740}
     
    738742static bool executeMoveToBeginningOfSentenceAndModifySelection(Frame* frame, Event*, EditorCommandSource, const String&)
    739743{
    740     frame->selection()->modify(FrameSelection::AlterationExtend, DirectionBackward, SentenceBoundary, true);
     744    frame->selection()->modify(FrameSelection::AlterationExtend, DirectionBackward, SentenceBoundary, UserTriggered);
    741745    return true;
    742746}
     
    744748static bool executeMoveToEndOfDocument(Frame* frame, Event*, EditorCommandSource, const String&)
    745749{
    746     frame->selection()->modify(FrameSelection::AlterationMove, DirectionForward, DocumentBoundary, true);
     750    frame->selection()->modify(FrameSelection::AlterationMove, DirectionForward, DocumentBoundary, UserTriggered);
    747751    return true;
    748752}
     
    750754static bool executeMoveToEndOfDocumentAndModifySelection(Frame* frame, Event*, EditorCommandSource, const String&)
    751755{
    752     frame->selection()->modify(FrameSelection::AlterationExtend, DirectionForward, DocumentBoundary, true);
     756    frame->selection()->modify(FrameSelection::AlterationExtend, DirectionForward, DocumentBoundary, UserTriggered);
    753757    return true;
    754758}
     
    756760static bool executeMoveToEndOfSentence(Frame* frame, Event*, EditorCommandSource, const String&)
    757761{
    758     frame->selection()->modify(FrameSelection::AlterationMove, DirectionForward, SentenceBoundary, true);
     762    frame->selection()->modify(FrameSelection::AlterationMove, DirectionForward, SentenceBoundary, UserTriggered);
    759763    return true;
    760764}
     
    762766static bool executeMoveToEndOfSentenceAndModifySelection(Frame* frame, Event*, EditorCommandSource, const String&)
    763767{
    764     frame->selection()->modify(FrameSelection::AlterationExtend, DirectionForward, SentenceBoundary, true);
     768    frame->selection()->modify(FrameSelection::AlterationExtend, DirectionForward, SentenceBoundary, UserTriggered);
    765769    return true;
    766770}
     
    768772static bool executeMoveToEndOfLine(Frame* frame, Event*, EditorCommandSource, const String&)
    769773{
    770     frame->selection()->modify(FrameSelection::AlterationMove, DirectionForward, LineBoundary, true);
     774    frame->selection()->modify(FrameSelection::AlterationMove, DirectionForward, LineBoundary, UserTriggered);
    771775    return true;
    772776}
     
    774778static bool executeMoveToEndOfLineAndModifySelection(Frame* frame, Event*, EditorCommandSource, const String&)
    775779{
    776     frame->selection()->modify(FrameSelection::AlterationExtend, DirectionForward, LineBoundary, true);
     780    frame->selection()->modify(FrameSelection::AlterationExtend, DirectionForward, LineBoundary, UserTriggered);
    777781    return true;
    778782}
     
    780784static bool executeMoveToEndOfParagraph(Frame* frame, Event*, EditorCommandSource, const String&)
    781785{
    782     frame->selection()->modify(FrameSelection::AlterationMove, DirectionForward, ParagraphBoundary, true);
     786    frame->selection()->modify(FrameSelection::AlterationMove, DirectionForward, ParagraphBoundary, UserTriggered);
    783787    return true;
    784788}
     
    786790static bool executeMoveToEndOfParagraphAndModifySelection(Frame* frame, Event*, EditorCommandSource, const String&)
    787791{
    788     frame->selection()->modify(FrameSelection::AlterationExtend, DirectionForward, ParagraphBoundary, true);
     792    frame->selection()->modify(FrameSelection::AlterationExtend, DirectionForward, ParagraphBoundary, UserTriggered);
    789793    return true;
    790794}
     
    792796static bool executeMoveParagraphBackwardAndModifySelection(Frame* frame, Event*, EditorCommandSource, const String&)
    793797{
    794     frame->selection()->modify(FrameSelection::AlterationExtend, DirectionBackward, ParagraphGranularity, true);
     798    frame->selection()->modify(FrameSelection::AlterationExtend, DirectionBackward, ParagraphGranularity, UserTriggered);
    795799    return true;
    796800}
     
    798802static bool executeMoveParagraphForwardAndModifySelection(Frame* frame, Event*, EditorCommandSource, const String&)
    799803{
    800     frame->selection()->modify(FrameSelection::AlterationExtend, DirectionForward, ParagraphGranularity, true);
     804    frame->selection()->modify(FrameSelection::AlterationExtend, DirectionForward, ParagraphGranularity, UserTriggered);
    801805    return true;
    802806}
     
    804808static bool executeMoveUp(Frame* frame, Event*, EditorCommandSource, const String&)
    805809{
    806     return frame->selection()->modify(FrameSelection::AlterationMove, DirectionBackward, LineGranularity, true);
     810    return frame->selection()->modify(FrameSelection::AlterationMove, DirectionBackward, LineGranularity, UserTriggered);
    807811}
    808812
    809813static bool executeMoveUpAndModifySelection(Frame* frame, Event*, EditorCommandSource, const String&)
    810814{
    811     frame->selection()->modify(FrameSelection::AlterationExtend, DirectionBackward, LineGranularity, true);
     815    frame->selection()->modify(FrameSelection::AlterationExtend, DirectionBackward, LineGranularity, UserTriggered);
    812816    return true;
    813817}
     
    815819static bool executeMoveWordBackward(Frame* frame, Event*, EditorCommandSource, const String&)
    816820{
    817     frame->selection()->modify(FrameSelection::AlterationMove, DirectionBackward, WordGranularity, true);
     821    frame->selection()->modify(FrameSelection::AlterationMove, DirectionBackward, WordGranularity, UserTriggered);
    818822    return true;
    819823}
     
    821825static bool executeMoveWordBackwardAndModifySelection(Frame* frame, Event*, EditorCommandSource, const String&)
    822826{
    823     frame->selection()->modify(FrameSelection::AlterationExtend, DirectionBackward, WordGranularity, true);
     827    frame->selection()->modify(FrameSelection::AlterationExtend, DirectionBackward, WordGranularity, UserTriggered);
    824828    return true;
    825829}
     
    827831static bool executeMoveWordForward(Frame* frame, Event*, EditorCommandSource, const String&)
    828832{
    829     frame->selection()->modify(FrameSelection::AlterationMove, DirectionForward, WordGranularity, true);
     833    frame->selection()->modify(FrameSelection::AlterationMove, DirectionForward, WordGranularity, UserTriggered);
    830834    return true;
    831835}
     
    833837static bool executeMoveWordForwardAndModifySelection(Frame* frame, Event*, EditorCommandSource, const String&)
    834838{
    835     frame->selection()->modify(FrameSelection::AlterationExtend, DirectionForward, WordGranularity, true);
     839    frame->selection()->modify(FrameSelection::AlterationExtend, DirectionForward, WordGranularity, UserTriggered);
    836840    return true;
    837841}
     
    839843static bool executeMoveWordLeft(Frame* frame, Event*, EditorCommandSource, const String&)
    840844{
    841     frame->selection()->modify(FrameSelection::AlterationMove, DirectionLeft, WordGranularity, true);
     845    frame->selection()->modify(FrameSelection::AlterationMove, DirectionLeft, WordGranularity, UserTriggered);
    842846    return true;
    843847}
     
    845849static bool executeMoveWordLeftAndModifySelection(Frame* frame, Event*, EditorCommandSource, const String&)
    846850{
    847     frame->selection()->modify(FrameSelection::AlterationExtend, DirectionLeft, WordGranularity, true);
     851    frame->selection()->modify(FrameSelection::AlterationExtend, DirectionLeft, WordGranularity, UserTriggered);
    848852    return true;
    849853}
     
    851855static bool executeMoveWordRight(Frame* frame, Event*, EditorCommandSource, const String&)
    852856{
    853     frame->selection()->modify(FrameSelection::AlterationMove, DirectionRight, WordGranularity, true);
     857    frame->selection()->modify(FrameSelection::AlterationMove, DirectionRight, WordGranularity, UserTriggered);
    854858    return true;
    855859}
     
    857861static bool executeMoveWordRightAndModifySelection(Frame* frame, Event*, EditorCommandSource, const String&)
    858862{
    859     frame->selection()->modify(FrameSelection::AlterationExtend, DirectionRight, WordGranularity, true);
     863    frame->selection()->modify(FrameSelection::AlterationExtend, DirectionRight, WordGranularity, UserTriggered);
    860864    return true;
    861865}
     
    863867static bool executeMoveToLeftEndOfLine(Frame* frame, Event*, EditorCommandSource, const String&)
    864868{
    865     frame->selection()->modify(FrameSelection::AlterationMove, DirectionLeft, LineBoundary, true);
     869    frame->selection()->modify(FrameSelection::AlterationMove, DirectionLeft, LineBoundary, UserTriggered);
    866870    return true;
    867871}
     
    869873static bool executeMoveToLeftEndOfLineAndModifySelection(Frame* frame, Event*, EditorCommandSource, const String&)
    870874{
    871     frame->selection()->modify(FrameSelection::AlterationExtend, DirectionLeft, LineBoundary, true);
     875    frame->selection()->modify(FrameSelection::AlterationExtend, DirectionLeft, LineBoundary, UserTriggered);
    872876    return true;
    873877}
     
    875879static bool executeMoveToRightEndOfLine(Frame* frame, Event*, EditorCommandSource, const String&)
    876880{
    877     frame->selection()->modify(FrameSelection::AlterationMove, DirectionRight, LineBoundary, true);
     881    frame->selection()->modify(FrameSelection::AlterationMove, DirectionRight, LineBoundary, UserTriggered);
    878882    return true;
    879883}
     
    881885static bool executeMoveToRightEndOfLineAndModifySelection(Frame* frame, Event*, EditorCommandSource, const String&)
    882886{
    883     frame->selection()->modify(FrameSelection::AlterationExtend, DirectionRight, LineBoundary, true);
     887    frame->selection()->modify(FrameSelection::AlterationExtend, DirectionRight, LineBoundary, UserTriggered);
    884888    return true;
    885889}
  • trunk/Source/WebCore/editing/FrameSelection.cpp

    r89263 r89293  
    104104}
    105105
    106 void FrameSelection::moveTo(const VisiblePosition &pos, bool userTriggered, CursorAlignOnScroll align)
    107 {
    108     SetSelectionOptions options = CloseTyping | ClearTypingStyle;
    109     if (userTriggered)
    110         options |= UserTriggered;
     106void FrameSelection::moveTo(const VisiblePosition &pos, EUserTriggered userTriggered, CursorAlignOnScroll align)
     107{
     108    SetSelectionOptions options = CloseTyping | ClearTypingStyle | userTriggered;
    111109    setSelection(VisibleSelection(pos.deepEquivalent(), pos.deepEquivalent(), pos.affinity()), options, align);
    112110}
    113111
    114 void FrameSelection::moveTo(const VisiblePosition &base, const VisiblePosition &extent, bool userTriggered)
    115 {
    116     SetSelectionOptions options = CloseTyping | ClearTypingStyle;
    117     if (userTriggered)
    118         options |= UserTriggered;
     112void FrameSelection::moveTo(const VisiblePosition &base, const VisiblePosition &extent, EUserTriggered userTriggered)
     113{
     114    SetSelectionOptions options = CloseTyping | ClearTypingStyle | userTriggered;
    119115    setSelection(VisibleSelection(base.deepEquivalent(), extent.deepEquivalent(), base.affinity()), options);
    120116}
    121117
    122 void FrameSelection::moveTo(const Position &pos, EAffinity affinity, bool userTriggered)
    123 {
    124     SetSelectionOptions options = CloseTyping | ClearTypingStyle;
    125     if (userTriggered)
    126         options |= UserTriggered;
     118void FrameSelection::moveTo(const Position &pos, EAffinity affinity, EUserTriggered userTriggered)
     119{
     120    SetSelectionOptions options = CloseTyping | ClearTypingStyle | userTriggered;
    127121    setSelection(VisibleSelection(pos, affinity), options);
    128122}
    129123
    130 void FrameSelection::moveTo(const Range *r, EAffinity affinity, bool userTriggered)
    131 {
    132     SetSelectionOptions options = CloseTyping | ClearTypingStyle;
    133     if (userTriggered)
    134         options |= UserTriggered;
     124void FrameSelection::moveTo(const Range *r, EAffinity affinity, EUserTriggered userTriggered)
     125{
     126    SetSelectionOptions options = CloseTyping | ClearTypingStyle | userTriggered;
    135127    VisibleSelection selection = r ? VisibleSelection(r->startPosition(), r->endPosition(), affinity) : VisibleSelection(Position(), Position(), affinity);
    136128    setSelection(selection, options);
    137129}
    138130
    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;
     131void FrameSelection::moveTo(const Position &base, const Position &extent, EAffinity affinity, EUserTriggered userTriggered)
     132{
     133    SetSelectionOptions options = CloseTyping | ClearTypingStyle | userTriggered;
    144134    setSelection(VisibleSelection(base, extent, affinity), options);
    145135}
     
    168158    bool closeTyping = options & CloseTyping;
    169159    bool shouldClearTypingStyle = options & ClearTypingStyle;
    170     bool userTriggered = options & UserTriggered;
     160    EUserTriggered userTriggered = selectionOptionsToUserTriggered(options);
    171161
    172162    setIsDirectional(directionalityPolicy == MakeDirectionalSelection);
     
    215205    notifyRendererOfSelectionChange(userTriggered);
    216206    m_frame->editor()->respondToChangedSelection(oldSelection, options);
    217     if (userTriggered) {
     207    if (userTriggered == UserTriggered) {
    218208        ScrollAlignment alignment;
    219209
     
    788778}   
    789779
    790 bool FrameSelection::modify(EAlteration alter, SelectionDirection direction, TextGranularity granularity, bool userTriggered)
    791 {
    792     if (userTriggered) {
     780bool FrameSelection::modify(EAlteration alter, SelectionDirection direction, TextGranularity granularity, EUserTriggered userTriggered)
     781{
     782    if (userTriggered == UserTriggered) {
    793783        FrameSelection trialFrameSelection;
    794784        trialFrameSelection.setSelection(m_selection);
    795785        trialFrameSelection.setIsDirectional(m_isDirectional);
    796         trialFrameSelection.modify(alter, direction, granularity, false);
     786        trialFrameSelection.modify(alter, direction, granularity, NotUserTriggered);
    797787
    798788        bool change = shouldChangeSelection(trialFrameSelection.selection());
     
    868858        m_xPosForVerticalArrowNavigation = x;
    869859
    870     if (userTriggered)
     860    if (userTriggered == UserTriggered)
    871861        m_granularity = CharacterGranularity;
    872862
     
    889879}
    890880
    891 bool FrameSelection::modify(EAlteration alter, unsigned verticalDistance, VerticalDirection direction, bool userTriggered, CursorAlignOnScroll align)
     881bool FrameSelection::modify(EAlteration alter, unsigned verticalDistance, VerticalDirection direction, EUserTriggered userTriggered, CursorAlignOnScroll align)
    892882{
    893883    if (!verticalDistance)
    894884        return false;
    895885
    896     if (userTriggered) {
     886    if (userTriggered == UserTriggered) {
    897887        FrameSelection trialFrameSelection;
    898888        trialFrameSelection.setSelection(m_selection);
    899889        trialFrameSelection.setIsDirectional(m_isDirectional);
    900         trialFrameSelection.modify(alter, verticalDistance, direction, false);
     890        trialFrameSelection.modify(alter, verticalDistance, direction, NotUserTriggered);
    901891
    902892        bool change = shouldChangeSelection(trialFrameSelection.selection());
     
    960950    }
    961951
    962     if (userTriggered)
     952    if (userTriggered == UserTriggered)
    963953        m_granularity = CharacterGranularity;
    964954
     
    10131003}
    10141004
    1015 void FrameSelection::setStart(const VisiblePosition &pos, bool userTriggered)
     1005void FrameSelection::setStart(const VisiblePosition &pos, EUserTriggered trigger)
    10161006{
    10171007    if (m_selection.isBaseFirst())
    1018         setBase(pos, userTriggered);
     1008        setBase(pos, trigger);
    10191009    else
    1020         setExtent(pos, userTriggered);
    1021 }
    1022 
    1023 void FrameSelection::setEnd(const VisiblePosition &pos, bool userTriggered)
     1010        setExtent(pos, trigger);
     1011}
     1012
     1013void FrameSelection::setEnd(const VisiblePosition &pos, EUserTriggered trigger)
    10241014{
    10251015    if (m_selection.isBaseFirst())
    1026         setExtent(pos, userTriggered);
     1016        setExtent(pos, trigger);
    10271017    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
     1021void FrameSelection::setBase(const VisiblePosition &pos, EUserTriggered userTriggered)
     1022{
     1023    setSelection(VisibleSelection(pos.deepEquivalent(), m_selection.extent(), pos.affinity()), CloseTyping | ClearTypingStyle | userTriggered);
     1024}
     1025
     1026void FrameSelection::setExtent(const VisiblePosition &pos, EUserTriggered userTriggered)
     1027{
     1028    setSelection(VisibleSelection(m_selection.base(), pos.deepEquivalent(), pos.affinity()), CloseTyping | ClearTypingStyle | userTriggered);
     1029}
     1030
     1031void FrameSelection::setBase(const Position &pos, EAffinity affinity, EUserTriggered userTriggered)
     1032{
     1033    setSelection(VisibleSelection(pos, m_selection.extent(), affinity), CloseTyping | ClearTypingStyle | userTriggered);
     1034}
     1035
     1036void FrameSelection::setExtent(const Position &pos, EAffinity affinity, EUserTriggered userTriggered)
     1037{
     1038    setSelection(VisibleSelection(m_selection.base(), pos, affinity), CloseTyping | ClearTypingStyle | userTriggered);
    10611039}
    10621040
     
    14801458
    14811459    selectFrameElementInParentIfFullySelected();
    1482     notifyRendererOfSelectionChange(true);
     1460    notifyRendererOfSelectionChange(UserTriggered);
    14831461}
    14841462
     
    17051683}
    17061684
    1707 void FrameSelection::notifyRendererOfSelectionChange(bool userTriggered)
     1685void FrameSelection::notifyRendererOfSelectionChange(EUserTriggered userTriggered)
    17081686{
    17091687    m_frame->document()->updateStyleIfNeeded();
     
    17161694        return;
    17171695
    1718     toRenderTextControl(renderer)->selectionChanged(userTriggered);
     1696    toRenderTextControl(renderer)->selectionChanged(userTriggered == UserTriggered);
    17191697}
    17201698
  • trunk/Source/WebCore/editing/FrameSelection.h

    r89263 r89293  
    4848
    4949enum DirectionalityPolicy { MakeNonDirectionalSelection, MakeDirectionalSelection };
     50enum EUserTriggered { NotUserTriggered = 0, UserTriggered = 1 };
    5051
    5152class CaretBase {
     
    112113    enum SetSelectionOption {
    113114        CloseTyping = 1 << 0,
    114         ClearTypingStyle = 1 << 1,
    115         UserTriggered = 1 << 2,
     115        // 1 << 1 is reserved for EUserTriggered
     116        ClearTypingStyle = 1 << 2,
    116117        SpellCorrectionTriggered = 1 << 3,
    117118    };
    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    }
    119124
    120125    FrameSelection(Frame* = 0);
     
    124129    bool isContentRichlyEditable() const { return m_selection.isContentRichlyEditable(); }
    125130     
    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);
    131136
    132137    const VisibleSelection& selection() const { return m_selection; }
     
    146151    EAffinity affinity() const { return m_selection.affinity(); }
    147152
    148     bool modify(EAlteration, SelectionDirection, TextGranularity, bool userTriggered = false);
     153    bool modify(EAlteration, SelectionDirection, TextGranularity, EUserTriggered = NotUserTriggered);
    149154    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
    151157    TextGranularity granularity() const { return m_granularity; }
    152158
    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);
    155161   
    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);
    160166
    161167    Position base() const { return m_selection.base(); }
     
    220226    bool shouldDeleteSelection(const VisibleSelection&) const;
    221227    void setFocusedNodeIfNeeded();
    222     void notifyRendererOfSelectionChange(bool userTriggered);
     228    void notifyRendererOfSelectionChange(EUserTriggered);
    223229
    224230    void paintDragCaret(GraphicsContext*, const IntPoint&, const IntRect& clipRect) const;
  • trunk/Source/WebCore/page/DOMSelection.cpp

    r86325 r89293  
    339339        return;
    340340
    341     m_frame->selection()->modify(alter, direction, granularity, false);
     341    m_frame->selection()->modify(alter, direction, granularity);
    342342}
    343343
  • trunk/Source/WebCore/page/EventHandler.cpp

    r89212 r89293  
    774774    }
    775775
    776     m_frame->selection()->notifyRendererOfSelectionChange(true);
     776    m_frame->selection()->notifyRendererOfSelectionChange(UserTriggered);
    777777
    778778    m_frame->selection()->selectFrameElementInParentIfFullySelected();
     
    26482648
    26492649    FrameSelection::EAlteration alternation = event->getModifierState("Shift") ? FrameSelection::AlterationExtend : FrameSelection::AlterationMove;
    2650     selection->modify(alternation, direction, granularity, true);
     2650    selection->modify(alternation, direction, granularity, UserTriggered);
    26512651    event->setDefaultHandled();
    26522652}
Note: See TracChangeset for help on using the changeset viewer.