Changeset 202295 in webkit

Timestamp:

Jun 21, 2016 3:19:37 PM (8 years ago)

Author:

Simon Fraser

Message:

[iOS] Typing text into a text field or text area causes screen to scroll down (hiding text entry)
​https://bugs.webkit.org/show_bug.cgi?id=158970

Reviewed by Ryosuke Niwa.

Source/WebCore:

insertTextWithoutSendingTextEvent() should only reveal the selection up to the main frame on iOS,
since the UI process can zoom and scroll the view to the text input.

Test: fast/forms/ios/typing-in-input-in-iframe.html

• editing/Editor.cpp:

(WebCore::Editor::insertTextWithoutSendingTextEvent):

LayoutTests:

Test that focuses an input in a frame and then types a character, then checks for scrolling.

• fast/forms/ios/typing-in-input-in-iframe-expected.txt: Added.
• fast/forms/ios/typing-in-input-in-iframe.html: Added.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/fast/forms/ios/typing-in-input-in-iframe-expected.txt (added)
• LayoutTests/fast/forms/ios/typing-in-input-in-iframe.html (added)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/editing/Editor.cpp (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2016-06-20  Simon Fraser  <simon.fraser@apple.com>
+
+        [iOS] Typing text into a text field or text area causes screen to scroll down (hiding text entry)
+        https://bugs.webkit.org/show_bug.cgi?id=158970
+
+        Reviewed by Ryosuke Niwa.
+
+        Test that focuses an input in a frame and then types a character, then checks for scrolling.
+
+        * fast/forms/ios/typing-in-input-in-iframe-expected.txt: Added.
+        * fast/forms/ios/typing-in-input-in-iframe.html: Added.
+
 2016-06-20  Simon Fraser  <simon.fraser@apple.com>
 

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2016-06-20  Simon Fraser  <simon.fraser@apple.com>
+
+        [iOS] Typing text into a text field or text area causes screen to scroll down (hiding text entry)
+        https://bugs.webkit.org/show_bug.cgi?id=158970
+
+        Reviewed by Ryosuke Niwa.
+
+        insertTextWithoutSendingTextEvent() should only reveal the selection up to the main frame on iOS,
+        since the UI process can zoom and scroll the view to the text input.
+
+        Test: fast/forms/ios/typing-in-input-in-iframe.html
+
+        * editing/Editor.cpp:
+        (WebCore::Editor::insertTextWithoutSendingTextEvent):
+
 2016-06-21  Adam Bergkvist  <adam.bergkvist@ericsson.com>
 

trunk/Source/WebCore/editing/Editor.cpp

@@ -1204 +1204 @@
             // Reveal the current selection
             if (Frame* editedFrame = document->frame())
-                if (Page* page = editedFrame->page())
-                    page->focusController().focusedOrMainFrame().selection().revealSelection(SelectionRevealMode::Reveal, ScrollAlignment::alignCenterIfNeeded);
+                if (Page* page = editedFrame->page()) {
+#if PLATFORM(IOS)
+                    SelectionRevealMode revealMode = SelectionRevealMode::RevealUpToMainFrame;
+#else
+                    SelectionRevealMode revealMode = SelectionRevealMode::Reveal;
+#endif
+                    page->focusController().focusedOrMainFrame().selection().revealSelection(revealMode, ScrollAlignment::alignCenterIfNeeded);
+                }
         }
     }