Changeset 246311 in webkit

Timestamp:

Jun 11, 2019, 7:46:23 AM (7 years ago)

Author:

Wenson Hsieh

Message:

Quotes are always inserted as smart quotes on stackblitz.com, causing compilation errors
​https://bugs.webkit.org/show_bug.cgi?id=198735
<rdar://problem/51557159>

Reviewed by Megan Gardner.

Source/WebKit:

Add a flag in FocusedElementInformation to indicate whether spellchecking is allowed in the focused element.
If spellchecking is not allowed, then disable smart quotes and dashes, which matches behavior on macOS.

• Shared/FocusedElementInformation.cpp:

(WebKit::FocusedElementInformation::encode const):
(WebKit::FocusedElementInformation::decode):

• Shared/FocusedElementInformation.h:
• UIProcess/ios/WKContentViewInteraction.mm:

(-[WKContentView textInputTraits]):

• WebProcess/WebPage/ios/WebPageIOS.mm:

(WebKit::WebPage::getFocusedElementInformation):

Tools:

Add a test to verify that spellcheck="false" disables smart quotes and dashes, but any other value defers to the
user's preferences by using UITextSmartQuotesTypeDefault and UITextSmartDashesTypeDefault.

• TestWebKitAPI/Tests/ios/KeyboardInputTestsIOS.mm:

(TestWebKitAPI::TEST):

Location:

trunk

Files:

• Source/WebKit/ChangeLog (modified) (1 diff)
• Source/WebKit/Shared/FocusedElementInformation.cpp (modified) (2 diffs)
• Source/WebKit/Shared/FocusedElementInformation.h (modified) (1 diff)
• Source/WebKit/UIProcess/ios/WKContentViewInteraction.mm (modified) (1 diff)
• Source/WebKit/WebProcess/WebPage/ios/WebPageIOS.mm (modified) (1 diff)
• Tools/ChangeLog (modified) (1 diff)
• Tools/TestWebKitAPI/Tests/ios/KeyboardInputTestsIOS.mm (modified) (1 diff)

trunk/Source/WebKit/ChangeLog

@@ +1 @@
+2019-06-11  Wenson Hsieh  <wenson_hsieh@apple.com>
+
+        Quotes are always inserted as smart quotes on stackblitz.com, causing compilation errors
+        https://bugs.webkit.org/show_bug.cgi?id=198735
+        <rdar://problem/51557159>
+
+        Reviewed by Megan Gardner.
+
+        Add a flag in FocusedElementInformation to indicate whether spellchecking is allowed in the focused element.
+        If spellchecking is not allowed, then disable smart quotes and dashes, which matches behavior on macOS.
+
+        * Shared/FocusedElementInformation.cpp:
+        (WebKit::FocusedElementInformation::encode const):
+        (WebKit::FocusedElementInformation::decode):
+        * Shared/FocusedElementInformation.h:
+        * UIProcess/ios/WKContentViewInteraction.mm:
+        (-[WKContentView textInputTraits]):
+        * WebProcess/WebPage/ios/WebPageIOS.mm:
+        (WebKit::WebPage::getFocusedElementInformation):
+
 2019-06-11  Carlos Garcia Campos  <cgarcia@igalia.com>
 

trunk/Source/WebKit/Shared/FocusedElementInformation.cpp

@@ -106 +106 @@
 #endif
     encoder << shouldSynthesizeKeyEventsForEditing;
+    encoder << isSpellCheckingEnabled;
 }
 
@@ -227 +228 @@
         return false;
 
+    if (!decoder.decode(result.isSpellCheckingEnabled))
+        return false;
+
     return true;
 }

trunk/Source/WebKit/Shared/FocusedElementInformation.h

@@ -138 +138 @@
 #endif
     bool shouldSynthesizeKeyEventsForEditing { false };
+    bool isSpellCheckingEnabled { true };
 
     FocusedElementIdentifier focusedElementIdentifier { 0 };

trunk/Source/WebKit/UIProcess/ios/WKContentViewInteraction.mm

@@ -4385 +4385 @@
     }
 
