Changeset 67909 in webkit

Timestamp:

Sep 20, 2010 6:51:21 PM (14 years ago)

Author:

tonikitoo@webkit.org

Message:

2010-09-19 Antonio Gomes <​agomes@rim.com>

Reviewed by Ojan Vafai.

SelectionController::modify should ask EditingBehavior for platform specific behavior
​https://bugs.webkit.org/show_bug.cgi?id=41975

As a follow up of the refactoring work in bug 39854, patch makes SelectionController::modify()
stop accessing EditingBehaviorType values directly, and replaces its use by the EditingBehavior class.

Since the "Settings*" parameter of the private SelectionController::modify() method becomes unneeded
with this change (it was used to query the editingBehaviorType), patch merges two modify() methods.

No behavior change, so no new tests.

• editing/EditingBehavior.h: (WebCore::EditingBehavior::shouldAlwaysGrowSelectionWhenExtendingToBoundary):
• editing/SelectionController.cpp: (WebCore::SelectionController::modify):
• editing/SelectionController.h:

Location:

trunk/WebCore

Files:

• ChangeLog (modified) (1 diff)
• editing/EditingBehavior.h (modified) (1 diff)
• editing/SelectionController.cpp (modified) (5 diffs)
• editing/SelectionController.h (modified) (1 diff)

trunk/WebCore/ChangeLog

@@ +1 @@
+2010-09-19  Antonio Gomes  <agomes@rim.com>
+
+        Reviewed by Ojan Vafai.
+
+        SelectionController::modify should ask EditingBehavior for platform specific behavior
+        https://bugs.webkit.org/show_bug.cgi?id=41975
+
+        As a follow up of the refactoring work in bug 39854, patch makes SelectionController::modify()
+        stop accessing EditingBehaviorType values directly, and replaces its use by the EditingBehavior
+        class.
+
+        Since the "Settings*" parameter of the private SelectionController::modify() method becomes unneeded
+        with this change (it was used to query the editingBehaviorType), patch merges two modify() methods.
+
+        No behavior change, so no new tests.
+
+        * editing/EditingBehavior.h:
+        (WebCore::EditingBehavior::shouldAlwaysGrowSelectionWhenExtendingToBoundary):
+        * editing/SelectionController.cpp:
+        (WebCore::SelectionController::modify):
+        * editing/SelectionController.h:
+
 2010-09-20  Vangelis Kokkevis  <vangelis@chromium.org>
 

trunk/WebCore/editing/EditingBehavior.h

@@ -54 +54 @@
     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.
+    bool shouldAlwaysGrowSelectionWhenExtendingToBoundary() const { return m_type == EditingMacBehavior; }
+
 private:
     EditingBehaviorType m_type;

trunk/WebCore/editing/SelectionController.cpp

@@ -623 +623 @@
 }
 
-bool SelectionController::modify(EAlteration alter, EDirection dir, TextGranularity granularity, bool userTriggered)
-{
-    Settings* settings = m_frame ? m_frame->settings() : 0;
-    return modify(alter, dir, granularity, userTriggered, settings);
-}
-    
 static bool isBoundary(TextGranularity granularity)
 {
@@ -634 +628 @@
 }    
     
-bool SelectionController::modify(EAlteration alter, EDirection direction, TextGranularity granularity, bool userTriggered, Settings* settings)
+bool SelectionController::modify(EAlteration alter, EDirection direction, TextGranularity granularity, bool userTriggered)
 {
     if (userTriggered) {
@@ -640 +634 @@
         trialSelectionController.setSelection(m_selection);
         trialSelectionController.setIsDirectional(m_isDirectional);
-        trialSelectionController.modify(alter, direction, granularity, false, settings);
+        trialSelectionController.modify(alter, direction, granularity, false);
 
         bool change = shouldChangeSelection(trialSelectionController.selection());
@@ -691 +685 @@
         break;
     case AlterationExtend:
-        if (!settings || settings->editingBehaviorType() != EditingMacBehavior || m_selection.isCaret() || !isBoundary(granularity))
+        // 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.
+        if (!m_frame || !m_frame->editor()->behavior().shouldAlwaysGrowSelectionWhenExtendingToBoundary() || m_selection.isCaret() || !isBoundary(granularity))
             setExtent(position, userTriggered);
         else {
-            // 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.
             if (direction == DirectionForward || direction == DirectionRight)
                 setEnd(position, userTriggered);
@@ -701 +695 @@
                 setStart(position, userTriggered);
         }
+        break;
     }
     

trunk/WebCore/editing/SelectionController.h

@@ -182 +182 @@
     VisiblePosition endForPlatform() const;
 
-    bool modify(EAlteration, EDirection, TextGranularity, bool userTriggered, Settings*);
-
     VisiblePosition modifyExtendingRight(TextGranularity);
     VisiblePosition modifyExtendingForward(TextGranularity);