diff options
Diffstat (limited to 'WebCore/editing/SelectionController.cpp')
| -rw-r--r-- | WebCore/editing/SelectionController.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/WebCore/editing/SelectionController.cpp b/WebCore/editing/SelectionController.cpp index f9b39bb..ca18bc1 100644 --- a/WebCore/editing/SelectionController.cpp +++ b/WebCore/editing/SelectionController.cpp @@ -44,6 +44,7 @@ #include "HitTestResult.h" #include "Page.h" #include "Range.h" +#include "RenderLayer.h" #include "RenderTheme.h" #include "RenderView.h" #include "SecureTextInput.h" @@ -164,7 +165,7 @@ void SelectionController::setSelection(const VisibleSelection& s, bool closeTypi if (userTriggered) { ScrollAlignment alignment; - if (m_frame->settings() && m_frame->settings()->editingBehavior() == EditingMacBehavior) + if (m_frame->editor()->behavior().shouldCenterAlignWhenSelectionIsRevealed()) alignment = (align == AlignCursorOnScrollAlways) ? ScrollAlignment::alignCenterAlways : ScrollAlignment::alignCenterIfNeeded; else alignment = (align == AlignCursorOnScrollAlways) ? ScrollAlignment::alignTopAlways : ScrollAlignment::alignToEdgeIfNeeded; @@ -243,8 +244,7 @@ void SelectionController::nodeWillBeRemoved(Node *node) void SelectionController::setIsDirectional(bool isDirectional) { - Settings* settings = m_frame ? m_frame->settings() : 0; - m_isDirectional = !settings || settings->editingBehavior() != EditingMacBehavior || isDirectional; + m_isDirectional = !m_frame || m_frame->editor()->behavior().shouldConsiderSelectionAsDirectional() || isDirectional; } void SelectionController::willBeModified(EAlteration alter, EDirection direction) @@ -299,7 +299,7 @@ VisiblePosition SelectionController::positionForPlatform(bool isGetStart) const { Position pos; Settings* settings = m_frame ? m_frame->settings() : 0; - if (settings && settings->editingBehavior() == EditingMacBehavior) + if (settings && settings->editingBehaviorType() == EditingMacBehavior) pos = isGetStart ? m_selection.start() : m_selection.end(); else { // Linux and Windows always extend selections from the extent endpoint. @@ -685,7 +685,7 @@ bool SelectionController::modify(EAlteration alter, EDirection direction, TextGr moveTo(position, userTriggered); break; case AlterationExtend: - if (!settings || settings->editingBehavior() != EditingMacBehavior || m_selection.isCaret() || !isBoundary(granularity)) + if (!settings || settings->editingBehaviorType() != EditingMacBehavior || m_selection.isCaret() || !isBoundary(granularity)) setExtent(position, userTriggered); else { // Standard Mac behavior when extending to a boundary is grow the selection rather |