+    if (!_focusedElementInformation.isSpellCheckingEnabled) {
+        [_traits setSmartQuotesType:UITextSmartQuotesTypeNo];
+        [_traits setSmartDashesType:UITextSmartDashesTypeNo];
+    }
+
     switch (_focusedElementInformation.inputMode) {
     case WebCore::InputMode::None:

trunk/Source/WebKit/WebProcess/WebPage/ios/WebPageIOS.mm

@@ -2767 +2767 @@
         information.elementRect = IntRect();
 
+    if (is<HTMLElement>(m_focusedElement))
+        information.isSpellCheckingEnabled = downcast<HTMLElement>(*m_focusedElement).spellcheck();
+
     information.minimumScaleFactor = minimumPageScaleFactor();
     information.maximumScaleFactor = maximumPageScaleFactor();

trunk/Tools/ChangeLog

@@ +1 @@
+2019-06-11  Wenson Hsieh  <wenson_hsieh@apple.com>
+
+        Quotes are always inserted as smart quotes on stackblitz.com, causing compilation errors
+        https://bugs.webkit.org/show_bug.cgi?id=198735
+        <rdar://problem/51557159>
+
+        Reviewed by Megan Gardner.
+
+        Add a test to verify that spellcheck="false" disables smart quotes and dashes, but any other value defers to the
+        user's preferences by using UITextSmartQuotesTypeDefault and UITextSmartDashesTypeDefault.
+
+        * TestWebKitAPI/Tests/ios/KeyboardInputTestsIOS.mm:
+        (TestWebKitAPI::TEST):
+
 2019-06-11  Tadeu Zagallo  <tzagallo@apple.com>
 

trunk/Tools/TestWebKitAPI/Tests/ios/KeyboardInputTestsIOS.mm

@@ -474 +474 @@
 }
 
+TEST(KeyboardInputTests, DisableSmartQuotesAndDashes)
+{
+    auto webView = adoptNS([[TestWKWebView alloc] initWithFrame:CGRectMake(0, 0, 320, 500)]);
+    auto inputDelegate = adoptNS([[TestInputDelegate alloc] init]);
+    [inputDelegate setFocusStartsInputSessionPolicyHandler:[&] (WKWebView *, id <_WKFocusedElementInfo>) -> _WKFocusStartsInputSessionPolicy {
+        return _WKFocusStartsInputSessionPolicyAllow;
+    }];
+    [webView _setInputDelegate:inputDelegate.get()];
+
+    auto checkSmartQuotesAndDashesType = [&] (UITextSmartDashesType dashesType, UITextSmartQuotesType quotesType) {
+        UITextInputTraits *traits = [[webView textInputContentView] textInputTraits];
+        EXPECT_EQ(dashesType, traits.smartDashesType);
+        EXPECT_EQ(quotesType, traits.smartQuotesType);
+    };
+
+    [webView synchronouslyLoadHTMLString:@"<div id='foo' contenteditable spellcheck='false'></div><textarea id='bar' spellcheck='false'></textarea><input id='baz' spellcheck='false'>"];
+    [webView evaluateJavaScriptAndWaitForInputSessionToChange:@"foo.focus()"];
+    checkSmartQuotesAndDashesType(UITextSmartDashesTypeNo, UITextSmartQuotesTypeNo);
+    [webView evaluateJavaScriptAndWaitForInputSessionToChange:@"bar.focus()"];
+    checkSmartQuotesAndDashesType(UITextSmartDashesTypeNo, UITextSmartQuotesTypeNo);
+    [webView evaluateJavaScriptAndWaitForInputSessionToChange:@"baz.focus()"];
+    checkSmartQuotesAndDashesType(UITextSmartDashesTypeNo, UITextSmartQuotesTypeNo);
+
+    [webView synchronouslyLoadHTMLString:@"<div id='foo' contenteditable></div><textarea id='bar' spellcheck='true'></textarea><input id='baz'>"];
+    [webView evaluateJavaScriptAndWaitForInputSessionToChange:@"foo.focus()"];
+    checkSmartQuotesAndDashesType(UITextSmartDashesTypeDefault, UITextSmartQuotesTypeDefault);
+    [webView evaluateJavaScriptAndWaitForInputSessionToChange:@"bar.focus()"];
+    checkSmartQuotesAndDashesType(UITextSmartDashesTypeDefault, UITextSmartQuotesTypeDefault);
+    [webView evaluateJavaScriptAndWaitForInputSessionToChange:@"baz.focus()"];
+    checkSmartQuotesAndDashesType(UITextSmartDashesTypeDefault, UITextSmartQuotesTypeDefault);
+}
+
 } // namespace TestWebKitAPI