Changeset 74566 in webkit


Ignore:
Timestamp:
Dec 23, 2010 10:59:52 AM (13 years ago)
Author:
rniwa@webkit.org
Message:

2010-12-22 Ryosuke Niwa <​rniwa@webkit.org>

Reviewed by Eric Seidel.

Editor.h doesn't need to include SelectionController.h
​https://bugs.webkit.org/show_bug.cgi?id=51441

Renamed SelectionController::EDirection to SelectionDirection.

  • src/WebFrameImpl.cpp: (WebKit::WebFrameImpl::executeCommand):

2010-12-22 Ryosuke Niwa <​rniwa@webkit.org>

Reviewed by Eric Seidel.

Editor.h doesn't need to include SelectionController.h
​https://bugs.webkit.org/show_bug.cgi?id=51441

Renamed SelectionController::EDirection to SelectionDirection.

  • WebCoreSupport/EditorClientQt.cpp: (WebCore::EditorClientQt::handleKeyboardEvent):

2010-12-22 Ryosuke Niwa <​rniwa@webkit.org>

Reviewed by Eric Seidel.

Editor.h doesn't need to include SelectionController.h
​https://bugs.webkit.org/show_bug.cgi?id=51441

Renamed SelectionController::EDirection to SelectionDirection.

  • WebView/WebFrame.mm: (-[WebFrame _rangeByAlteringCurrentSelection:SelectionController::direction:granularity:]): Takes SelectionDirection instead of SelectionController::EDirection.
  • WebView/WebFrameInternal.h:
  • WebView/WebTextCompletionController.mm: (-[WebTextCompletionController doCompletion]): Calls _rangeByAlteringCurrentSelection:SelectionController.

2010-12-22 Ryosuke Niwa <​rniwa@webkit.org>

Reviewed by Eric Seidel.

Editor.h doesn't need to include SelectionController.h
​https://bugs.webkit.org/show_bug.cgi?id=51441

Renamed SelectionController::EDirection to SelectionDirection.

  • WebCoreSupport/EditorClientHaiku.cpp: (WebCore::EditorClientHaiku::handleKeyboardEvent):

2010-12-22 Ryosuke Niwa <​rniwa@webkit.org>

Reviewed by Eric Seidel.

Editor.h doesn't need to include SelectionController.h
​https://bugs.webkit.org/show_bug.cgi?id=51441

Renamed SelectionController::EDirection to SelectionDirection.

  • WebCoreSupport/EditorClientWinCE.cpp: (WebKit::EditorClientWinCE::handleEditingKeyboardEvent):

2010-12-22 Ryosuke Niwa <​rniwa@webkit.org>

Reviewed by Eric Seidel.

Editor.h doesn't need to include SelectionController.h
​https://bugs.webkit.org/show_bug.cgi?id=51441

Renamed SelectionController::EDirection to SelectionDirection.

  • WebCoreSupport/EditorClientEfl.cpp: (WebCore::EditorClientEfl::handleEditingKeyboardEvent):

2010-12-22 Ryosuke Niwa <​rniwa@webkit.org>

Reviewed by Eric Seidel.

Editor.h doesn't need to include SelectionController.h
​https://bugs.webkit.org/show_bug.cgi?id=51441

Removed #include <Selection.h> from Editor.h.
Also extracted WritingDirection.h from EditingStyle.h and renamed SelectionController::EDirection
to SelectionDirection and moved its declaration from SelectionController.h to VisibleSelection.h

  • WebCore.exp.in: Signature changes.
  • WebCore.xcodeproj/project.pbxproj: Added WritingDirection.h
  • accessibility/AccessibilityRenderObject.cpp: (WebCore::AccessibilityRenderObject::visiblePositionRangeForLine): Change due to SelectionDirection.
  • editing/EditingStyle.h: Removed WritingDirection and included WritingDirection.h
  • editing/Editor.cpp: (WebCore::Editor::deleteWithDirection): Change due to SelectionDirection. (WebCore::Editor::markAllMisspellingsAndBadGrammarInRanges): Ditto. (WebCore::Editor::markMisspellingsAfterTypingToWord): Ditto.
  • editing/Editor.h: Removed SelectionController.h; added DocumentMarker.h, Timer.h, VisibleSelection.h and WritingDirection.h; forward declared CSSMutableStyleDeclaration.
  • editing/EditorCommand.cpp: (WebCore::executeDeleteBackward): Change due to SelectionDirection. (WebCore::executeDeleteBackwardByDecomposingPreviousCharacter): Ditto. (WebCore::executeDeleteForward): Ditto. (WebCore::executeDeleteToBeginningOfLine): Ditto. (WebCore::executeDeleteToBeginningOfParagraph): Ditto. (WebCore::executeDeleteToEndOfLine): Ditto. (WebCore::executeDeleteToEndOfParagraph): Ditto. (WebCore::executeDeleteWordBackward): Ditto. (WebCore::executeDeleteWordForward): Ditto. (WebCore::executeForwardDelete): Ditto. (WebCore::executeMoveBackward): Ditto. (WebCore::executeMoveBackwardAndModifySelection): Ditto. (WebCore::executeMoveDown): Ditto. (WebCore::executeMoveDownAndModifySelection): Ditto. (WebCore::executeMoveForward): Ditto. (WebCore::executeMoveForwardAndModifySelection): Ditto. (WebCore::executeMoveLeft): Ditto. (WebCore::executeMoveLeftAndModifySelection): 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/SelectionController.cpp: (WebCore::SelectionController::willBeModified): Takes SelectionDirection instead of EDirection. (WebCore::SelectionController::modify): Ditto.
  • editing/SelectionController.h: Change due to SelectionDirection.
  • editing/TypingCommand.cpp: (WebCore::TypingCommand::deleteKeyPressed): Ditto. (WebCore::TypingCommand::forwardDeleteKeyPressed): Ditto.
  • editing/VisibleSelection.h: Added SelectionDirection, renamed and moved from EDirection in SelectionController.h
  • editing/WritingDirection.h: Added.
  • page/DOMSelection.cpp: (WebCore::DOMSelection::modify): Change due to SelectionDirection. (WebCore::DOMSelection::deleteFromDocument): Ditto.
  • page/EventHandler.cpp: (WebCore::EventHandler::handleKeyboardSelectionMovement): Ditto.
  • page/Frame.h: Includes SelectionController.h.
Location:
trunk
Files:
1 added
29 edited

Legend:

