Changeset 121121 in webkit

Timestamp:

Jun 24, 2012, 2:44:47 PM (14 years ago)

Author:

commit-queue@webkit.org

Message:

After Editor::setComposition is called, input should scroll to the end of the composition.
​https://bugs.webkit.org/show_bug.cgi?id=88999

Patch by Oli Lan <​olilan@chromium.org> on 2012-06-24
Reviewed by Ryosuke Niwa.

Source/WebCore:

This fixes an issue where after a call to setComposition, the start of the composition is revealed
(scrolled to) instead of the end (where the caret/editing point should be).

The change is to allow revealSelectionAfterEditingOperation to take a revealExtent parameter,
and to pass that parameter as true when calling from setIgnoreCompositionSelectionChange, which is
called at the end of setComposition.

Test: fast/forms/input-set-composition-scroll.html

• editing/Editor.cpp:

(WebCore::Editor::revealSelectionAfterEditingOperation):
(WebCore::Editor::setIgnoreCompositionSelectionChange):

• editing/Editor.h:

(Editor):

LayoutTests:

This tests that after setComposition is called, the input scrolls to the end of the composition
(i.e. that the end of the selection/composition is revealed).

• fast/forms/input-set-composition-scroll-expected.txt: Added.
• fast/forms/input-set-composition-scroll.html: Added.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/fast/forms/input-set-composition-scroll-expected.txt (added)
• LayoutTests/fast/forms/input-set-composition-scroll.html (added)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/editing/Editor.cpp (modified) (2 diffs)
• Source/WebCore/editing/Editor.h (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2012-06-24  Oli Lan  <olilan@chromium.org>
+
+        After Editor::setComposition is called, input should scroll to the end of the composition.
+        https://bugs.webkit.org/show_bug.cgi?id=88999
+
+        Reviewed by Ryosuke Niwa.
+
+        This tests that after setComposition is called, the input scrolls to the end of the composition
+        (i.e. that the end of the selection/composition is revealed).
+
+        * fast/forms/input-set-composition-scroll-expected.txt: Added.
+        * fast/forms/input-set-composition-scroll.html: Added.
+
 2012-06-24  Adam Barth  <abarth@webkit.org>
 

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2012-06-24  Oli Lan  <olilan@chromium.org>
+
+        After Editor::setComposition is called, input should scroll to the end of the composition.
+        https://bugs.webkit.org/show_bug.cgi?id=88999
+
+        Reviewed by Ryosuke Niwa.
+
+        This fixes an issue where after a call to setComposition, the start of the composition is revealed
+        (scrolled to) instead of the end (where the caret/editing point should be).
+
+        The change is to allow revealSelectionAfterEditingOperation to take a revealExtent parameter,
+        and to pass that parameter as true when calling from setIgnoreCompositionSelectionChange, which is
+        called at the end of setComposition.
+
+        Test: fast/forms/input-set-composition-scroll.html
+
+        * editing/Editor.cpp:
+        (WebCore::Editor::revealSelectionAfterEditingOperation):
+        (WebCore::Editor::setIgnoreCompositionSelectionChange):
+        * editing/Editor.h:
+        (Editor):
+
 2012-06-24  Joshua Bell  <jsbell@chromium.org>
 

trunk/Source/WebCore/editing/Editor.cpp

@@ -2297 +2297 @@
 }
 
-void Editor::revealSelectionAfterEditingOperation(const ScrollAlignment& alignment)
+void Editor::revealSelectionAfterEditingOperation(const ScrollAlignment& alignment, RevealExtentOption revealExtentOption)
 {
     if (m_ignoreCompositionSelectionChange)
         return;
 
-    m_frame->selection()->revealSelection(alignment);
+    m_frame->selection()->revealSelection(alignment, revealExtentOption == RevealExtent);
 }
 
@@ -2312 +2312 @@
     m_ignoreCompositionSelectionChange = ignore;
     if (!ignore)
-        revealSelectionAfterEditingOperation();
+        revealSelectionAfterEditingOperation(ScrollAlignment::alignToEdgeIfNeeded, RevealExtent);
 }
 

trunk/Source/WebCore/editing/Editor.h

@@ -423 +423 @@
     void pasteAsPlainTextWithPasteboard(Pasteboard*);
     void pasteWithPasteboard(Pasteboard*, bool allowPlainText);
-    void revealSelectionAfterEditingOperation(const ScrollAlignment& = ScrollAlignment::alignCenterIfNeeded);
+
+    enum RevealExtentOption {
+        RevealExtent,
+        DoNotRevealExtent
+    };
+
+    void revealSelectionAfterEditingOperation(const ScrollAlignment& = ScrollAlignment::alignCenterIfNeeded, RevealExtentOption = DoNotRevealExtent);
     void markMisspellingsOrBadGrammar(const VisibleSelection&, bool checkSpelling, RefPtr<Range>& firstMisspellingRange);
     TextCheckingTypeMask resolveTextCheckingTypeMask(TextCheckingTypeMask);