Attachment 356716 Details for Bug 187554 – WIP

[patch] WIP

bug-187554-20181205225254.patch (text/plain), 46.77 KB, created by Wenson Hsieh on 2018-12-05 22:52:55 PST

(hide)

Description:

Filename:

MIME Type:

Creator: Wenson Hsieh

Created: 2018-12-05 22:52:55 PST

Size: 46.77 KB

patch

obsolete

>Subversion Revision: 238921
>diff --git a/Source/WebKit/ChangeLog b/Source/WebKit/ChangeLog
>index caeb614be21c19d1b7da9be0169fcd58d6cf4ea4..54bbd9bed543de7e284edb4b0a5db4a32f06c597 100644
>--- a/Source/WebKit/ChangeLog
>+++ b/Source/WebKit/ChangeLog
>@@ -1,3 +1,51 @@
>+2018-12-05  Wenson Hsieh  <wenson_hsieh@apple.com>
>+
>+        [iOS] WKWebView should match UITextView behavior when editing text with an RTL keyboard
>+        https://bugs.webkit.org/show_bug.cgi?id=187554
>+        <rdar://problem/42075638>
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        WIP patch.
>+
>+        * Platform/spi/ios/UIKitSPI.h:
>+        * Shared/AssistedNodeInformation.cpp:
>+        (WebKit::AssistedNodeInformation::encode const):
>+        (WebKit::AssistedNodeInformation::decode):
>+        * Shared/AssistedNodeInformation.h:
>+        * Shared/EditorState.cpp:
>+        (WebKit::EditorState::encode const):
>+        (WebKit::EditorState::decode):
>+        * Shared/EditorState.h:
>+        * Shared/ElementFocusID.h: Added.
>+        * UIProcess/PageClient.h:
>+        * UIProcess/WebPageProxy.cpp:
>+        (WebKit::WebPageProxy::setBaseWritingDirection):
>+        * UIProcess/WebPageProxy.h:
>+        * UIProcess/ios/PageClientImplIOS.h:
>+        * UIProcess/ios/PageClientImplIOS.mm:
>+        (WebKit::PageClientImpl::didReceiveEditorStateUpdateAfterFocus):
>+        * UIProcess/ios/WKContentViewInteraction.h:
>+        * UIProcess/ios/WKContentViewInteraction.mm:
>+        (-[WKContentView baseWritingDirectionForPosition:inDirection:]):
>+        (coreWritingDirection):
>+        (-[WKContentView setBaseWritingDirection:forRange:]):
>+        (-[WKContentView _didReceiveEditorStateUpdateAfterFocus]):
>+        (-[WKContentView updateCurrentAssistedNodeInformation:]):
>+        * UIProcess/ios/WebPageProxyIOS.mm:
>+        (WebKit::WebPageProxy::startAssistingNode):
>+        (WebKit::WebPageProxy::stopAssistingNode):
>+        (WebKit::WebPageProxy::editorStateChanged):
>+        * WebKit.xcodeproj/project.pbxproj:
>+        * WebProcess/WebPage/WebPage.cpp:
>+        (WebKit::WebPage::setBaseWritingDirection):
>+        (WebKit::WebPage::elementDidFocus):
>+        * WebProcess/WebPage/WebPage.h:
>+        * WebProcess/WebPage/WebPage.messages.in:
>+        * WebProcess/WebPage/ios/WebPageIOS.mm:
>+        (WebKit::WebPage::platformEditorState const):
>+        (WebKit::WebPage::getAssistedNodeInformation):
>+
> 2018-12-05  Jiewen Tan  <jiewen_tan@apple.com>
> 
>         [Mac] Layout Test http/wpt/webauthn/public-key-credential-create-success-hid.https.html and http/wpt/webauthn/public-key-credential-get-success-hid.https.html are flaky
>diff --git a/Source/WebKit/Platform/spi/ios/UIKitSPI.h b/Source/WebKit/Platform/spi/ios/UIKitSPI.h
>index 23237969fd35426feee93e0085eed977f440d998..3f81a1e540afce582f26dff9612e0f152043e6f8 100644
>--- a/Source/WebKit/Platform/spi/ios/UIKitSPI.h
>+++ b/Source/WebKit/Platform/spi/ios/UIKitSPI.h
>@@ -913,6 +913,7 @@ typedef enum {
> @end
> 
> @interface UIKeyboardInputMode : UITextInputMode <NSCopying>
>++ (UIKeyboardInputMode *)keyboardInputModeWithIdentifier:(NSString *)identifier;
> @property (nonatomic, readonly, retain) NSArray <NSString *> *multilingualLanguages;
> @property (nonatomic, readonly, retain) NSString *languageWithRegion;
> @end
>@@ -1062,6 +1063,10 @@ typedef NSInteger UICompositingMode;
> - (CGFloat)getVerticalOverlapForView:(UIView *)view usingKeyboardInfo:(NSDictionary *)info;
> @end
> 
>+@interface UIKeyboardImpl (IPI)
>+- (void)setInitialDirection;
>+@end
>+
> @interface _UILayerHostView : UIView
> @end
> 
>diff --git a/Source/WebKit/Shared/AssistedNodeInformation.cpp b/Source/WebKit/Shared/AssistedNodeInformation.cpp
>index 5134791800315060a9ce8ff2cbaed31e93f22a72..1f49f4d70b5a6d0f69585ca165cc8543913ddc16 100644
>--- a/Source/WebKit/Shared/AssistedNodeInformation.cpp
>+++ b/Source/WebKit/Shared/AssistedNodeInformation.cpp
>@@ -98,7 +98,7 @@ void AssistedNodeInformation::encode(IPC::Encoder& encoder) const
>     encoder << label;
>     encoder << ariaLabel;
>     encoder << embeddedViewID;
>-    encoder << assistedNodeIdentifier;
>+    encoder << elementFocusID;
> #if ENABLE(DATALIST_ELEMENT)
>     encoder << hasSuggestions;
> #if ENABLE(INPUT_TYPE_COLOR)
>@@ -214,7 +214,7 @@ bool AssistedNodeInformation::decode(IPC::Decoder& decoder, AssistedNodeInformat
>     if (!decoder.decode(result.embeddedViewID))
>         return false;
> 
>-    if (!decoder.decode(result.assistedNodeIdentifier))
>+    if (!decoder.decode(result.elementFocusID))
>         return false;
> 
> #if ENABLE(DATALIST_ELEMENT)
>diff --git a/Source/WebKit/Shared/AssistedNodeInformation.h b/Source/WebKit/Shared/AssistedNodeInformation.h
>index 9b1c3b0145f83f794851774e96b8586ae72d8d19..5ec4ae6e3176f7abc940768315ac23b4614b4197 100644
>--- a/Source/WebKit/Shared/AssistedNodeInformation.h
>+++ b/Source/WebKit/Shared/AssistedNodeInformation.h
>@@ -26,6 +26,7 @@
> #pragma once
> 
> #include "ArgumentCoders.h"
>+#include "ElementFocusID.h"
> #include <WebCore/AutocapitalizeTypes.h>
> #include <WebCore/Autofill.h>
> #include <WebCore/Color.h>
>@@ -136,7 +137,7 @@ struct AssistedNodeInformation {
> #endif
> #endif
> 
>-    uint64_t assistedNodeIdentifier { 0 };
>+    ElementFocusID elementFocusID { 0 };
> 
>     void encode(IPC::Encoder&) const;
>     static bool decode(IPC::Decoder&, AssistedNodeInformation&);
>diff --git a/Source/WebKit/Shared/EditorState.cpp b/Source/WebKit/Shared/EditorState.cpp
>index 0a2ba7f036759917eb34c9359005abb3eccce6a5..e3732a1bc57d9b28ecd2bff8e92ccdfce1793cd7 100644
>--- a/Source/WebKit/Shared/EditorState.cpp
>+++ b/Source/WebKit/Shared/EditorState.cpp
>@@ -36,6 +36,7 @@ namespace WebKit {
> void EditorState::encode(IPC::Encoder& encoder) const
> {
>     encoder << shouldIgnoreSelectionChanges;
>+    encoder << elementFocusID;
>     encoder << selectionIsNone;
>     encoder << selectionIsRange;
>     encoder << isContentEditable;
>@@ -62,6 +63,9 @@ bool EditorState::decode(IPC::Decoder& decoder, EditorState& result)
>     if (!decoder.decode(result.shouldIgnoreSelectionChanges))
>         return false;
> 
>+    if (!decoder.decode(result.elementFocusID))
>+        return false;
>+
>     if (!decoder.decode(result.selectionIsNone))
>         return false;
> 
>diff --git a/Source/WebKit/Shared/EditorState.h b/Source/WebKit/Shared/EditorState.h
>index 9e33906621ad942556fda03cce10cb2f6e41acfe..850cd8f3de694bc3c04899f48754e56654d03cae 100644
>--- a/Source/WebKit/Shared/EditorState.h
>+++ b/Source/WebKit/Shared/EditorState.h
>@@ -26,6 +26,7 @@
> #pragma once
> 
> #include "ArgumentCoders.h"
>+#include "ElementFocusID.h"
> #include <WebCore/Color.h>
> #include <WebCore/FontAttributes.h>
> #include <WebCore/IntRect.h>
>@@ -66,6 +67,7 @@ enum ListType {
> struct EditorState {
>     bool shouldIgnoreSelectionChanges { false };
> 
>+    ElementFocusID elementFocusID { 0 };
>     bool selectionIsNone { true }; // This will be false when there is a caret selection.
>     bool selectionIsRange { false };
>     bool isContentEditable { false };
>diff --git a/Source/WebKit/Shared/ElementFocusID.h b/Source/WebKit/Shared/ElementFocusID.h
>new file mode 100644
>index 0000000000000000000000000000000000000000..ef0364f946050536ad37e1c51ebf3f6c8787036c
>--- /dev/null
>+++ b/Source/WebKit/Shared/ElementFocusID.h
>@@ -0,0 +1,32 @@
>+/*
>+ * Copyright (C) 2018 Apple Inc. All rights reserved.
>+ *
>+ * Redistribution and use in source and binary forms, with or without
>+ * modification, are permitted provided that the following conditions
>+ * are met:
>+ * 1. Redistributions of source code must retain the above copyright
>+ *    notice, this list of conditions and the following disclaimer.
>+ * 2. Redistributions in binary form must reproduce the above copyright
>+ *    notice, this list of conditions and the following disclaimer in the
>+ *    documentation and/or other materials provided with the distribution.
>+ *
>+ * THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS''
>+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
>+ * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
>+ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS
>+ * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
>+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
>+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
>+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
>+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
>+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
>+ * THE POSSIBILITY OF SUCH DAMAGE.
>+ */
>+
>+#pragma once
>+
>+namespace WebKit {
>+
>+using ElementFocusID = uint64_t;
>+
>+} // namespace WebKit
>diff --git a/Source/WebKit/UIProcess/PageClient.h b/Source/WebKit/UIProcess/PageClient.h
>index df6ec005c468b425b9be55f682f02ede5aac61be..c5179af75eedc2a1da87c7014b48301894d104e2 100644
>--- a/Source/WebKit/UIProcess/PageClient.h
>+++ b/Source/WebKit/UIProcess/PageClient.h
>@@ -363,6 +363,7 @@ public:
> 
>     virtual void startAssistingNode(const AssistedNodeInformation&, bool userIsInteracting, bool blurPreviousNode, bool changingActivityState, API::Object* userData) = 0;
>     virtual void stopAssistingNode() = 0;
>+    virtual void didReceiveEditorStateUpdateAfterFocus() = 0;
>     virtual bool isAssistingNode() = 0;
>     virtual bool interpretKeyEvent(const NativeWebKeyboardEvent&, bool isCharEvent) = 0;
>     virtual void positionInformationDidChange(const InteractionInformationAtPosition&) = 0;
>diff --git a/Source/WebKit/UIProcess/WebPageProxy.cpp b/Source/WebKit/UIProcess/WebPageProxy.cpp
>index 8e5946faa92e271f0c8aca55f91c06532528bc4c..ddb6b272a711169a8f12975d07beae7df2dbad3d 100644
>--- a/Source/WebKit/UIProcess/WebPageProxy.cpp
>+++ b/Source/WebKit/UIProcess/WebPageProxy.cpp
>@@ -1870,6 +1870,12 @@ void WebPageProxy::changeListType()
>         m_process->send(Messages::WebPage::ChangeListType(), m_pageID);
> }
> 
>+void WebPageProxy::setBaseWritingDirection(WritingDirection direction)
>+{
>+    if (isValid())
>+        m_process->send(Messages::WebPage::SetBaseWritingDirection(direction), m_pageID);
>+}
>+
> void WebPageProxy::updateFontAttributesAfterEditorStateChange()
> {
>     m_cachedFontAttributesAtSelectionStart.reset();
>diff --git a/Source/WebKit/UIProcess/WebPageProxy.h b/Source/WebKit/UIProcess/WebPageProxy.h
>index 734d211719e94bff95a961f3f0d6309ccc3efa15..abb8909ecdd198923863050b25ed709be973ee80 100644
>--- a/Source/WebKit/UIProcess/WebPageProxy.h
>+++ b/Source/WebKit/UIProcess/WebPageProxy.h
>@@ -84,6 +84,7 @@
> #include <WebCore/TextChecking.h>
> #include <WebCore/TextGranularity.h>
> #include <WebCore/UserInterfaceLayoutDirection.h>
>+#include <WebCore/WritingDirection.h>
> #include <memory>
> #include <wtf/CompletionHandler.h>
> #include <wtf/HashMap.h>
>@@ -563,6 +564,8 @@ public:
>     void decreaseListLevel();
>     void changeListType();
> 
>+    void setBaseWritingDirection(WebCore::WritingDirection);
>+
>     std::optional<WebCore::FontAttributes> cachedFontAttributesAtSelectionStart() const { return m_cachedFontAttributesAtSelectionStart; }
> 
> #if PLATFORM(COCOA)
>@@ -1765,6 +1768,7 @@ private:
> 
>     void startAssistingNode(const AssistedNodeInformation&, bool userIsInteracting, bool blurPreviousNode, bool changingActivityState, const UserData&);
>     void stopAssistingNode();
>+    void didReceiveEditorStateUpdateAfterFocus();
> 
>     void showInspectorHighlight(const WebCore::Highlight&);
>     void hideInspectorHighlight();
>@@ -2252,6 +2256,7 @@ private:
> 
> #if PLATFORM(IOS_FAMILY)
>     std::unique_ptr<NodeAssistanceArguments> m_deferredNodeAssistanceArguments;
>+    std::optional<ElementFocusID> m_elementFocusIDPendingPostLayoutEditorStateUpdate { false };
>     bool m_forceAlwaysUserScalable { false };
>     WebCore::FloatSize m_viewportConfigurationViewLayoutSize;
>     double m_viewportConfigurationLayoutSizeScaleFactor { 1 };
>diff --git a/Source/WebKit/UIProcess/ios/PageClientImplIOS.h b/Source/WebKit/UIProcess/ios/PageClientImplIOS.h
>index 8ecee147aa07891a2d22102d960543897be46596..6f14b4071290885498b928d1bc6df4e241bfbfa3 100644
>--- a/Source/WebKit/UIProcess/ios/PageClientImplIOS.h
>+++ b/Source/WebKit/UIProcess/ios/PageClientImplIOS.h
>@@ -140,6 +140,7 @@ private:
> 
>     void startAssistingNode(const AssistedNodeInformation&, bool userIsInteracting, bool blurPreviousNode, bool changingActivityState, API::Object* userData) override;
>     void stopAssistingNode() override;
>+    void didReceiveEditorStateUpdateAfterFocus() override;
>     bool isAssistingNode() override;
>     void selectionDidChange() override;
>     bool interpretKeyEvent(const NativeWebKeyboardEvent&, bool isCharEvent) override;
>diff --git a/Source/WebKit/UIProcess/ios/PageClientImplIOS.mm b/Source/WebKit/UIProcess/ios/PageClientImplIOS.mm
>index 57b5acef3b4fa639a13f8ff230706e2419a80cb8..e9b1f1c219caf10af780fc494e7db52ecb7b27d7 100644
>--- a/Source/WebKit/UIProcess/ios/PageClientImplIOS.mm
>+++ b/Source/WebKit/UIProcess/ios/PageClientImplIOS.mm
>@@ -578,6 +578,11 @@ void PageClientImpl::stopAssistingNode()
>     [m_contentView _stopAssistingNode];
> }
> 
>+void PageClientImpl::didReceiveEditorStateUpdateAfterFocus()
>+{
>+    [m_contentView _didReceiveEditorStateUpdateAfterFocus];
>+}
>+
> void PageClientImpl::showPlaybackTargetPicker(bool hasVideo, const IntRect& elementRect, WebCore::RouteSharingPolicy policy, const String& contextUID)
> {
>     [m_contentView _showPlaybackTargetPicker:hasVideo fromRect:elementRect routeSharingPolicy:policy routingContextUID:contextUID];
>diff --git a/Source/WebKit/UIProcess/ios/WKContentViewInteraction.h b/Source/WebKit/UIProcess/ios/WKContentViewInteraction.h
>index da26332214679fd91cc54d0fc84ec823077e4d88..e794e3c631ddeb53a1a469b7909429b4cba3bc61 100644
>--- a/Source/WebKit/UIProcess/ios/WKContentViewInteraction.h
>+++ b/Source/WebKit/UIProcess/ios/WKContentViewInteraction.h
>@@ -388,6 +388,7 @@ FOR_EACH_PRIVATE_WKCONTENTVIEW_ACTION(DECLARE_WKCONTENTVIEW_ACTION_FOR_WEB_VIEW)
> - (void)_disableDoubleTapGesturesDuringTapIfNecessary:(uint64_t)requestID;
> - (void)_startAssistingNode:(const WebKit::AssistedNodeInformation&)information userIsInteracting:(BOOL)userIsInteracting blurPreviousNode:(BOOL)blurPreviousNode changingActivityState:(BOOL)changingActivityState userObject:(NSObject <NSSecureCoding> *)userObject;
> - (void)_stopAssistingNode;
>+- (void)_didReceiveEditorStateUpdateAfterFocus;
> - (void)_selectionChanged;
> - (void)_updateChangedSelection;
> - (BOOL)_interpretKeyEvent:(::WebEvent *)theEvent isCharEvent:(BOOL)isCharEvent;
>diff --git a/Source/WebKit/UIProcess/ios/WKContentViewInteraction.mm b/Source/WebKit/UIProcess/ios/WKContentViewInteraction.mm
>index 9a843e0bdac0a267056ce49ae7c75259e764d5d5..37552228f3ad8d18fc5f14d505a6eed13d5dc90f 100644
>--- a/Source/WebKit/UIProcess/ios/WKContentViewInteraction.mm
>+++ b/Source/WebKit/UIProcess/ios/WKContentViewInteraction.mm
>@@ -3582,16 +3582,30 @@ - (UITextRange *)characterRangeByExtendingPosition:(UITextPosition *)position in
>     return nil;
> }
> 
>-ALLOW_DEPRECATED_DECLARATIONS_BEGIN
>-- (UITextWritingDirection)baseWritingDirectionForPosition:(UITextPosition *)position inDirection:(UITextStorageDirection)direction
>+- (NSWritingDirection)baseWritingDirectionForPosition:(UITextPosition *)position inDirection:(UITextStorageDirection)direction
> {
>-    return UITextWritingDirectionLeftToRight;
>+    return NSWritingDirectionLeftToRight;
>+}
>+
>+static WritingDirection coreWritingDirection(NSWritingDirection direction)
>+{
>+    switch (direction) {
>+    case NSWritingDirectionNatural:
>+        return WritingDirection::Natural;
>+    case NSWritingDirectionLeftToRight:
>+        return WritingDirection::LeftToRight;
>+    case NSWritingDirectionRightToLeft:
>+        return WritingDirection::RightToLeft;
>+    default:
>+        ASSERT_NOT_REACHED();
>+        return WritingDirection::Natural;
>+    }
> }
> 
>-- (void)setBaseWritingDirection:(UITextWritingDirection)writingDirection forRange:(UITextRange *)range
>+- (void)setBaseWritingDirection:(NSWritingDirection)direction forRange:(UITextRange *)range
> {
>+    _page->setBaseWritingDirection(coreWritingDirection(direction));
> }
>-ALLOW_DEPRECATED_DECLARATIONS_END
> 
> - (CGRect)firstRectForRange:(UITextRange *)range
> {
>@@ -4513,12 +4527,29 @@ - (void)_stopAssistingNode
>     [self _stopSuppressingSelectionAssistantForReason:FocusedElementIsTransparent];
> }
> 
>+- (void)_didReceiveEditorStateUpdateAfterFocus
>+{
>+    if (!_page->isEditable())
>+        return;
>+
>+    auto& editorState = _page->editorState();
>+    if (editorState.selectionIsNone || editorState.selectionIsRange)
>+        return;
>+
>+    UIKeyboardImpl *keyboard = UIKeyboardImpl.activeInstance;
>+    if (keyboard.delegate != self)
>+        return;
>+
>+    // Synchronize the keyboard's writing direction with the newly received EditorState.
>+    [keyboard setInitialDirection];
>+}
>+
> - (void)updateCurrentAssistedNodeInformation:(Function<void(bool didUpdate)>&&)callback
> {
>     WeakObjCPtr<WKContentView> weakSelf { self };
>-    auto identifierBeforeUpdate = _assistedNodeInformation.assistedNodeIdentifier;
>+    auto identifierBeforeUpdate = _assistedNodeInformation.elementFocusID;
>     _page->requestAssistedNodeInformation([callback = WTFMove(callback), identifierBeforeUpdate, weakSelf] (auto& info, auto error) {
>-        if (!weakSelf || error != CallbackBase::Error::None || info.assistedNodeIdentifier != identifierBeforeUpdate) {
>+        if (!weakSelf || error != CallbackBase::Error::None || info.elementFocusID != identifierBeforeUpdate) {
>             // If the assisted node may have changed in the meantime, don't overwrite assisted node information.
>             callback(false);
>             return;
>diff --git a/Source/WebKit/UIProcess/ios/WebPageProxyIOS.mm b/Source/WebKit/UIProcess/ios/WebPageProxyIOS.mm
>index 2795f730bbfec62e44f54f6a809c82bab633d367..11164424d5dc7030b2febe6a3c320b38af03df8b 100644
>--- a/Source/WebKit/UIProcess/ios/WebPageProxyIOS.mm
>+++ b/Source/WebKit/UIProcess/ios/WebPageProxyIOS.mm
>@@ -895,6 +895,8 @@ void WebPageProxy::didGetTapHighlightGeometries(uint64_t requestID, const WebCor
> 
> void WebPageProxy::startAssistingNode(const AssistedNodeInformation& information, bool userIsInteracting, bool blurPreviousNode, bool changingActivityState, const UserData& userData)
> {
>+    m_elementFocusIDPendingPostLayoutEditorStateUpdate = information.elementFocusID;
>+
>     API::Object* userDataObject = process().transformHandlesToObjects(userData.object()).get();
>     if (m_editorState.isMissingPostLayoutData) {
>         m_deferredNodeAssistanceArguments = std::make_unique<NodeAssistanceArguments>(NodeAssistanceArguments { information, userIsInteracting, blurPreviousNode, changingActivityState, userDataObject });
>@@ -906,6 +908,7 @@ void WebPageProxy::startAssistingNode(const AssistedNodeInformation& information
> 
> void WebPageProxy::stopAssistingNode()
> {
>+    m_elementFocusIDPendingPostLayoutEditorStateUpdate.reset();
>     m_deferredNodeAssistanceArguments = nullptr;
>     pageClient().stopAssistingNode();
> }
>@@ -1054,6 +1057,11 @@ void WebPageProxy::editorStateChanged(const EditorState& editorState)
>     bool couldChangeSecureInputState = m_editorState.isInPasswordField != editorState.isInPasswordField || m_editorState.selectionIsNone;
>     
>     m_editorState = editorState;
>+
>+    if (m_elementFocusIDPendingPostLayoutEditorStateUpdate && !m_editorState.isMissingPostLayoutData && m_editorState.elementFocusID >= *m_elementFocusIDPendingPostLayoutEditorStateUpdate) {
>+        pageClient().didReceiveEditorStateUpdateAfterFocus();
>+        m_elementFocusIDPendingPostLayoutEditorStateUpdate.reset();
>+    }
>     
>     // Selection being none is a temporary state when editing. Flipping secure input state too quickly was causing trouble (not fully understood).
>     if (couldChangeSecureInputState && !editorState.selectionIsNone)
>diff --git a/Source/WebKit/WebKit.xcodeproj/project.pbxproj b/Source/WebKit/WebKit.xcodeproj/project.pbxproj
>index 6b189008453095b4c4db7e50ee32936a1b6cf93c..a52a72d474ea0536fa44ceb3e86ddd4d5c3fb328 100644
>--- a/Source/WebKit/WebKit.xcodeproj/project.pbxproj
>+++ b/Source/WebKit/WebKit.xcodeproj/project.pbxproj
>@@ -4491,6 +4491,7 @@
> 		F44291911FA59107002CC93E /* _WKAttachment.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = _WKAttachment.h; sourceTree = "<group>"; };
> 		F44291931FA59311002CC93E /* _WKAttachment.mm */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.objcpp; path = _WKAttachment.mm; sourceTree = "<group>"; };
> 		F44291951FA5942A002CC93E /* _WKAttachmentInternal.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = _WKAttachmentInternal.h; sourceTree = "<group>"; };
>+		F44294BD21B72E79008D1806 /* ElementFocusID.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = ElementFocusID.h; sourceTree = "<group>"; };
> 		F44DFEB01E9E752F0038D196 /* WebIconUtilities.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = WebIconUtilities.h; path = ios/WebIconUtilities.h; sourceTree = "<group>"; };
> 		F44DFEB11E9E752F0038D196 /* WebIconUtilities.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; name = WebIconUtilities.mm; path = ios/WebIconUtilities.mm; sourceTree = "<group>"; };
> 		F48D2A8421583A0200C6752B /* AppKitSPI.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = AppKitSPI.h; sourceTree = "<group>"; };
>@@ -5017,6 +5018,7 @@
> 				E105FE5318D7B9DE008F57A8 /* EditingRange.h */,
> 				8CFECE931490F140002AAA32 /* EditorState.cpp */,
> 				1AA41AB412C02EC4002BE67B /* EditorState.h */,
>+				F44294BD21B72E79008D1806 /* ElementFocusID.h */,
> 				BCE81D8A1319F7EF00241910 /* FontInfo.cpp */,
> 				BCE81D8B1319F7EF00241910 /* FontInfo.h */,
> 				1A14F8DF1D74C834006CBEC6 /* FrameInfoData.cpp */,
>diff --git a/Source/WebKit/WebProcess/WebPage/WebPage.cpp b/Source/WebKit/WebProcess/WebPage/WebPage.cpp
>index ac475152d74bea92cddeba43b82e3cd0ea6cf1f0..a75a8b26b9810e8cc36c637f996bf1c309088e56 100644
>--- a/Source/WebKit/WebProcess/WebPage/WebPage.cpp
>+++ b/Source/WebKit/WebProcess/WebPage/WebPage.cpp
>@@ -1164,6 +1164,11 @@ void WebPage::changeListType()
>     m_page->focusController().focusedOrMainFrame().editor().changeSelectionListType();
> }
> 
>+void WebPage::setBaseWritingDirection(WritingDirection direction)
>+{
>+    m_page->focusController().focusedOrMainFrame().editor().setBaseWritingDirection(direction);
>+}
>+
> bool WebPage::isEditingCommandEnabled(const String& commandName)
> {
>     Frame& frame = m_page->focusController().focusedOrMainFrame();
>@@ -5259,7 +5264,7 @@ void WebPage::elementDidFocus(WebCore::Node* node)
>             node->document().webkitCancelFullScreen();
> #endif
> 
>-        ++m_currentAssistedNodeIdentifier;
>+        ++m_currentElementFocusID;
>         AssistedNodeInformation information;
>         getAssistedNodeInformation(information);
>         RefPtr<API::Object> userData;
>diff --git a/Source/WebKit/WebProcess/WebPage/WebPage.h b/Source/WebKit/WebProcess/WebPage/WebPage.h
>index 074a041fa65883294730d7a587e2e42e33f281ce..f67f15a58d73bb997540849798ccdb937e6e22f6 100644
>--- a/Source/WebKit/WebProcess/WebPage/WebPage.h
>+++ b/Source/WebKit/WebProcess/WebPage/WebPage.h
>@@ -35,6 +35,7 @@
> #include "CallbackID.h"
> #include "DrawingAreaInfo.h"
> #include "EditingRange.h"
>+#include "ElementFocusID.h"
> #include "InjectedBundlePageContextMenuClient.h"
> #include "InjectedBundlePageFullScreenClient.h"
> #include "InjectedBundlePagePolicyClient.h"
>@@ -70,6 +71,7 @@
> #include <WebCore/UserScriptTypes.h>
> #include <WebCore/VisibilityState.h>
> #include <WebCore/WebCoreKeyboardUIMode.h>
>+#include <WebCore/WritingDirection.h>
> #include <memory>
> #include <pal/HysteresisActivity.h>
> #include <wtf/HashMap.h>
>@@ -1215,6 +1217,8 @@ private:
>     void decreaseListLevel();
>     void changeListType();
> 
>+    void setBaseWritingDirection(WebCore::WritingDirection);
>+
>     void setNeedsFontAttributes(bool);
> 
>     void mouseEvent(const WebMouseEvent&);
>@@ -1715,7 +1719,7 @@ private:
>     RefPtr<WebCore::Node> m_pendingSyntheticClickNode;
>     WebCore::FloatPoint m_pendingSyntheticClickLocation;
>     WebCore::FloatRect m_previousExposedContentRect;
>-    uint64_t m_currentAssistedNodeIdentifier { 0 };
>+    ElementFocusID m_currentElementFocusID { 0 };
>     std::optional<DynamicViewportSizeUpdateID> m_pendingDynamicViewportSizeUpdateID;
>     double m_lastTransactionPageScaleFactor { 0 };
>     uint64_t m_lastTransactionIDWithScaleChange { 0 };
>diff --git a/Source/WebKit/WebProcess/WebPage/WebPage.messages.in b/Source/WebKit/WebProcess/WebPage/WebPage.messages.in
>index 43236559af0fc7c9b94e219f2ee0dc00e775d3d5..520abe7708743e1d1e6fa7f09e58f144923e429c 100644
>--- a/Source/WebKit/WebProcess/WebPage/WebPage.messages.in
>+++ b/Source/WebKit/WebProcess/WebPage/WebPage.messages.in
>@@ -222,6 +222,8 @@ messages -> WebPage LegacyReceiver {
>     DecreaseListLevel()
>     ChangeListType()
> 
>+    SetBaseWritingDirection(enum:uint8_t WebCore::WritingDirection direction)
>+
>     SetNeedsFontAttributes(bool needsFontAttributes)
> 
>     RequestFontAttributesAtSelectionStart(WebKit::CallbackID callbackID)
>diff --git a/Source/WebKit/WebProcess/WebPage/ios/WebPageIOS.mm b/Source/WebKit/WebProcess/WebPage/ios/WebPageIOS.mm
>index 9df618a4d9ad8e9b1d63206c60051dafb76db235..a6d5758abf216f38378ee132407d077f41e52893 100644
>--- a/Source/WebKit/WebProcess/WebPage/ios/WebPageIOS.mm
>+++ b/Source/WebKit/WebProcess/WebPage/ios/WebPageIOS.mm
>@@ -178,6 +178,8 @@ static void computeEditableRootHasContentAndPlainText(const VisibleSelection& se
> 
> void WebPage::platformEditorState(Frame& frame, EditorState& result, IncludePostLayoutDataHint shouldIncludePostLayoutData) const
> {
>+    result.elementFocusID = m_currentElementFocusID;
>+
>     if (frame.editor().hasComposition()) {
>         RefPtr<Range> compositionRange = frame.editor().compositionRange();
>         Vector<WebCore::SelectionRect> compositionRects;
>@@ -2410,7 +2412,7 @@ void WebPage::getAssistedNodeInformation(AssistedNodeInformation& information)
>             information.previousNodeRect = elementRectInRootViewCoordinates(*previousElement, *frame);
>         information.hasPreviousNode = true;
>     }
>-    information.assistedNodeIdentifier = m_currentAssistedNodeIdentifier;
>+    information.elementFocusID = m_currentElementFocusID;
> 
>     if (is<LabelableElement>(*m_assistedNode)) {
>         auto labels = downcast<LabelableElement>(*m_assistedNode).labels();
>diff --git a/Tools/ChangeLog b/Tools/ChangeLog
>index d4a32b204c6858cfe73f35472c9eb21317a609eb..d5f171c75171cd2002e432cce1034d2695423315 100644
>--- a/Tools/ChangeLog
>+++ b/Tools/ChangeLog
>@@ -1,3 +1,45 @@
>+2018-12-05  Wenson Hsieh  <wenson_hsieh@apple.com>
>+
>+        [iOS] WKWebView should match UITextView behavior when editing text with an RTL keyboard
>+        https://bugs.webkit.org/show_bug.cgi?id=187554
>+        <rdar://problem/42075638>
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        WIP patch.
>+
>+        * DumpRenderTree/ios/UIScriptControllerIOS.mm:
>+        (WTR::UIScriptController::setKeyboardInputModeIdentifier):
>+        * TestRunnerShared/UIScriptContext/Bindings/UIScriptController.idl:
>+        * TestRunnerShared/UIScriptContext/UIScriptController.cpp:
>+        (WTR::UIScriptController::setKeyboardInputModeIdentifier):
>+        * TestRunnerShared/UIScriptContext/UIScriptController.h:
>+        * WebKitTestRunner/PlatformWebView.h:
>+        * WebKitTestRunner/TestController.cpp:
>+        (WTR::updateTestOptionsFromTestHeader):
>+        * WebKitTestRunner/TestController.h:
>+        (WTR::TestController::overriddenKeyboardInputMode const):
>+        * WebKitTestRunner/TestOptions.h:
>+        (WTR::TestOptions::hasSameInitializationOptions const):
>+        * WebKitTestRunner/cocoa/TestControllerCocoa.mm:
>+        (WTR::TestController::platformCreateWebView):
>+        * WebKitTestRunner/gtk/PlatformWebViewGtk.cpp:
>+        (WTR::PlatformWebView::setEditable):
>+        * WebKitTestRunner/ios/PlatformWebViewIOS.mm:
>+        (WTR::PlatformWebView::setEditable):
>+        * WebKitTestRunner/ios/TestControllerIOS.mm:
>+        (WTR::TestController::platformResetStateToConsistentValues):
>+        (WTR::swizzleKeyboardInputMode):
>+        (WTR::TestController::setKeyboardInputModeIdentifier):
>+        * WebKitTestRunner/ios/UIScriptControllerIOS.mm:
>+        (WTR::UIScriptController::setKeyboardInputModeIdentifier):
>+        * WebKitTestRunner/mac/PlatformWebViewMac.mm:
>+        (WTR::PlatformWebView::setEditable):
>+        * WebKitTestRunner/win/PlatformWebViewWin.cpp:
>+        (WTR::PlatformWebView::setEditable):
>+        * WebKitTestRunner/wpe/PlatformWebViewWPE.cpp:
>+        (WTR::PlatformWebView::setEditable):
>+
> 2018-12-05  Wenson Hsieh  <wenson_hsieh@apple.com>
> 
>         [Cocoa] Share ClassMethodSwizzler and InstanceMethodSwizzler between TestWebKitAPI and WebKitTestRunner
>diff --git a/Tools/DumpRenderTree/ios/UIScriptControllerIOS.mm b/Tools/DumpRenderTree/ios/UIScriptControllerIOS.mm
>index 25662e28cb61f4d71bc1c893190c3e06542fd7c2..90b42ebfa460885b2b4b2a8643fa31ba2481ddde 100644
>--- a/Tools/DumpRenderTree/ios/UIScriptControllerIOS.mm
>+++ b/Tools/DumpRenderTree/ios/UIScriptControllerIOS.mm
>@@ -436,6 +436,10 @@ JSObjectRef UIScriptController::attachmentInfo(JSStringRef)
>     return nullptr;
> }
> 
>+void UIScriptController::setKeyboardInputModeIdentifier(JSStringRef)
>+{
>+}
>+
> }
> 
> #endif // PLATFORM(IOS_FAMILY)
>diff --git a/Tools/TestRunnerShared/UIScriptContext/Bindings/UIScriptController.idl b/Tools/TestRunnerShared/UIScriptContext/Bindings/UIScriptController.idl
>index 915f6db0d1af2c2e951662648b713d73e6e143a7..7d204e85726a86d3fa8ec2c38b9778c13b706623 100644
>--- a/Tools/TestRunnerShared/UIScriptContext/Bindings/UIScriptController.idl
>+++ b/Tools/TestRunnerShared/UIScriptContext/Bindings/UIScriptController.idl
>@@ -258,6 +258,8 @@ interface UIScriptController {
>     void setDefaultCalendarType(DOMString calendarIdentifier);
>     readonly attribute object inputViewBounds;
> 
>+    void setKeyboardInputModeIdentifier(DOMString identifier);
>+
>     void replaceTextAtRange(DOMString text, long location, long length);
>     void removeAllDynamicDictionaries();
> 
>diff --git a/Tools/TestRunnerShared/UIScriptContext/UIScriptController.cpp b/Tools/TestRunnerShared/UIScriptContext/UIScriptController.cpp
>index e2d053598c85b8bb10ba25b679e76d7cfc45e490..f877dcedc53a9f65d51d568af57b14cb4569ed4d 100644
>--- a/Tools/TestRunnerShared/UIScriptContext/UIScriptController.cpp
>+++ b/Tools/TestRunnerShared/UIScriptContext/UIScriptController.cpp
>@@ -510,6 +510,10 @@ JSObjectRef UIScriptController::attachmentInfo(JSStringRef)
>     return nullptr;
> }
> 
>+void UIScriptController::setKeyboardInputModeIdentifier(JSStringRef)
>+{
>+}
>+
> #endif
> 
> #if !PLATFORM(COCOA)
>diff --git a/Tools/TestRunnerShared/UIScriptContext/UIScriptController.h b/Tools/TestRunnerShared/UIScriptContext/UIScriptController.h
>index 2176f9d7e123075650f05d5c9d0ae20f5bb800b5..7621470f7fd6a12ed755496927a8c9ae4a24dfdf 100644
>--- a/Tools/TestRunnerShared/UIScriptContext/UIScriptController.h
>+++ b/Tools/TestRunnerShared/UIScriptContext/UIScriptController.h
>@@ -171,6 +171,8 @@ public:
>     void setDefaultCalendarType(JSStringRef calendarIdentifier);
>     JSObjectRef inputViewBounds() const;
> 
>+    void setKeyboardInputModeIdentifier(JSStringRef);
>+
>     void replaceTextAtRange(JSStringRef, int location, int length);
>     void removeAllDynamicDictionaries();
>     
>diff --git a/Tools/WebKitTestRunner/PlatformWebView.h b/Tools/WebKitTestRunner/PlatformWebView.h
>index db419c7d4fb8bbc4fbf28ac6e1cd5277f1a0e164..6cdfd7351eaab23dad091465fe703058f6c4b8f2 100644
>--- a/Tools/WebKitTestRunner/PlatformWebView.h
>+++ b/Tools/WebKitTestRunner/PlatformWebView.h
>@@ -103,6 +103,8 @@ public:
>     bool drawsBackground() const;
>     void setDrawsBackground(bool);
> 
>+    void setEditable(bool);
>+
>     void removeFromWindow();
>     void addToWindow();
> 
>diff --git a/Tools/WebKitTestRunner/TestController.cpp b/Tools/WebKitTestRunner/TestController.cpp
>index 56374f70cc0f8e3033f2129ddea0f825f7756ed5..0850558130bc5b76285afb8245a7fb8fe43c1f05 100644
>--- a/Tools/WebKitTestRunner/TestController.cpp
>+++ b/Tools/WebKitTestRunner/TestController.cpp
>@@ -1257,6 +1257,8 @@ static void updateTestOptionsFromTestHeader(TestOptions& testOptions, const std:
>             testOptions.shouldShowSpellCheckingDots = parseBooleanTestHeaderValue(value);
>         else if (key == "enableEditableImages")
>             testOptions.enableEditableImages = parseBooleanTestHeaderValue(value);
>+        else if (key == "editable")
>+            testOptions.editable = parseBooleanTestHeaderValue(value);
>         pairStart = pairEnd + 1;
>     }
> }
>diff --git a/Tools/WebKitTestRunner/TestController.h b/Tools/WebKitTestRunner/TestController.h
>index e31b2eb44910a59f1fb61af1afc3fbe568d39b2e..fdc81516f63dd59e981e440652d3f1d237d38264 100644
>--- a/Tools/WebKitTestRunner/TestController.h
>+++ b/Tools/WebKitTestRunner/TestController.h
>@@ -40,9 +40,11 @@
> 
> #if PLATFORM(COCOA)
> #include "ClassMethodSwizzler.h"
>+#include "InstanceMethodSwizzler.h"
> #endif
> 
> OBJC_CLASS NSString;
>+OBJC_CLASS UIKeyboardInputMode;
> OBJC_CLASS WKWebViewConfiguration;
> 
> namespace WTR {
>@@ -270,6 +272,12 @@ public:
>     RetainPtr<NSString> getOverriddenCalendarIdentifier() const;
>     void setDefaultCalendarType(NSString *identifier);
> #endif // PLATFORM(COCOA)
>+
>+#if PLATFORM(IOS_FAMILY)
>+    void setKeyboardInputModeIdentifier(const String&);
>+    UIKeyboardInputMode *overriddenKeyboardInputMode() const { return m_overriddenKeyboardInputMode.get(); }
>+#endif
>+
> private:
>     WKRetainPtr<WKPageConfigurationRef> generatePageConfiguration(WKContextConfigurationRef);
>     WKRetainPtr<WKContextConfigurationRef> generateContextConfiguration() const;
>@@ -441,6 +449,11 @@ private:
>     WKRetainPtr<WKContextRef> m_context;
>     WKRetainPtr<WKPageGroupRef> m_pageGroup;
> 
>+#if PLATFORM(IOS_FAMILY)
>+    std::unique_ptr<InstanceMethodSwizzler> m_currentInputModeSwizzler;
>+    RetainPtr<UIKeyboardInputMode> m_overriddenKeyboardInputMode;
>+#endif
>+
>     enum State {
>         Initial,
>         Resetting,
>diff --git a/Tools/WebKitTestRunner/TestOptions.h b/Tools/WebKitTestRunner/TestOptions.h
>index 36588dcf5dae59308f2547177b4f7d27624ad716..10786e04125c7192fcd282503b68d96b853b0c88 100644
>--- a/Tools/WebKitTestRunner/TestOptions.h
>+++ b/Tools/WebKitTestRunner/TestOptions.h
>@@ -65,6 +65,7 @@ struct TestOptions {
>     bool shouldIgnoreMetaViewport { false };
>     bool shouldShowSpellCheckingDots { false };
>     bool enableEditableImages { false };
>+    bool editable { false };
> 
>     float deviceScaleFactor { 1 };
>     Vector<String> overrideLanguages;
>@@ -107,7 +108,8 @@ struct TestOptions {
>             || checkForWorldLeaks != options.checkForWorldLeaks
>             || shouldShowSpellCheckingDots != options.shouldShowSpellCheckingDots
>             || shouldIgnoreMetaViewport != options.shouldIgnoreMetaViewport
>-            || enableEditableImages != options.enableEditableImages)
>+            || enableEditableImages != options.enableEditableImages
>+            || editable != options.editable)
>             return false;
> 
>         if (experimentalFeatures != options.experimentalFeatures)
>diff --git a/Tools/WebKitTestRunner/cocoa/TestControllerCocoa.mm b/Tools/WebKitTestRunner/cocoa/TestControllerCocoa.mm
>index 69a4ac62ae165c35895bf07b216448ee2ee8a845..11b0e3ae34fbbe7e1ba9e1721a4d118d33026796 100644
>--- a/Tools/WebKitTestRunner/cocoa/TestControllerCocoa.mm
>+++ b/Tools/WebKitTestRunner/cocoa/TestControllerCocoa.mm
>@@ -171,6 +171,9 @@ void TestController::platformCreateWebView(WKPageConfigurationRef, const TestOpt
> 
>     if (options.punchOutWhiteBackgroundsInDarkMode)
>         m_mainWebView->setDrawsBackground(false);
>+
>+    if (options.editable)
>+        m_mainWebView->setEditable(true);
> #else
>     m_mainWebView = std::make_unique<PlatformWebView>(globalWebViewConfiguration, options);
> #endif
>diff --git a/Tools/WebKitTestRunner/gtk/PlatformWebViewGtk.cpp b/Tools/WebKitTestRunner/gtk/PlatformWebViewGtk.cpp
>index de614b463b70aa479823a81c878ac77524fb8dbd..b3668441a5c774cdf3f550bbe2e021409284b00d 100644
>--- a/Tools/WebKitTestRunner/gtk/PlatformWebViewGtk.cpp
>+++ b/Tools/WebKitTestRunner/gtk/PlatformWebViewGtk.cpp
>@@ -198,5 +198,9 @@ void PlatformWebView::setDrawsBackground(bool)
> {
> }
> 
>+void PlatformWebView::setEditable(bool)
>+{
>+}
>+
> } // namespace WTR
> 
>diff --git a/Tools/WebKitTestRunner/ios/PlatformWebViewIOS.mm b/Tools/WebKitTestRunner/ios/PlatformWebViewIOS.mm
>index a91cc6d1e47401170d8970d28517b7cc9761bd15..fda732daaafffea850260fabdc3eb4422d0e872e 100644
>--- a/Tools/WebKitTestRunner/ios/PlatformWebViewIOS.mm
>+++ b/Tools/WebKitTestRunner/ios/PlatformWebViewIOS.mm
>@@ -294,6 +294,15 @@ void PlatformWebView::changeWindowScaleIfNeeded(float)
>     // Retina only surface.
> }
> 
>+void PlatformWebView::setEditable(bool editable)
>+{
>+#if WK_API_ENABLED
>+    m_view._editable = editable;
>+#else
>+    UNUSED_PARAM(editable);
>+#endif
>+}
>+
> bool PlatformWebView::drawsBackground() const
> {
>     return false;
>diff --git a/Tools/WebKitTestRunner/ios/TestControllerIOS.mm b/Tools/WebKitTestRunner/ios/TestControllerIOS.mm
>index 0b437aeb6a1fda94628b10b14d57b1775e5925d3..63e4c8299fdbc0a94d71923c9535370b293c1fb2 100644
>--- a/Tools/WebKitTestRunner/ios/TestControllerIOS.mm
>+++ b/Tools/WebKitTestRunner/ios/TestControllerIOS.mm
>@@ -116,6 +116,9 @@ void TestController::platformResetStateToConsistentValues(const TestOptions& opt
>     cocoaResetStateToConsistentValues(options);
> 
>     [[UIDevice currentDevice] setOrientation:UIDeviceOrientationPortrait animated:NO];
>+
>+    m_currentInputModeSwizzler = nullptr;
>+    m_overriddenKeyboardInputMode = nil;
>     
>     BOOL shouldRestoreFirstResponder = NO;
>     if (PlatformWebView* platformWebView = mainWebView()) {
>@@ -198,4 +201,15 @@ void TestController::setHidden(bool)
>     // FIXME: implement for iOS
> }
> 
>+static UIKeyboardInputMode *swizzleKeyboardInputMode()
>+{
>+    return TestController::singleton().overriddenKeyboardInputMode();
>+}
>+
>+void TestController::setKeyboardInputModeIdentifier(const String& identifier)
>+{
>+    m_overriddenKeyboardInputMode = [UIKeyboardInputMode keyboardInputModeWithIdentifier:identifier];
>+    m_currentInputModeSwizzler = std::make_unique<InstanceMethodSwizzler>(UIKeyboardInputModeController.class, @selector(currentInputMode), reinterpret_cast<IMP>(swizzleKeyboardInputMode));
>+}
>+
> } // namespace WTR
>diff --git a/Tools/WebKitTestRunner/ios/UIScriptControllerIOS.mm b/Tools/WebKitTestRunner/ios/UIScriptControllerIOS.mm
>index abd0bc612167c11ad6d890994cdebc2ebff487b3..a9d54ad6d2540064da32867690462d0026a642ac 100644
>--- a/Tools/WebKitTestRunner/ios/UIScriptControllerIOS.mm
>+++ b/Tools/WebKitTestRunner/ios/UIScriptControllerIOS.mm
>@@ -925,6 +925,11 @@ long UIScriptController::numberOfStrokesInEditableImage()
> #endif
> }
> 
>+void UIScriptController::setKeyboardInputModeIdentifier(JSStringRef identifier)
>+{
>+    TestController::singleton().setKeyboardInputModeIdentifier(toWTFString(toWK(identifier)));
>+}
>+
> void UIScriptController::toggleCapsLock(JSValueRef callback)
> {
>     // FIXME: Implement for iOS. See <https://bugs.webkit.org/show_bug.cgi?id=191815>.
>diff --git a/Tools/WebKitTestRunner/mac/PlatformWebViewMac.mm b/Tools/WebKitTestRunner/mac/PlatformWebViewMac.mm
>index f6cb2a08d64579cd444f820a30a6149f380dfa65..45d1f9be8c6b326bb3aeed5e8c3bf8aeda7cd8ee 100644
>--- a/Tools/WebKitTestRunner/mac/PlatformWebViewMac.mm
>+++ b/Tools/WebKitTestRunner/mac/PlatformWebViewMac.mm
>@@ -212,6 +212,15 @@ void PlatformWebView::setDrawsBackground(bool drawsBackground)
> #endif
> }
> 
>+void PlatformWebView::setEditable(bool editable)
>+{
>+#if WK_API_ENABLED
>+    m_view._editable = editable;
>+#else
>+    UNUSED_PARAM(editable);
>+#endif
>+}
>+
> RetainPtr<CGImageRef> PlatformWebView::windowSnapshotImage()
> {
>     [platformView() display];
>diff --git a/Tools/WebKitTestRunner/win/PlatformWebViewWin.cpp b/Tools/WebKitTestRunner/win/PlatformWebViewWin.cpp
>index fdc504981c282d4c96195e53853d082d2752d6a8..dc9d3a1efdfb75f60e51273fe60b0d4cfe41e05f 100644
>--- a/Tools/WebKitTestRunner/win/PlatformWebViewWin.cpp
>+++ b/Tools/WebKitTestRunner/win/PlatformWebViewWin.cpp
>@@ -259,4 +259,8 @@ void PlatformWebView::setDrawsBackground(bool)
> {
> }
> 
>+void PlatformWebView::setEditable(bool)
>+{
>+}
>+
> } // namespace WTR
>diff --git a/Tools/WebKitTestRunner/wpe/PlatformWebViewWPE.cpp b/Tools/WebKitTestRunner/wpe/PlatformWebViewWPE.cpp
>index 214933e03ee919b70ed7aa1befa51d164147c96a..282c4743ca39cb212fb9f5e4e3c7fd8eaea5ef89 100644
>--- a/Tools/WebKitTestRunner/wpe/PlatformWebViewWPE.cpp
>+++ b/Tools/WebKitTestRunner/wpe/PlatformWebViewWPE.cpp
>@@ -141,4 +141,8 @@ void PlatformWebView::setDrawsBackground(bool)
> {
> }
> 
>+void PlatformWebView::setEditable(bool)
>+{
>+}
>+
> } // namespace WTR
>diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
>index 987f5948ed9583acdfaed3cd1c9c17407a8d50b2..5fa9d1184c9fd30cc4e412f1f4683e03ed179a27 100644
>--- a/LayoutTests/ChangeLog
>+++ b/LayoutTests/ChangeLog
>@@ -1,3 +1,21 @@
>+2018-12-05  Wenson Hsieh  <wenson_hsieh@apple.com>
>+
>+        [iOS] WKWebView should match UITextView behavior when editing text with an RTL keyboard
>+        https://bugs.webkit.org/show_bug.cgi?id=187554
>+        <rdar://problem/42075638>
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        WIP patch.
>+
>+        * TestExpectations:
>+        * editing/input/ios/rtl-keyboard-input-on-focus-expected.txt: Added.
>+        * editing/input/ios/rtl-keyboard-input-on-focus.html: Added.
>+        * platform/ios-wk2/TestExpectations:
>+        * resources/ui-helper.js:
>+        (window.UIHelper.setKeyboardInputModeIdentifier):
>+        (window.UIHelper):
>+
> 2018-12-05  Alicia Boya GarcÃa  <aboya@igalia.com>
> 
>         [GTK] Unreviewed test gardening
>diff --git a/LayoutTests/TestExpectations b/LayoutTests/TestExpectations
>index fdb99e80bf40430be07de93507dfe097b0ba9c3b..a9f6d97d68f978459dfd0454cd49549cfd6794cf 100644
>--- a/LayoutTests/TestExpectations
>+++ b/LayoutTests/TestExpectations
>@@ -15,6 +15,7 @@ accessibility/win [ Skip ]
> displaylists [ Skip ]
> editing/mac [ Skip ]
> editing/caret/ios [ Skip ]
>+editing/input/ios [ Skip ]
> editing/find [ Skip ]
> editing/pasteboard/gtk [ Skip ]
> editing/selection/ios [ Skip ]
>diff --git a/LayoutTests/editing/input/ios/rtl-keyboard-input-on-focus-expected.txt b/LayoutTests/editing/input/ios/rtl-keyboard-input-on-focus-expected.txt
>new file mode 100644
>index 0000000000000000000000000000000000000000..30b1950e5de6d289369936199617c46b6acae6fc
>--- /dev/null
>+++ b/LayoutTests/editing/input/ios/rtl-keyboard-input-on-focus-expected.txt
>@@ -0,0 +1,38 @@
>+
>+
>+Using Hebrew keyboard: 
>+    <div><br></div>
>+    <div style="direction: rtl;"><br></div>
>+
>+
>+
>+Using English keyboard: 
>+    <div><br></div>
>+    <div style="direction: ltr;"><br></div>
>+
>+
>+
>+Observed 'beforeinput' events: [
>+    {
>+        "inputType": "formatSetInlineTextDirection",
>+        "data": "rtl",
>+        "order": 1
>+    },
>+    {
>+        "inputType": "formatSetInlineTextDirection",
>+        "data": "ltr",
>+        "order": 3
>+    }
>+]
>+Observed 'input' events: [
>+    {
>+        "inputType": "formatSetInlineTextDirection",
>+        "data": "rtl",
>+        "order": 2
>+    },
>+    {
>+        "inputType": "formatSetInlineTextDirection",
>+        "data": "ltr",
>+        "order": 4
>+    }
>+]
>diff --git a/LayoutTests/editing/input/ios/rtl-keyboard-input-on-focus.html b/LayoutTests/editing/input/ios/rtl-keyboard-input-on-focus.html
>new file mode 100644
>index 0000000000000000000000000000000000000000..aa723bd56129ca6daf8a728c9f192c1f3bd223d9
>--- /dev/null
>+++ b/LayoutTests/editing/input/ios/rtl-keyboard-input-on-focus.html
>@@ -0,0 +1,79 @@
>+<!DOCTYPE html> 
>+<html>
>+<meta name="viewport" content="width=device-width, initial-scale=1">
>+<head>
>+    <script src="../../../resources/basic-gestures.js"></script>
>+    <script src="../../../resources/ui-helper.js"></script>
>+    <style>
>+        body {
>+            margin: 0;
>+        }
>+    </style>
>+    <script>
>+    function appendOutput(string) {
>+        let pre = document.createElement("pre");
>+        pre.textContent = string;
>+        document.body.appendChild(pre);
>+    }
>+
>+    beforeInputEvents = [];
>+    inputEvents = [];
>+    eventNumber = 0;
>+
>+    async function run()
>+    {
>+        script.remove();
>+
>+        document.body.addEventListener("beforeinput", event => {
>+            beforeInputEvents.push({
>+                "inputType": event.inputType,
>+                "data": event.data,
>+                "order": ++eventNumber
>+            });
>+        });
>+
>+        document.body.addEventListener("input", event => {
>+            inputEvents.push({
>+                "inputType": event.inputType,
>+                "data": event.data,
>+                "order": ++eventNumber
>+            });
>+        });
>+
>+        await UIHelper.setKeyboardInputModeIdentifier("he_IL");
>+        await UIHelper.activateAndWaitForInputSessionAt(100, 250);
>+        await UIHelper.ensurePresentationUpdate();
>+        const markupUsingHebrewKeyboard = document.body.innerHTML;
>+
>+        document.body.blur();
>+        await UIHelper.waitForKeyboardToHide();
>+        await UIHelper.setKeyboardInputModeIdentifier("en_US");
>+        await UIHelper.activateAndWaitForInputSessionAt(100, 250);
>+        await UIHelper.ensurePresentationUpdate();
>+        const markupUsingEnglishKeyboard = document.body.innerHTML;
>+
>+        appendOutput(`Using Hebrew keyboard: ${markupUsingHebrewKeyboard}`);
>+        appendOutput(`Using English keyboard: ${markupUsingEnglishKeyboard}`);
>+        appendOutput(`Observed 'beforeinput' events: ${JSON.stringify(beforeInputEvents, null, 4)}`);
>+        appendOutput(`Observed 'input' events: ${JSON.stringify(inputEvents, null, 4)}`);
>+        testRunner.notifyDone();
>+    }
>+    </script>
>+</head>
>+<body onload="run()">
>+    <div><br></div>
>+    <div><br></div>
>+</body>
>+<script id="script">
>+if (window.testRunner) {
>+    testRunner.waitUntilDone();
>+    testRunner.dumpAsText();
>+} else {
>+    const description = document.createElement("p");
>+    description.textContent = "Verifies that focusing an editable area with an RTL keyboard switches text direction to RTL. "
>+        + "To test manually, switch to a Hebrew keyboard and focus the editable area. "
>+        + "The editable area should be made RTL.";
>+    document.body.prepend(description);
>+}
>+</script>
>+</html>
>diff --git a/LayoutTests/platform/ios-wk2/TestExpectations b/LayoutTests/platform/ios-wk2/TestExpectations
>index 53bac478465471265acf9d5baacf3436aa90e902..feff1f0572252c7d27f91210f292d25faf1bd8c6 100644
>--- a/LayoutTests/platform/ios-wk2/TestExpectations
>+++ b/LayoutTests/platform/ios-wk2/TestExpectations
>@@ -15,6 +15,7 @@ scrollingcoordinator/ios [ Pass ]
> tiled-drawing/ios [ Pass ]
> fast/web-share [ Pass ]
> editing/find [ Pass ]
>+editing/input/ios [ Pass ]
> 
> editing/selection/character-granularity-rect.html [ Failure ]
> 
>diff --git a/LayoutTests/resources/ui-helper.js b/LayoutTests/resources/ui-helper.js
>index e4df524071d6e710b6eb3691a68898421596c30e..67c52c0b9021f51d42ab6159da98f57d7bccbf0d 100644
>--- a/LayoutTests/resources/ui-helper.js
>+++ b/LayoutTests/resources/ui-helper.js
>@@ -476,4 +476,13 @@ window.UIHelper = class UIHelper {
> 
>         return new Promise(resolve => testRunner.runUIScript(`uiController.setMinimumEffectiveWidth(${effectiveWidth})`, resolve));
>     }
>+
>+    static setKeyboardInputModeIdentifier(identifier)
>+    {
>+        if (!this.isWebKit2())
>+            return Promise.resolve();
>+
>+        const escapedIdentifier = identifier.replace(/`/g, "\\`");
>+        return new Promise(resolve => testRunner.runUIScript(`uiController.setKeyboardInputModeIdentifier(\`${escapedIdentifier}\`)`, resolve));
>+    }
> }

Flags:

ews-watchlist: commit-queue-

Actions: View | Formatted Diff | Diff

Attachments on bug 187554: 356716 | 356721 | 356736 | 356738 | 356741