Unmodified
Added
Removed

  • trunk/WebCore/ChangeLog

    r74563 r74566  
     12010-12-22  Ryosuke Niwa  <rniwa@webkit.org>
     2
     3        Reviewed by Eric Seidel.
     4
     5        Editor.h doesn't need to include SelectionController.h
     6        https://bugs.webkit.org/show_bug.cgi?id=51441
     7
     8        Removed #include <Selection.h> from Editor.h.
     9        Also extracted WritingDirection.h from EditingStyle.h and renamed SelectionController::EDirection
     10        to SelectionDirection and moved its declaration from SelectionController.h to VisibleSelection.h
     11
     12        * WebCore.exp.in: Signature changes.
     13        * WebCore.xcodeproj/project.pbxproj: Added WritingDirection.h
     14        * accessibility/AccessibilityRenderObject.cpp:
     15        (WebCore::AccessibilityRenderObject::visiblePositionRangeForLine): Change due to SelectionDirection.
     16        * editing/EditingStyle.h: Removed WritingDirection and included WritingDirection.h
     17        * editing/Editor.cpp:
     18        (WebCore::Editor::deleteWithDirection): Change due to SelectionDirection.
     19        (WebCore::Editor::markAllMisspellingsAndBadGrammarInRanges): Ditto.
     20        (WebCore::Editor::markMisspellingsAfterTypingToWord): Ditto.
     21        * editing/Editor.h: Removed SelectionController.h; added DocumentMarker.h, Timer.h, VisibleSelection.h
     22        and WritingDirection.h; forward declared CSSMutableStyleDeclaration.
     23        * editing/EditorCommand.cpp:
     24        (WebCore::executeDeleteBackward): Change due to SelectionDirection.
     25        (WebCore::executeDeleteBackwardByDecomposingPreviousCharacter): Ditto.
     26        (WebCore::executeDeleteForward): Ditto.
     27        (WebCore::executeDeleteToBeginningOfLine): Ditto.
     28        (WebCore::executeDeleteToBeginningOfParagraph): Ditto.
     29        (WebCore::executeDeleteToEndOfLine): Ditto.
     30        (WebCore::executeDeleteToEndOfParagraph): Ditto.
     31        (WebCore::executeDeleteWordBackward): Ditto.
     32        (WebCore::executeDeleteWordForward): Ditto.
     33        (WebCore::executeForwardDelete): Ditto.
     34        (WebCore::executeMoveBackward): Ditto.
     35        (WebCore::executeMoveBackwardAndModifySelection): Ditto.
     36        (WebCore::executeMoveDown): Ditto.
     37        (WebCore::executeMoveDownAndModifySelection): Ditto.
     38        (WebCore::executeMoveForward): Ditto.
     39        (WebCore::executeMoveForwardAndModifySelection): Ditto.
     40        (WebCore::executeMoveLeft): Ditto.
     41        (WebCore::executeMoveLeftAndModifySelection): Ditto.
     42        (WebCore::executeMoveRight): Ditto.
     43        (WebCore::executeMoveRightAndModifySelection): Ditto.
     44        (WebCore::executeMoveToBeginningOfDocument): Ditto.
     45        (WebCore::executeMoveToBeginningOfDocumentAndModifySelection): Ditto.
     46        (WebCore::executeMoveToBeginningOfLine): Ditto.
     47        (WebCore::executeMoveToBeginningOfLineAndModifySelection): Ditto.
     48        (WebCore::executeMoveToBeginningOfParagraph): Ditto.
     49        (WebCore::executeMoveToBeginningOfParagraphAndModifySelection): Ditto.
     50        (WebCore::executeMoveToBeginningOfSentence): Ditto.
     51        (WebCore::executeMoveToBeginningOfSentenceAndModifySelection): Ditto.
     52        (WebCore::executeMoveToEndOfDocument): Ditto.
     53        (WebCore::executeMoveToEndOfDocumentAndModifySelection): Ditto.
     54        (WebCore::executeMoveToEndOfSentence): Ditto.
     55        (WebCore::executeMoveToEndOfSentenceAndModifySelection): Ditto.
     56        (WebCore::executeMoveToEndOfLine): Ditto.
     57        (WebCore::executeMoveToEndOfLineAndModifySelection): Ditto.
     58        (WebCore::executeMoveToEndOfParagraph): Ditto.
     59        (WebCore::executeMoveToEndOfParagraphAndModifySelection): Ditto.
     60        (WebCore::executeMoveParagraphBackwardAndModifySelection): Ditto.
     61        (WebCore::executeMoveParagraphForwardAndModifySelection): Ditto.
     62        (WebCore::executeMoveUp): Ditto.
     63        (WebCore::executeMoveUpAndModifySelection): Ditto.
     64        (WebCore::executeMoveWordBackward): Ditto.
     65        (WebCore::executeMoveWordBackwardAndModifySelection): Ditto.
     66        (WebCore::executeMoveWordForward): Ditto.
     67        (WebCore::executeMoveWordForwardAndModifySelection): Ditto.
     68        (WebCore::executeMoveWordLeft): Ditto.
     69        (WebCore::executeMoveWordLeftAndModifySelection): Ditto.
     70        (WebCore::executeMoveWordRight): Ditto.
     71        (WebCore::executeMoveWordRightAndModifySelection): Ditto.
     72        (WebCore::executeMoveToLeftEndOfLine): Ditto.
     73        (WebCore::executeMoveToLeftEndOfLineAndModifySelection): Ditto.
     74        (WebCore::executeMoveToRightEndOfLine): Ditto.
     75        (WebCore::executeMoveToRightEndOfLineAndModifySelection): Ditto.
     76        * editing/SelectionController.cpp:
     77        (WebCore::SelectionController::willBeModified): Takes SelectionDirection instead of EDirection.
     78        (WebCore::SelectionController::modify): Ditto.
     79        * editing/SelectionController.h: Change due to SelectionDirection.
     80        * editing/TypingCommand.cpp:
     81        (WebCore::TypingCommand::deleteKeyPressed): Ditto.
     82        (WebCore::TypingCommand::forwardDeleteKeyPressed): Ditto.
     83        * editing/VisibleSelection.h: Added SelectionDirection, renamed and moved from EDirection
     84        in SelectionController.h
     85        * editing/WritingDirection.h: Added.
     86        * page/DOMSelection.cpp:
     87        (WebCore::DOMSelection::modify): Change due to SelectionDirection.
     88        (WebCore::DOMSelection::deleteFromDocument): Ditto.
     89        * page/EventHandler.cpp:
     90        (WebCore::EventHandler::handleKeyboardSelectionMovement): Ditto.
     91        * page/Frame.h: Includes SelectionController.h.
     92
    1932010-12-23  Adam Barth  <abarth@webkit.org>
    294

  • trunk/WebCore/WebCore.exp.in

    r74418 r74566  
    478478__ZN7WebCore19SelectionController20setSelectionFromNoneEv
    479479__ZN7WebCore19SelectionController5clearEv
    480 __ZN7WebCore19SelectionController6modifyENS0_11EAlterationENS0_10EDirectionENS_15TextGranularityEb
     480__ZN7WebCore19SelectionController6modifyENS0_11EAlterationENS_18SelectionDirectionENS_15TextGranularityEb
    481481__ZN7WebCore19SelectionController9selectAllEv
    482482__ZN7WebCore19SelectionControllerC1EPNS_5FrameEb
    … …  
    695695__ZN7WebCore6Editor18confirmCompositionEv
    696696__ZN7WebCore6Editor19countMatchesForTextERKN3WTF6StringEPNS_5RangeEjjb
    697 __ZN7WebCore6Editor19deleteWithDirectionENS_19SelectionController10EDirectionENS_15TextGranularityEbb
     697__ZN7WebCore6Editor19deleteWithDirectionENS_18SelectionDirectionENS_15TextGranularityEbb
    698698__ZN7WebCore6Editor19insertUnorderedListEv
    699699__ZN7WebCore6Editor21applyStyleToSelectionEPNS_19CSSStyleDeclarationENS_10EditActionE
    700700__ZN7WebCore6Editor21isSelectionMisspelledEv
    701 __ZN7WebCore6Editor23setBaseWritingDirectionENS_16WritingDirectionE
     701__ZN7WebCore6Editor23setBaseWritingDirectionE16WritingDirection
    702702__ZN7WebCore6Editor24advanceToNextMisspellingEb
    703703__ZN7WebCore6Editor24computeAndSetTypingStyleEPNS_19CSSStyleDeclarationENS_10EditActionE

  • trunk/WebCore/WebCore.xcodeproj/project.pbxproj

    r74487 r74566  
    30423042                9BAB6C6C12550631001626D4 /* EditingStyle.h in Headers */ = {isa = PBXBuildFile; fileRef = 9BAB6C6A12550631001626D4 /* EditingStyle.h */; settings = {ATTRIBUTES = (Private, ); }; };
    30433043                9BAB6C6D12550631001626D4 /* EditingStyle.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 9BAB6C6B12550631001626D4 /* EditingStyle.cpp */; };
     3044                9BAF3B2412C1A39800014BF1 /* WritingDirection.h in Headers */ = {isa = PBXBuildFile; fileRef = 9BAF3B2312C1A39800014BF1 /* WritingDirection.h */; settings = {ATTRIBUTES = (Private, ); }; };
    30443045                9BD0BF9312A42BF50072FD43 /* ScopedEventQueue.h in Headers */ = {isa = PBXBuildFile; fileRef = 9BD0BF9112A42BF50072FD43 /* ScopedEventQueue.h */; };
    30453046                9BD0BF9412A42BF50072FD43 /* ScopedEventQueue.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 9BD0BF9212A42BF50072FD43 /* ScopedEventQueue.cpp */; };
    … …  
    93689369                9BAB6C6A12550631001626D4 /* EditingStyle.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = EditingStyle.h; sourceTree = "<group>"; };
    93699370                9BAB6C6B12550631001626D4 /* EditingStyle.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = EditingStyle.cpp; sourceTree = "<group>"; };
     9371                9BAF3B2312C1A39800014BF1 /* WritingDirection.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WritingDirection.h; sourceTree = "<group>"; };
    93709372                9BD0BF9112A42BF50072FD43 /* ScopedEventQueue.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ScopedEventQueue.h; sourceTree = "<group>"; };
    93719373                9BD0BF9212A42BF50072FD43 /* ScopedEventQueue.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = ScopedEventQueue.cpp; sourceTree = "<group>"; };
    … …  
    1515115153                                93309DD4099E64910056E581 /* WrapContentsInDummySpanCommand.cpp */,
    1515215154                                93309DD5099E64910056E581 /* WrapContentsInDummySpanCommand.h */,
     15155                                9BAF3B2312C1A39800014BF1 /* WritingDirection.h */,
    1515315156                        );
    1515415157                        path = editing;
    … …  
    2209722100                                5112247A10CFB8FF008099D7 /* WorkerThreadableWebSocketChannel.h in Headers */,
    2209822101                                93309E24099E64920056E581 /* WrapContentsInDummySpanCommand.h in Headers */,
     22102                                9BAF3B2412C1A39800014BF1 /* WritingDirection.h in Headers */,
    2209922103                                6565820209D1508D000E61D7 /* XLinkNames.h in Headers */,
    2210022104                                93F1992108245E59001E9ABC /* XMLDocumentParser.h in Headers */,

  • trunk/WebCore/accessibility/AccessibilityRenderObject.cpp

    r74492 r74566  
    24332433    SelectionController selection;
    24342434    selection.setSelection(VisibleSelection(visiblePos));
    2435     selection.modify(SelectionController::AlterationExtend, SelectionController::DirectionRight, LineBoundary);
     2435    selection.modify(SelectionController::AlterationExtend, DirectionRight, LineBoundary);
    24362436   
    24372437    return VisiblePositionRange(selection.selection().visibleStart(), selection.selection().visibleEnd());

  • trunk/WebCore/editing/EditingStyle.h

    r73416 r74566  
    3434#include "Document.h"
    3535#include "Position.h"
     36#include "WritingDirection.h"
    3637
    3738namespace WebCore {
    … …  
    4041class CSSComputedStyleDeclaration;
    4142class CSSMutableStyleDeclaration;
    42 
    43 enum WritingDirection { NaturalWritingDirection, LeftToRightWritingDirection, RightToLeftWritingDirection };
    4443
    4544class EditingStyle : public RefCounted<EditingStyle> {

  • trunk/WebCore/editing/Editor.cpp

    r73886 r74566  
    313313}
    314314
    315 bool Editor::deleteWithDirection(SelectionController::EDirection direction, TextGranularity granularity, bool killRing, bool isTypingAction)
     315bool Editor::deleteWithDirection(SelectionDirection direction, TextGranularity granularity, bool killRing, bool isTypingAction)
    316316{
    317317    if (!canEdit())
    … …  
    330330    } else {
    331331        switch (direction) {
    332         case SelectionController::DirectionForward:
    333         case SelectionController::DirectionRight:
     332        case DirectionForward:
     333        case DirectionRight:
    334334            TypingCommand::forwardDeleteKeyPressed(m_frame->document(), canSmartCopyOrDelete(), granularity, killRing);
    335335            break;
    336         case SelectionController::DirectionBackward:
    337         case SelectionController::DirectionLeft:
     336        case DirectionBackward:
     337        case DirectionLeft:
    338338            TypingCommand::deleteKeyPressed(m_frame->document(), canSmartCopyOrDelete(), granularity, killRing);
    339339            break;
    … …  
    21262126        // Reset the charet one character further.
    21272127        frame()->selection()->moveTo(frame()->selection()->end());
    2128         frame()->selection()->modify(SelectionController::AlterationMove, SelectionController::DirectionForward, CharacterGranularity);
     2128        frame()->selection()->modify(SelectionController::AlterationMove, DirectionForward, CharacterGranularity);
    21292129    }
    21302130
    … …  
    24192419            m_frame->selection()->moveTo(selectionRange->endPosition(), DOWNSTREAM);
    24202420            if (adjustSelectionForParagraphBoundaries)
    2421                 m_frame->selection()->modify(SelectionController::AlterationMove, SelectionController::DirectionForward, CharacterGranularity);
     2421                m_frame->selection()->modify(SelectionController::AlterationMove, DirectionForward, CharacterGranularity);
    24222422        } else {
    24232423            // If this fails for any reason, the fallback is to go one position beyond the last replacement
    24242424            m_frame->selection()->moveTo(m_frame->selection()->end());
    2425             m_frame->selection()->modify(SelectionController::AlterationMove, SelectionController::DirectionForward, CharacterGranularity);
     2425            m_frame->selection()->modify(SelectionController::AlterationMove, DirectionForward, CharacterGranularity);
    24262426        }
    24272427    }

  • trunk/WebCore/editing/Editor.h

    r73886 r74566  
    3030#include "Color.h"
    3131#include "CorrectionPanelInfo.h"
     32#include "DocumentMarker.h"
    3233#include "EditAction.h"
    3334#include "EditingBehavior.h"
    … …  
    3536#include "EditorInsertAction.h"
    3637#include "FindOptions.h"
    37 #include "SelectionController.h"
     38#include "Timer.h"
     39#include "VisibleSelection.h"
     40#include "WritingDirection.h"
    3841
    3942#if PLATFORM(MAC) && !defined(__OBJC__)
    … …  
    4447namespace WebCore {
    4548
     49class CSSMutableStyleDeclaration;
    4650class CSSStyleDeclaration;
    4751class Clipboard;
    … …  
    146150    void clearLastEditCommand();
    147151
    148     bool deleteWithDirection(SelectionController::EDirection, TextGranularity, bool killRing, bool isTypingAction);
     152    bool deleteWithDirection(SelectionDirection, TextGranularity, bool killRing, bool isTypingAction);
    149153    void deleteSelectionWithSmartDelete(bool smartDelete);
    150154    bool dispatchCPPEvent(const AtomicString&, ClipboardAccessPolicy);

  • trunk/WebCore/editing/EditorCommand.cpp

    r74204 r74566  
    328328static bool executeDeleteBackward(Frame* frame, Event*, EditorCommandSource, const String&)
    329329{
    330     frame->editor()->deleteWithDirection(SelectionController::DirectionBackward, CharacterGranularity, false, true);
     330    frame->editor()->deleteWithDirection(DirectionBackward, CharacterGranularity, false, true);
    331331    return true;
    332332}
    … …  
    335335{
    336336    LOG_ERROR("DeleteBackwardByDecomposingPreviousCharacter is not implemented, doing DeleteBackward instead");
    337     frame->editor()->deleteWithDirection(SelectionController::DirectionBackward, CharacterGranularity, false, true);
     337    frame->editor()->deleteWithDirection(DirectionBackward, CharacterGranularity, false, true);
    338338    return true;
    339339}
    … …  
    341341static bool executeDeleteForward(Frame* frame, Event*, EditorCommandSource, const String&)
    342342{
    343     frame->editor()->deleteWithDirection(SelectionController::DirectionForward, CharacterGranularity, false, true);
     343    frame->editor()->deleteWithDirection(DirectionForward, CharacterGranularity, false, true);
    344344    return true;
    345345}
    … …  
    347347static bool executeDeleteToBeginningOfLine(Frame* frame, Event*, EditorCommandSource, const String&)
    348348{
    349     frame->editor()->deleteWithDirection(SelectionController::DirectionBackward, LineBoundary, true, false);
     349    frame->editor()->deleteWithDirection(DirectionBackward, LineBoundary, true, false);
    350350    return true;
    351351}
    … …  
    353353static bool executeDeleteToBeginningOfParagraph(Frame* frame, Event*, EditorCommandSource, const String&)
    354354{
    355     frame->editor()->deleteWithDirection(SelectionController::DirectionBackward, ParagraphBoundary, true, false);
     355    frame->editor()->deleteWithDirection(DirectionBackward, ParagraphBoundary, true, false);
    356356    return true;
    357357}
    … …  
    361361    // Despite its name, this command should delete the newline at the end of
    362362    // a paragraph if you are at the end of a paragraph (like DeleteToEndOfParagraph).
    363     frame->editor()->deleteWithDirection(SelectionController::DirectionForward, LineBoundary, true, false);
     363    frame->editor()->deleteWithDirection(DirectionForward, LineBoundary, true, false);
    364364    return true;
    365365}
    … …  
    369369    // Despite its name, this command should delete the newline at the end of
    370370    // a paragraph if you are at the end of a paragraph.
    371     frame->editor()->deleteWithDirection(SelectionController::DirectionForward, ParagraphBoundary, true, false);
     371    frame->editor()->deleteWithDirection(DirectionForward, ParagraphBoundary, true, false);
    372372    return true;
    373373}
    … …  
    390390static bool executeDeleteWordBackward(Frame* frame, Event*, EditorCommandSource, const String&)
    391391{
    392     frame->editor()->deleteWithDirection(SelectionController::DirectionBackward, WordGranularity, true, false);
     392    frame->editor()->deleteWithDirection(DirectionBackward, WordGranularity, true, false);
    393393    return true;
    394394}
    … …  
    396396static bool executeDeleteWordForward(Frame* frame, Event*, EditorCommandSource, const String&)
    397397{
    398     frame->editor()->deleteWithDirection(SelectionController::DirectionForward, WordGranularity, true, false);
     398    frame->editor()->deleteWithDirection(DirectionForward, WordGranularity, true, false);
    399399    return true;
    400400}
    … …  
    449449    switch (source) {
    450450    case CommandFromMenuOrKeyBinding:
    451         frame->editor()->deleteWithDirection(SelectionController::DirectionForward, CharacterGranularity, false, true);
     451        frame->editor()->deleteWithDirection(DirectionForward, CharacterGranularity, false, true);
    452452        return true;
    453453    case CommandFromDOM:
    … …  
    607607static bool executeMoveBackward(Frame* frame, Event*, EditorCommandSource, const String&)
    608608{
    609     frame->selection()->modify(SelectionController::AlterationMove, SelectionController::DirectionBackward, CharacterGranularity, true);
     609    frame->selection()->modify(SelectionController::AlterationMove, DirectionBackward, CharacterGranularity, true);
    610610    return true;
    611611}
    … …  
    613613static bool executeMoveBackwardAndModifySelection(Frame* frame, Event*, EditorCommandSource, const String&)
    614614{
    615     frame->selection()->modify(SelectionController::AlterationExtend, SelectionController::DirectionBackward, CharacterGranularity, true);
     615    frame->selection()->modify(SelectionController::AlterationExtend, DirectionBackward, CharacterGranularity, true);
    616616    return true;
    617617}
    … …  
    619619static bool executeMoveDown(Frame* frame, Event*, EditorCommandSource, const String&)
    620620{
    621     return frame->selection()->modify(SelectionController::AlterationMove, SelectionController::DirectionForward, LineGranularity, true);
     621    return frame->selection()->modify(SelectionController::AlterationMove, DirectionForward, LineGranularity, true);
    622622}
    623623
    624624static bool executeMoveDownAndModifySelection(Frame* frame, Event*, EditorCommandSource, const String&)
    625625{
    626     frame->selection()->modify(SelectionController::AlterationExtend, SelectionController::DirectionForward, LineGranularity, true);
     626    frame->selection()->modify(SelectionController::AlterationExtend, DirectionForward, LineGranularity, true);
    627627    return true;
    628628}
    … …  
    630630static bool executeMoveForward(Frame* frame, Event*, EditorCommandSource, const String&)
    631631{
    632     frame->selection()->modify(SelectionController::AlterationMove, SelectionController::DirectionForward, CharacterGranularity, true);
     632    frame->selection()->modify(SelectionController::AlterationMove, DirectionForward, CharacterGranularity, true);
    633633    return true;
    634634}
    … …  
    636636static bool executeMoveForwardAndModifySelection(Frame* frame, Event*, EditorCommandSource, const String&)
    637637{
    638     frame->selection()->modify(SelectionController::AlterationExtend, SelectionController::DirectionForward, CharacterGranularity, true);
     638    frame->selection()->modify(SelectionController::AlterationExtend, DirectionForward, CharacterGranularity, true);
    639639    return true;
    640640}
    … …  
    642642static bool executeMoveLeft(Frame* frame, Event*, EditorCommandSource, const String&)
    643643{
    644     return frame->selection()->modify(SelectionController::AlterationMove, SelectionController::DirectionLeft, CharacterGranularity, true);
     644    return frame->selection()->modify(SelectionController::AlterationMove, DirectionLeft, CharacterGranularity, true);
    645645}
    646646
    647647static bool executeMoveLeftAndModifySelection(Frame* frame, Event*, EditorCommandSource, const String&)
    648648{
    649     frame->selection()->modify(SelectionController::AlterationExtend, SelectionController::DirectionLeft, CharacterGranularity, true);
     649    frame->selection()->modify(SelectionController::AlterationExtend, DirectionLeft, CharacterGranularity, true);
    650650    return true;
    651651}
    … …  
    685685static bool executeMoveRight(Frame* frame, Event*, EditorCommandSource, const String&)
    686686{
    687     return frame->selection()->modify(SelectionController::AlterationMove, SelectionController::DirectionRight, CharacterGranularity, true);
     687    return frame->selection()->modify(SelectionController::AlterationMove, DirectionRight, CharacterGranularity, true);
    688688}
    689689
    690690static bool executeMoveRightAndModifySelection(Frame* frame, Event*, EditorCommandSource, const String&)
    691691{
    692     frame->selection()->modify(SelectionController::AlterationExtend, SelectionController::DirectionRight, CharacterGranularity, true);
     692    frame->selection()->modify(SelectionController::AlterationExtend, DirectionRight, CharacterGranularity, true);
    693693    return true;
    694694}
    … …  
    696696static bool executeMoveToBeginningOfDocument(Frame* frame, Event*, EditorCommandSource, const String&)
    697697{
    698     frame->selection()->modify(SelectionController::AlterationMove, SelectionController::DirectionBackward, DocumentBoundary, true);
     698    frame->selection()->modify(SelectionController::AlterationMove, DirectionBackward, DocumentBoundary, true);
    699699    return true;
    700700}
    … …  
    702702static bool executeMoveToBeginningOfDocumentAndModifySelection(Frame* frame, Event*, EditorCommandSource, const String&)
    703703{
    704     frame->selection()->modify(SelectionController::AlterationExtend, SelectionController::DirectionBackward, DocumentBoundary, true);
     704    frame->selection()->modify(SelectionController::AlterationExtend, DirectionBackward, DocumentBoundary, true);
    705705    return true;
    706706}
    … …  
    708708static bool executeMoveToBeginningOfLine(Frame* frame, Event*, EditorCommandSource, const String&)
    709709{
    710     frame->selection()->modify(SelectionController::AlterationMove, SelectionController::DirectionBackward, LineBoundary, true);
     710    frame->selection()->modify(SelectionController::AlterationMove, DirectionBackward, LineBoundary, true);
    711711    return true;
    712712}
    … …  
    714714static bool executeMoveToBeginningOfLineAndModifySelection(Frame* frame, Event*, EditorCommandSource, const String&)
    715715{
    716     frame->selection()->modify(SelectionController::AlterationExtend, SelectionController::DirectionBackward, LineBoundary, true);
     716    frame->selection()->modify(SelectionController::AlterationExtend, DirectionBackward, LineBoundary, true);
    717717    return true;
    718718}
    … …  
    720720static bool executeMoveToBeginningOfParagraph(Frame* frame, Event*, EditorCommandSource, const String&)
    721721{
    722     frame->selection()->modify(SelectionController::AlterationMove, SelectionController::DirectionBackward, ParagraphBoundary, true);
     722    frame->selection()->modify(SelectionController::AlterationMove, DirectionBackward, ParagraphBoundary, true);
    723723    return true;
    724724}
    … …  
    726726static bool executeMoveToBeginningOfParagraphAndModifySelection(Frame* frame, Event*, EditorCommandSource, const String&)
    727727{
    728     frame->selection()->modify(SelectionController::AlterationExtend, SelectionController::DirectionBackward, ParagraphBoundary, true);
     728    frame->selection()->modify(SelectionController::AlterationExtend, DirectionBackward, ParagraphBoundary, true);
    729729    return true;
    730730}
    … …  
    732732static bool executeMoveToBeginningOfSentence(Frame* frame, Event*, EditorCommandSource, const String&)
    733733{
    734     frame->selection()->modify(SelectionController::AlterationMove, SelectionController::DirectionBackward, SentenceBoundary, true);
     734    frame->selection()->modify(SelectionController::AlterationMove, DirectionBackward, SentenceBoundary, true);
    735735    return true;
    736736}
    … …  
    738738static bool executeMoveToBeginningOfSentenceAndModifySelection(Frame* frame, Event*, EditorCommandSource, const String&)
    739739{
    740     frame->selection()->modify(SelectionController::AlterationExtend, SelectionController::DirectionBackward, SentenceBoundary, true);
     740    frame->selection()->modify(SelectionController::AlterationExtend, DirectionBackward, SentenceBoundary, true);
    741741    return true;
    742742}
    … …  
    744744static bool executeMoveToEndOfDocument(Frame* frame, Event*, EditorCommandSource, const String&)
    745745{
    746     frame->selection()->modify(SelectionController::AlterationMove, SelectionController::DirectionForward, DocumentBoundary, true);
     746    frame->selection()->modify(SelectionController::AlterationMove, DirectionForward, DocumentBoundary, true);
    747747    return true;
    748748}
    … …  
    750750static bool executeMoveToEndOfDocumentAndModifySelection(Frame* frame, Event*, EditorCommandSource, const String&)
    751751{
    752     frame->selection()->modify(SelectionController::AlterationExtend, SelectionController::DirectionForward, DocumentBoundary, true);
     752    frame->selection()->modify(SelectionController::AlterationExtend, DirectionForward, DocumentBoundary, true);
    753753    return true;
    754754}
    … …  
    756756static bool executeMoveToEndOfSentence(Frame* frame, Event*, EditorCommandSource, const String&)
    757757{
    758     frame->selection()->modify(SelectionController::AlterationMove, SelectionController::DirectionForward, SentenceBoundary, true);
     758    frame->selection()->modify(SelectionController::AlterationMove, DirectionForward, SentenceBoundary, true);
    759759    return true;
    760760}
    … …  
    762762static bool executeMoveToEndOfSentenceAndModifySelection(Frame* frame, Event*, EditorCommandSource, const String&)
    763763{
    764     frame->selection()->modify(SelectionController::AlterationExtend, SelectionController::DirectionForward, SentenceBoundary, true);
     764    frame->selection()->modify(SelectionController::AlterationExtend, DirectionForward, SentenceBoundary, true);
    765765    return true;
    766766}
    … …  
    768768static bool executeMoveToEndOfLine(Frame* frame, Event*, EditorCommandSource, const String&)
    769769{
    770     frame->selection()->modify(SelectionController::AlterationMove, SelectionController::DirectionForward, LineBoundary, true);
     770    frame->selection()->modify(SelectionController::AlterationMove, DirectionForward, LineBoundary, true);
    771771    return true;
    772772}
    … …  
    774774static bool executeMoveToEndOfLineAndModifySelection(Frame* frame, Event*, EditorCommandSource, const String&)
    775775{
    776     frame->selection()->modify(SelectionController::AlterationExtend, SelectionController::DirectionForward, LineBoundary, true);
     776    frame->selection()->modify(SelectionController::AlterationExtend, DirectionForward, LineBoundary, true);
    777777    return true;
    778778}
    … …  
    780780static bool executeMoveToEndOfParagraph(Frame* frame, Event*, EditorCommandSource, const String&)
    781781{
    782     frame->selection()->modify(SelectionController::AlterationMove, SelectionController::DirectionForward, ParagraphBoundary, true);
     782    frame->selection()->modify(SelectionController::AlterationMove, DirectionForward, ParagraphBoundary, true);
    783783    return true;
    784784}
    … …  
    786786static bool executeMoveToEndOfParagraphAndModifySelection(Frame* frame, Event*, EditorCommandSource, const String&)
    787787{
    788     frame->selection()->modify(SelectionController::AlterationExtend, SelectionController::DirectionForward, ParagraphBoundary, true);
     788    frame->selection()->modify(SelectionController::AlterationExtend, DirectionForward, ParagraphBoundary, true);
    789789    return true;
    790790}
    … …  
    792792static bool executeMoveParagraphBackwardAndModifySelection(Frame* frame, Event*, EditorCommandSource, const String&)
    793793{
    794     frame->selection()->modify(SelectionController::AlterationExtend, SelectionController::DirectionBackward, ParagraphGranularity, true);
     794    frame->selection()->modify(SelectionController::AlterationExtend, DirectionBackward, ParagraphGranularity, true);
    795795    return true;
    796796}
    … …  
    798798static bool executeMoveParagraphForwardAndModifySelection(Frame* frame, Event*, EditorCommandSource, const String&)
    799799{
    800     frame->selection()->modify(SelectionController::AlterationExtend, SelectionController::DirectionForward, ParagraphGranularity, true);
     800    frame->selection()->modify(SelectionController::AlterationExtend, DirectionForward, ParagraphGranularity, true);
    801801    return true;
    802802}
    … …  
    804804static bool executeMoveUp(Frame* frame, Event*, EditorCommandSource, const String&)
    805805{
    806     return frame->selection()->modify(SelectionController::AlterationMove, SelectionController::DirectionBackward, LineGranularity, true);
     806    return frame->selection()->modify(SelectionController::AlterationMove, DirectionBackward, LineGranularity, true);
    807807}
    808808
    809809static bool executeMoveUpAndModifySelection(Frame* frame, Event*, EditorCommandSource, const String&)
    810810{
    811     frame->selection()->modify(SelectionController::AlterationExtend, SelectionController::DirectionBackward, LineGranularity, true);
     811    frame->selection()->modify(SelectionController::AlterationExtend, DirectionBackward, LineGranularity, true);
    812812    return true;
    813813}
    … …  
    815815static bool executeMoveWordBackward(Frame* frame, Event*, EditorCommandSource, const String&)
    816816{
    817     frame->selection()->modify(SelectionController::AlterationMove, SelectionController::DirectionBackward, WordGranularity, true);
     817    frame->selection()->modify(SelectionController::AlterationMove, DirectionBackward, WordGranularity, true);
    818818    return true;
    819819}
    … …  
    821821static bool executeMoveWordBackwardAndModifySelection(Frame* frame, Event*, EditorCommandSource, const String&)
    822822{
    823     frame->selection()->modify(SelectionController::AlterationExtend, SelectionController::DirectionBackward, WordGranularity, true);
     823    frame->selection()->modify(SelectionController::AlterationExtend, DirectionBackward, WordGranularity, true);
    824824    return true;
    825825}
    … …  
    827827static bool executeMoveWordForward(Frame* frame, Event*, EditorCommandSource, const String&)
    828828{
    829     frame->selection()->modify(SelectionController::AlterationMove, SelectionController::DirectionForward, WordGranularity, true);
     829    frame->selection()->modify(SelectionController::AlterationMove, DirectionForward, WordGranularity, true);
    830830    return true;
    831831}
    … …  
    833833static bool executeMoveWordForwardAndModifySelection(Frame* frame, Event*, EditorCommandSource, const String&)
    834834{
    835     frame->selection()->modify(SelectionController::AlterationExtend, SelectionController::DirectionForward, WordGranularity, true);
     835    frame->selection()->modify(SelectionController::AlterationExtend, DirectionForward, WordGranularity, true);
    836836    return true;
    837837}
    … …  
    839839static bool executeMoveWordLeft(Frame* frame, Event*, EditorCommandSource, const String&)
    840840{
    841     frame->selection()->modify(SelectionController::AlterationMove, SelectionController::DirectionLeft, WordGranularity, true);
     841    frame->selection()->modify(SelectionController::AlterationMove, DirectionLeft, WordGranularity, true);
    842842    return true;
    843843}
    … …  
    845845static bool executeMoveWordLeftAndModifySelection(Frame* frame, Event*, EditorCommandSource, const String&)
    846846{
    847     frame->selection()->modify(SelectionController::AlterationExtend, SelectionController::DirectionLeft, WordGranularity, true);
     847    frame->selection()->modify(SelectionController::AlterationExtend, DirectionLeft, WordGranularity, true);
    848848    return true;
    849849}
    … …  
    851851static bool executeMoveWordRight(Frame* frame, Event*, EditorCommandSource, const String&)
    852852{
    853     frame->selection()->modify(SelectionController::AlterationMove, SelectionController::DirectionRight, WordGranularity, true);
     853    frame->selection()->modify(SelectionController::AlterationMove, DirectionRight, WordGranularity, true);
    854854    return true;
    855855}
    … …  
    857857static bool executeMoveWordRightAndModifySelection(Frame* frame, Event*, EditorCommandSource, const String&)
    858858{
    859     frame->selection()->modify(SelectionController::AlterationExtend, SelectionController::DirectionRight, WordGranularity, true);
     859    frame->selection()->modify(SelectionController::AlterationExtend, DirectionRight, WordGranularity, true);
    860860    return true;
    861861}
    … …  
    863863static bool executeMoveToLeftEndOfLine(Frame* frame, Event*, EditorCommandSource, const String&)
    864864{
    865     frame->selection()->modify(SelectionController::AlterationMove, SelectionController::DirectionLeft, LineBoundary, true);
     865    frame->selection()->modify(SelectionController::AlterationMove, DirectionLeft, LineBoundary, true);
    866866    return true;
    867867}
    … …  
    869869static bool executeMoveToLeftEndOfLineAndModifySelection(Frame* frame, Event*, EditorCommandSource, const String&)
    870870{
    871     frame->selection()->modify(SelectionController::AlterationExtend, SelectionController::DirectionLeft, LineBoundary, true);
     871    frame->selection()->modify(SelectionController::AlterationExtend, DirectionLeft, LineBoundary, true);
    872872    return true;
    873873}
    … …  
    875875static bool executeMoveToRightEndOfLine(Frame* frame, Event*, EditorCommandSource, const String&)
    876876{
    877     frame->selection()->modify(SelectionController::AlterationMove, SelectionController::DirectionRight, LineBoundary, true);
     877    frame->selection()->modify(SelectionController::AlterationMove, DirectionRight, LineBoundary, true);
    878878    return true;
    879879}
    … …  
    881881static bool executeMoveToRightEndOfLineAndModifySelection(Frame* frame, Event*, EditorCommandSource, const String&)
    882882{
    883     frame->selection()->modify(SelectionController::AlterationExtend, SelectionController::DirectionRight, LineBoundary, true);
     883    frame->selection()->modify(SelectionController::AlterationExtend, DirectionRight, LineBoundary, true);
    884884    return true;
    885885}

  • trunk/WebCore/editing/SelectionController.cpp

    r74452 r74566  
    254254}
    255255
    256 void SelectionController::willBeModified(EAlteration alter, EDirection direction)
     256void SelectionController::willBeModified(EAlteration alter, SelectionDirection direction)
    257257{
    258258    if (alter != AlterationExtend)
    … …  
    621621    return granularity == LineBoundary || granularity == ParagraphBoundary || granularity == DocumentBoundary;
    622622}   
    623    
    624 bool SelectionController::modify(EAlteration alter, EDirection direction, TextGranularity granularity, bool userTriggered)
     623
     624bool SelectionController::modify(EAlteration alter, SelectionDirection direction, TextGranularity granularity, bool userTriggered)
    625625{
    626626    if (userTriggered) {

  • trunk/WebCore/editing/SelectionController.h

    r73416 r74566  
    5151public:
    5252    enum EAlteration { AlterationMove, AlterationExtend };
    53     enum EDirection { DirectionForward, DirectionBackward, DirectionRight, DirectionLeft };
    5453    enum CursorAlignOnScroll { AlignCursorOnScrollIfNeeded,
    5554                               AlignCursorOnScrollAlways };
    … …  
    8483    EAffinity affinity() const { return m_selection.affinity(); }
    8584
    86     bool modify(EAlteration, EDirection, TextGranularity, bool userTriggered = false);
     85    bool modify(EAlteration, SelectionDirection, TextGranularity, bool userTriggered = false);
    8786    bool modify(EAlteration, int verticalDistance, bool userTriggered = false, CursorAlignOnScroll = AlignCursorOnScrollIfNeeded);
    8887    TextGranularity granularity() const { return m_granularity; }
    … …  
    113112
    114113    void setIsDirectional(bool);
    115     void willBeModified(EAlteration, EDirection);
    116    
     114    void willBeModified(EAlteration, SelectionDirection);
     115
    117116    bool isNone() const { return m_selection.isNone(); }
    118117    bool isCaret() const { return m_selection.isCaret(); }

  • trunk/WebCore/editing/TypingCommand.cpp

    r73279 r74566  
    460460        SelectionController selection;
    461461        selection.setSelection(endingSelection());
    462         selection.modify(SelectionController::AlterationExtend, SelectionController::DirectionBackward, granularity);
     462        selection.modify(SelectionController::AlterationExtend, DirectionBackward, granularity);
    463463        if (killRing && selection.isCaret() && granularity != CharacterGranularity)
    464             selection.modify(SelectionController::AlterationExtend, SelectionController::DirectionBackward, CharacterGranularity);
     464            selection.modify(SelectionController::AlterationExtend, DirectionBackward, CharacterGranularity);
    465465
    466466        if (endingSelection().visibleStart().previous(true).isNull()) {
    … …  
    488488                return;
    489489            // Extend the selection backward into the last cell, then deletion will handle the move.
    490             selection.modify(SelectionController::AlterationExtend, SelectionController::DirectionBackward, granularity);
     490            selection.modify(SelectionController::AlterationExtend, DirectionBackward, granularity);
    491491        // If the caret is just after a table, select the table and don't delete anything.
    492492        } else if (Node* table = isFirstPositionAfterTable(visibleStart)) {
    … …  
    557557        SelectionController selection;
    558558        selection.setSelection(endingSelection());
    559         selection.modify(SelectionController::AlterationExtend, SelectionController::DirectionForward, granularity);
     559        selection.modify(SelectionController::AlterationExtend, DirectionForward, granularity);
    560560        if (killRing && selection.isCaret() && granularity != CharacterGranularity)
    561             selection.modify(SelectionController::AlterationExtend, SelectionController::DirectionForward, CharacterGranularity);
     561            selection.modify(SelectionController::AlterationExtend, DirectionForward, CharacterGranularity);
    562562
    563563        Position downstreamEnd = endingSelection().end().downstream();
    … …  
    574574        // deleting to end of paragraph when at end of paragraph needs to merge the next paragraph (if any)
    575575        if (granularity == ParagraphBoundary && selection.selection().isCaret() && isEndOfParagraph(selection.selection().visibleEnd()))
    576             selection.modify(SelectionController::AlterationExtend, SelectionController::DirectionForward, CharacterGranularity);
     576            selection.modify(SelectionController::AlterationExtend, DirectionForward, CharacterGranularity);
    577577
    578578        selectionToDelete = selection.selection();

  • trunk/WebCore/editing/VisibleSelection.h

    r66032 r74566  
    3535
    3636const EAffinity SEL_DEFAULT_AFFINITY = DOWNSTREAM;
     37enum SelectionDirection { DirectionForward, DirectionBackward, DirectionRight, DirectionLeft };
    3738
    3839class VisibleSelection {

  • trunk/WebCore/page/DOMSelection.cpp

    r73618 r74566  
    299299        return;
    300300
    301     SelectionController::EDirection direction;
     301    SelectionDirection direction;
    302302    if (equalIgnoringCase(directionString, "forward"))
    303         direction = SelectionController::DirectionForward;
     303        direction = DirectionForward;
    304304    else if (equalIgnoringCase(directionString, "backward"))
    305         direction = SelectionController::DirectionBackward;
     305        direction = DirectionBackward;
    306306    else if (equalIgnoringCase(directionString, "left"))
    307         direction = SelectionController::DirectionLeft;
     307        direction = DirectionLeft;
    308308    else if (equalIgnoringCase(directionString, "right"))
    309         direction = SelectionController::DirectionRight;
     309        direction = DirectionRight;
    310310    else
    311311        return;
    … …  
    437437
    438438    if (isCollapsed())
    439         selection->modify(SelectionController::AlterationExtend, SelectionController::DirectionBackward, CharacterGranularity);
     439        selection->modify(SelectionController::AlterationExtend, DirectionBackward, CharacterGranularity);
    440440
    441441    RefPtr<Range> selectedRange = selection->selection().toNormalizedRange();

  • trunk/WebCore/page/EventHandler.cpp

    r74553 r74566  
    23922392   
    23932393    if (key == "Up") {
    2394         m_frame->selection()->modify((isShifted) ? SelectionController::AlterationExtend : SelectionController::AlterationMove, SelectionController::DirectionBackward, (isCommanded) ? DocumentBoundary : LineGranularity, true);
     2394        m_frame->selection()->modify((isShifted) ? SelectionController::AlterationExtend : SelectionController::AlterationMove, DirectionBackward, (isCommanded) ? DocumentBoundary : LineGranularity, true);
    23952395        event->setDefaultHandled();
    23962396    } else if (key == "Down") {
    2397         m_frame->selection()->modify((isShifted) ? SelectionController::AlterationExtend : SelectionController::AlterationMove, SelectionController::DirectionForward, (isCommanded) ? DocumentBoundary : LineGranularity, true);
     2397        m_frame->selection()->modify((isShifted) ? SelectionController::AlterationExtend : SelectionController::AlterationMove, DirectionForward, (isCommanded) ? DocumentBoundary : LineGranularity, true);
    23982398        event->setDefaultHandled();
    23992399    } else if (key == "Left") {
    2400         m_frame->selection()->modify((isShifted) ? SelectionController::AlterationExtend : SelectionController::AlterationMove, SelectionController::DirectionLeft, (isCommanded) ? LineBoundary : (isOptioned) ? WordGranularity : CharacterGranularity, true);
     2400        m_frame->selection()->modify((isShifted) ? SelectionController::AlterationExtend : SelectionController::AlterationMove, DirectionLeft, (isCommanded) ? LineBoundary : (isOptioned) ? WordGranularity : CharacterGranularity, true);
    24012401        event->setDefaultHandled();
    24022402    } else if (key == "Right") {
    2403         m_frame->selection()->modify((isShifted) ? SelectionController::AlterationExtend : SelectionController::AlterationMove, SelectionController::DirectionRight, (isCommanded) ? LineBoundary : (isOptioned) ? WordGranularity : CharacterGranularity, true);
     2403        m_frame->selection()->modify((isShifted) ? SelectionController::AlterationExtend : SelectionController::AlterationMove, DirectionRight, (isCommanded) ? LineBoundary : (isOptioned) ? WordGranularity : CharacterGranularity, true);
    24042404        event->setDefaultHandled();
    24052405    }   

  • trunk/WebCore/page/Frame.h

    r71790 r74566  
    3535#include "FrameLoader.h"
    3636#include "FrameTree.h"
     37#include "SelectionController.h"
    3738#include "ScriptController.h"
    3839#include "UserScriptTypes.h"

  • trunk/WebKit/chromium/ChangeLog

    r74561 r74566  
     12010-12-22  Ryosuke Niwa  <rniwa@webkit.org>
     2
     3        Reviewed by Eric Seidel.
     4
     5        Editor.h doesn't need to include SelectionController.h
     6        https://bugs.webkit.org/show_bug.cgi?id=51441
     7
     8        Renamed SelectionController::EDirection to SelectionDirection.
     9
     10        * src/WebFrameImpl.cpp:
     11        (WebKit::WebFrameImpl::executeCommand):
     12
    1132010-12-23  W. James MacLean  <wjmaclean@chromium.org>
    214

  • trunk/WebKit/chromium/src/WebFrameImpl.cpp

    r73436 r74566  
    11511151    if (command == "DeleteToEndOfParagraph") {
    11521152        Editor* editor = frame()->editor();
    1153         if (!editor->deleteWithDirection(SelectionController::DirectionForward,
     1153        if (!editor->deleteWithDirection(DirectionForward,
    11541154                                         ParagraphBoundary,
    11551155                                         true,
    11561156                                         false)) {
    1157             editor->deleteWithDirection(SelectionController::DirectionForward,
     1157            editor->deleteWithDirection(DirectionForward,
    11581158                                        CharacterGranularity,
    11591159                                        true,

  • trunk/WebKit/efl/ChangeLog

    r74556 r74566  
     12010-12-22  Ryosuke Niwa  <rniwa@webkit.org>
     2
     3        Reviewed by Eric Seidel.
     4
     5        Editor.h doesn't need to include SelectionController.h
     6        https://bugs.webkit.org/show_bug.cgi?id=51441
     7
     8        Renamed SelectionController::EDirection to SelectionDirection.
     9
     10        * WebCoreSupport/EditorClientEfl.cpp:
     11        (WebCore::EditorClientEfl::handleEditingKeyboardEvent):
     12
    1132010-12-23  Lucas De Marchi  <lucas.demarchi@profusion.mobi>
    214

  • trunk/WebKit/efl/WebCoreSupport/EditorClientEfl.cpp

    r73088 r74566  
    344344        case VK_LEFT:
    345345            frame->selection()->modify(keyEvent->shiftKey() ? SelectionController::AlterationExtend : SelectionController::AlterationMove,
    346                     SelectionController::DirectionLeft,
     346                    DirectionLeft,
    347347                    keyEvent->ctrlKey() ? WordGranularity : CharacterGranularity,
    348348                    true);
    … …  
    350350        case VK_RIGHT:
    351351            frame->selection()->modify(keyEvent->shiftKey() ? SelectionController::AlterationExtend : SelectionController::AlterationMove,
    352                     SelectionController::DirectionRight,
     352                    DirectionRight,
    353353                    keyEvent->ctrlKey() ? WordGranularity : CharacterGranularity,
    354354                    true);
    … …  
    356356        case VK_UP:
    357357            frame->selection()->modify(keyEvent->shiftKey() ? SelectionController::AlterationExtend : SelectionController::AlterationMove,
    358                     SelectionController::DirectionBackward,
     358                    DirectionBackward,
    359359                    keyEvent->ctrlKey() ? ParagraphGranularity : LineGranularity,
    360360                    true);
    … …  
    362362        case VK_DOWN:
    363363            frame->selection()->modify(keyEvent->shiftKey() ? SelectionController::AlterationExtend : SelectionController::AlterationMove,
    364                     SelectionController::DirectionForward,
     364                    DirectionForward,
    365365                    keyEvent->ctrlKey() ? ParagraphGranularity : LineGranularity,
    366366                    true);

  • trunk/WebKit/haiku/ChangeLog

    r73886 r74566  
     12010-12-22  Ryosuke Niwa  <rniwa@webkit.org>
     2
     3        Reviewed by Eric Seidel.
     4
     5        Editor.h doesn't need to include SelectionController.h
     6        https://bugs.webkit.org/show_bug.cgi?id=51441
     7
     8        Renamed SelectionController::EDirection to SelectionDirection.
     9
     10        * WebCoreSupport/EditorClientHaiku.cpp:
     11        (WebCore::EditorClientHaiku::handleKeyboardEvent):
     12
    1132010-10-28  MORITA Hajime  <morrita@google.com>
    214

  • trunk/WebKit/haiku/WebCoreSupport/EditorClientHaiku.cpp

    r73088 r74566  
    254254        switch (kevent->windowsVirtualKeyCode()) {
    255255        case VK_BACK:
    256             frame->editor()->deleteWithDirection(SelectionController::DirectionBackward,
     256            frame->editor()->deleteWithDirection(DirectionBackward,
    257257                                                 kevent->ctrlKey() ? WordGranularity : CharacterGranularity,
    258258                                                 false, true);
    259259            break;
    260260        case VK_DELETE:
    261             frame->editor()->deleteWithDirection(SelectionController::DirectionForward,
     261            frame->editor()->deleteWithDirection(DirectionForward,
    262262                                                 kevent->ctrlKey() ? WordGranularity : CharacterGranularity,
    263263                                                 false, true);
    … …  
    265265        case VK_LEFT:
    266266            frame->selection()->modify(kevent->shiftKey() ? SelectionController::AlterationExtend : SelectionController::AlterationMove,
    267                                        SelectionController::DirectionLeft,
     267                                       DirectionLeft,
    268268                                       kevent->ctrlKey() ? WordGranularity : CharacterGranularity,
    269269                                       true);
    … …  
    271271        case VK_RIGHT:
    272272            frame->selection()->modify(kevent->shiftKey() ? SelectionController::AlterationExtend : SelectionController::AlterationMove,
    273                                        SelectionController::DirectionRight,
     273                                       DirectionRight,
    274274                                       kevent->ctrlKey() ? WordGranularity : CharacterGranularity,
    275275                                       true);
    … …  
    277277        case VK_UP:
    278278            frame->selection()->modify(kevent->shiftKey() ? SelectionController::AlterationExtend : SelectionController::AlterationMove,
    279                                        SelectionController::DirectionBackward,
     279                                       DirectionBackward,
    280280                                       kevent->ctrlKey() ? ParagraphGranularity : LineGranularity,
    281281                                       true);
    … …  
    283283        case VK_DOWN:
    284284            frame->selection()->modify(kevent->shiftKey() ? SelectionController::AlterationExtend : SelectionController::AlterationMove,
    285                                        SelectionController::DirectionForward,
     285                                       DirectionForward,
    286286                                       kevent->ctrlKey() ? ParagraphGranularity : LineGranularity,
    287287                                       true);

  • trunk/WebKit/mac/ChangeLog

    r74524 r74566  
     12010-12-22  Ryosuke Niwa  <rniwa@webkit.org>
     2
     3        Reviewed by Eric Seidel.
     4
     5        Editor.h doesn't need to include SelectionController.h
     6        https://bugs.webkit.org/show_bug.cgi?id=51441
     7
     8        Renamed SelectionController::EDirection to SelectionDirection.
     9
     10        * WebView/WebFrame.mm:
     11        (-[WebFrame _rangeByAlteringCurrentSelection:SelectionController::direction:granularity:]):
     12        Takes SelectionDirection instead of SelectionController::EDirection.
     13        * WebView/WebFrameInternal.h:
     14        * WebView/WebTextCompletionController.mm:
     15        (-[WebTextCompletionController doCompletion]): Calls _rangeByAlteringCurrentSelection:SelectionController.
     16
    1172010-12-22  Simon Fraser  <simon.fraser@apple.com>
    218

  • trunk/WebKit/mac/WebView/WebFrame.mm

    r73664 r74566  
    709709}
    710710
    711 - (DOMRange *)_rangeByAlteringCurrentSelection:(SelectionController::EAlteration)alteration direction:(SelectionController::EDirection)direction granularity:(TextGranularity)granularity
     711- (DOMRange *)_rangeByAlteringCurrentSelection:(SelectionController::EAlteration)alteration direction:(SelectionDirection)direction granularity:(TextGranularity)granularity
    712712{
    713713    if (_private->coreFrame->selection()->isNone())

  • trunk/WebKit/mac/WebView/WebFrameInternal.h

    r67253 r74566  
    141141- (id)_accessibilityTree;
    142142
    143 - (DOMRange *)_rangeByAlteringCurrentSelection:(WebCore::SelectionController::EAlteration)alteration direction:(WebCore::SelectionController::EDirection)direction granularity:(WebCore::TextGranularity)granularity;
     143- (DOMRange *)_rangeByAlteringCurrentSelection:(WebCore::SelectionController::EAlteration)alteration direction:(WebCore::SelectionDirection)direction granularity:(WebCore::TextGranularity)granularity;
    144144- (NSRange)_convertToNSRange:(WebCore::Range*)range;
    145145- (DOMRange *)_convertNSRangeToDOMRange:(NSRange)range;

  • trunk/WebKit/mac/WebView/WebTextCompletionController.mm

    r73664 r74566  
    174174        DOMRange *selection = kit(core(frame)->selection()->toNormalizedRange().get());
    175175        DOMRange *wholeWord = [frame _rangeByAlteringCurrentSelection:SelectionController::AlterationExtend
    176             direction:SelectionController::DirectionBackward granularity:WordGranularity];
     176            direction:DirectionBackward granularity:WordGranularity];
    177177        DOMRange *prefix = [wholeWord cloneRange];
    178178        [prefix setEnd:[selection startContainer] offset:[selection startOffset]];

  • trunk/WebKit/qt/ChangeLog

    r74558 r74566  
     12010-12-22  Ryosuke Niwa  <rniwa@webkit.org>
     2
     3        Reviewed by Eric Seidel.
     4
     5        Editor.h doesn't need to include SelectionController.h
     6        https://bugs.webkit.org/show_bug.cgi?id=51441
     7
     8        Renamed SelectionController::EDirection to SelectionDirection.
     9
     10        * WebCoreSupport/EditorClientQt.cpp:
     11        (WebCore::EditorClientQt::handleKeyboardEvent):
     12
    1132010-12-23  Dawit Alemayehu  <adawit@kde.org>
    214

  • trunk/WebKit/qt/WebCoreSupport/EditorClientQt.cpp

    r74270 r74566  
    392392        switch (kevent->windowsVirtualKeyCode()) {
    393393        case VK_BACK:
    394             frame->editor()->deleteWithDirection(SelectionController::DirectionBackward,
     394            frame->editor()->deleteWithDirection(DirectionBackward,
    395395                    CharacterGranularity, false, true);
    396396            break;
    397397        case VK_DELETE:
    398             frame->editor()->deleteWithDirection(SelectionController::DirectionForward,
     398            frame->editor()->deleteWithDirection(DirectionForward,
    399399                    CharacterGranularity, false, true);
    400400            break;

  • trunk/WebKit/wince/ChangeLog

    r73886 r74566  
     12010-12-22  Ryosuke Niwa  <rniwa@webkit.org>
     2
     3        Reviewed by Eric Seidel.
     4
     5        Editor.h doesn't need to include SelectionController.h
     6        https://bugs.webkit.org/show_bug.cgi?id=51441
     7
     8        Renamed SelectionController::EDirection to SelectionDirection.
     9
     10        * WebCoreSupport/EditorClientWinCE.cpp:
     11        (WebKit::EditorClientWinCE::handleEditingKeyboardEvent):
     12
    1132010-10-28  MORITA Hajime  <morrita@google.com>
    214

  • trunk/WebKit/wince/WebCoreSupport/EditorClientWinCE.cpp

    r73088 r74566  
    354354        case VK_LEFT:
    355355            frame->selection()->modify(keyEvent->shiftKey() ? SelectionController::AlterationExtend : SelectionController::AlterationMove,
    356                     SelectionController::DirectionLeft,
     356                    DirectionLeft,
    357357                    keyEvent->ctrlKey() ? WordGranularity : CharacterGranularity,
    358358                    true);
    … …  
    360360        case VK_RIGHT:
    361361            frame->selection()->modify(keyEvent->shiftKey() ? SelectionController::AlterationExtend : SelectionController::AlterationMove,
    362                     SelectionController::DirectionRight,
     362                    DirectionRight,
    363363                    keyEvent->ctrlKey() ? WordGranularity : CharacterGranularity,
    364364                    true);
    … …  
    366366        case VK_UP:
    367367            frame->selection()->modify(keyEvent->shiftKey() ? SelectionController::AlterationExtend : SelectionController::AlterationMove,
    368                     SelectionController::DirectionBackward,
     368                    DirectionBackward,
    369369                    keyEvent->ctrlKey() ? ParagraphGranularity : LineGranularity,
    370370                    true);
    … …  
    372372        case VK_DOWN:
    373373            frame->selection()->modify(keyEvent->shiftKey() ? SelectionController::AlterationExtend : SelectionController::AlterationMove,
    374                     SelectionController::DirectionForward,
     374                    DirectionForward,
    375375                    keyEvent->ctrlKey() ? ParagraphGranularity : LineGranularity,
    376376                    true);
Note: See TracChangeset for help on using the changeset viewer.