| Index: third_party/WebKit/Source/core/editing/EditingBehavior.h
|
| diff --git a/third_party/WebKit/Source/core/editing/EditingBehavior.h b/third_party/WebKit/Source/core/editing/EditingBehavior.h
|
| index f135c923f5f24348b3060f57cbece0c3701dd8e0..3f098ef2b9b425d2964ab563ce1bbfc56ad2fd22 100644
|
| --- a/third_party/WebKit/Source/core/editing/EditingBehavior.h
|
| +++ b/third_party/WebKit/Source/core/editing/EditingBehavior.h
|
| @@ -34,12 +34,13 @@ class CORE_EXPORT EditingBehavior {
|
| public:
|
| explicit EditingBehavior(EditingBehaviorType type) : m_type(type) {}
|
|
|
| - // Individual functions for each case where we have more than one style of editing behavior.
|
| - // Create a new function for any platform difference so we can control it here.
|
| + // Individual functions for each case where we have more than one style of
|
| + // editing behavior. Create a new function for any platform difference so we
|
| + // can control it here.
|
|
|
| - // When extending a selection beyond the top or bottom boundary of an editable area,
|
| - // maintain the horizontal position on Windows and Android but extend it to the boundary of
|
| - // the editable content on Mac and Linux.
|
| + // When extending a selection beyond the top or bottom boundary of an editable
|
| + // area, maintain the horizontal position on Windows and Android but extend it
|
| + // to the boundary of the editable content on Mac and Linux.
|
| bool shouldMoveCaretToHorizontalBoundaryWhenPastTopOrBottom() const {
|
| return m_type != EditingWindowsBehavior && m_type != EditingAndroidBehavior;
|
| }
|
| @@ -48,56 +49,66 @@ class CORE_EXPORT EditingBehavior {
|
| return m_type == EditingAndroidBehavior;
|
| }
|
|
|
| - // On Windows, selections should always be considered as directional, regardless if it is
|
| - // mouse-based or keyboard-based.
|
| + // On Windows, selections should always be considered as directional,
|
| + // regardless if it is mouse-based or keyboard-based.
|
| bool shouldConsiderSelectionAsDirectional() const {
|
| return m_type != EditingMacBehavior;
|
| }
|
|
|
| - // On Mac, when revealing a selection (for example as a result of a Find operation on the Browser),
|
| - // content should be scrolled such that the selection gets certer aligned.
|
| + // On Mac, when revealing a selection (for example as a result of a Find
|
| + // operation on the Browser), content should be scrolled such that the
|
| + // selection gets certer aligned.
|
| bool shouldCenterAlignWhenSelectionIsRevealed() const {
|
| return m_type == EditingMacBehavior;
|
| }
|
|
|
| - // On Mac, style is considered present when present at the beginning of selection. On other platforms,
|
| - // style has to be present throughout the selection.
|
| + // On Mac, style is considered present when present at the beginning of
|
| + // selection. On other platforms, style has to be present throughout the
|
| + // selection.
|
| bool shouldToggleStyleBasedOnStartOfSelection() const {
|
| return m_type == EditingMacBehavior;
|
| }
|
|
|
| - // Standard Mac behavior when extending to a boundary is grow the selection rather than leaving the base
|
| - // in place and moving the extent. Matches NSTextView.
|
| + // Standard Mac behavior when extending to a boundary is grow the selection
|
| + // rather than leaving the base in place and moving the extent. Matches
|
| + // NSTextView.
|
| bool shouldAlwaysGrowSelectionWhenExtendingToBoundary() const {
|
| return m_type == EditingMacBehavior;
|
| }
|
|
|
| - // On Mac, when processing a contextual click, the object being clicked upon should be selected.
|
| + // On Mac, when processing a contextual click, the object being clicked upon
|
| + // should be selected.
|
| bool shouldSelectOnContextualMenuClick() const {
|
| return m_type == EditingMacBehavior;
|
| }
|
|
|
| - // On Mac and Windows, pressing backspace (when it isn't handled otherwise) should navigate back.
|
| + // On Mac and Windows, pressing backspace (when it isn't handled otherwise)
|
| + // should navigate back.
|
| bool shouldNavigateBackOnBackspace() const {
|
| return m_type != EditingUnixBehavior && m_type != EditingAndroidBehavior;
|
| }
|
|
|
| - // On Mac, selecting backwards by word/line from the middle of a word/line, and then going
|
| - // forward leaves the caret back in the middle with no selection, instead of directly selecting
|
| - // to the other end of the line/word (Unix/Windows behavior).
|
| + // On Mac, selecting backwards by word/line from the middle of a word/line,
|
| + // and then going forward leaves the caret back in the middle with no
|
| + // selection, instead of directly selecting to the other end of the line/word
|
| + // (Unix/Windows behavior).
|
| bool shouldExtendSelectionByWordOrLineAcrossCaret() const {
|
| return m_type != EditingMacBehavior;
|
| }
|
|
|
| - // Based on native behavior, when using ctrl(alt)+arrow to move caret by word, ctrl(alt)+left arrow moves caret to
|
| - // immediately before the word in all platforms, for example, the word break positions are: "|abc |def |hij |opq".
|
| - // But ctrl+right arrow moves caret to "abc |def |hij |opq" on Windows and "abc| def| hij| opq|" on Mac and Linux.
|
| + // Based on native behavior, when using ctrl(alt)+arrow to move caret by word,
|
| + // ctrl(alt)+left arrow moves caret to immediately before the word in all
|
| + // platforms. For example, the word break positions are:
|
| + // "|abc |def |hij |opq".
|
| + // But ctrl+right arrow moves caret to "abc |def |hij |opq" on Windows and
|
| + // "abc| def| hij| opq|" on Mac and Linux.
|
| bool shouldSkipSpaceWhenMovingRight() const {
|
| return m_type == EditingWindowsBehavior;
|
| }
|
|
|
| - // On Mac, undo of delete/forward-delete of text should select the deleted text. On other platforms deleted text
|
| - // should not be selected and the cursor should be placed where the deletion started.
|
| + // On Mac, undo of delete/forward-delete of text should select the deleted
|
| + // text. On other platforms deleted text should not be selected and the cursor
|
| + // should be placed where the deletion started.
|
| bool shouldUndoOfDeleteSelectText() const {
|
| return m_type == EditingMacBehavior;
|
| }
|
|
|