Changeset 246226 in webkit

Timestamp:

Jun 7, 2019, 5:48:42 PM (7 years ago)

Author:

Megan Gardner

Message:

Extend quirks to emulate bold/italic/underline in hidden editable areas
​https://bugs.webkit.org/show_bug.cgi?id=198681

Reviewed by Wenson Hsieh.

Source/WebCore:

Rename only.

Rename quirks to be more accurate for new extended use.

• page/Quirks.cpp:

(WebCore::shouldEmulateEditingButtonsAndGesturesInHiddenEditableAreasForHost):
(WebCore::Quirks::shouldEmulateEditingButtonsAndGesturesInHiddenEditableAreas const):
(WebCore::shouldEmulateUndoRedoInHiddenEditableAreasForHost): Deleted.
(WebCore::Quirks::shouldEmulateUndoRedoInHiddenEditableAreas const): Deleted.

• page/Quirks.h:

Source/WebKit:

• Shared/FocusedElementInformation.cpp:

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

• Shared/FocusedElementInformation.h:
• Shared/SyntheticEditingCommandType.h:
• UIProcess/ios/WKContentView.mm:

(-[WKContentView undoManager]):

• UIProcess/ios/WKContentViewInteraction.mm:

(shouldSynthezieKeyEvents):
(-[WKContentView toggleBoldfaceForWebView:]):
(-[WKContentView toggleItalicsForWebView:]):
(-[WKContentView toggleUnderlineForWebView:]):
(-[WKContentView _elementDidBlur]):

• WebProcess/WebPage/ios/WebPageIOS.mm:

(WebKit::WebPage::generateSyntheticEditingCommand):
(WebKit::WebPage::getFocusedElementInformation):

Location:

trunk/Source

Files:

• WebCore/ChangeLog (modified) (1 diff)
• WebCore/page/Quirks.cpp (modified) (2 diffs)
• WebCore/page/Quirks.h (modified) (1 diff)
• WebKit/ChangeLog (modified) (1 diff)
• WebKit/Shared/FocusedElementInformation.cpp (modified) (2 diffs)
• WebKit/Shared/FocusedElementInformation.h (modified) (1 diff)
• WebKit/Shared/SyntheticEditingCommandType.h (modified) (2 diffs)
• WebKit/UIProcess/ios/WKContentView.mm (modified) (1 diff)
• WebKit/UIProcess/ios/WKContentViewInteraction.mm (modified) (5 diffs)
• WebKit/WebProcess/WebPage/ios/WebPageIOS.mm (modified) (2 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2019-06-07  Megan Gardner  <megan_gardner@apple.com>
+
+        Extend quirks to emulate bold/italic/underline in hidden editable areas
+        https://bugs.webkit.org/show_bug.cgi?id=198681
+
+        Reviewed by Wenson Hsieh.
+
+        Rename only.
+
+        Rename quirks to be more accurate for new extended use.
+
+        * page/Quirks.cpp:
+        (WebCore::shouldEmulateEditingButtonsAndGesturesInHiddenEditableAreasForHost):
+        (WebCore::Quirks::shouldEmulateEditingButtonsAndGesturesInHiddenEditableAreas const):
+        (WebCore::shouldEmulateUndoRedoInHiddenEditableAreasForHost): Deleted.
+        (WebCore::Quirks::shouldEmulateUndoRedoInHiddenEditableAreas const): Deleted.
+        * page/Quirks.h:
+
 2019-06-07  Truitt Savell  <tsavell@apple.com>
 

trunk/Source/WebCore/page/Quirks.cpp

@@ -239 +239 @@
 }
 
-static bool shouldEmulateUndoRedoInHiddenEditableAreasForHost(const StringView& host)
+static bool shouldEmulateEditingButtonsAndGesturesInHiddenEditableAreasForHost(const StringView& host)
 {
 #if PLATFORM(IOS_FAMILY)
@@ -267 +267 @@
 }
 
-bool Quirks::shouldEmulateUndoRedoInHiddenEditableAreas() const
-{
-    if (!needsQuirks())
-        return false;
-
-    return shouldEmulateUndoRedoInHiddenEditableAreasForHost(m_document->topDocument().url().host());
+bool Quirks::shouldEmulateEditingButtonsAndGesturesInHiddenEditableAreas() const
+{
+    if (!needsQuirks())
+        return false;
+
+    return shouldEmulateEditingButtonsAndGesturesInHiddenEditableAreasForHost(m_document->topDocument().url().host());
 }
 

trunk/Source/WebCore/page/Quirks.h

@@ -59 +59 @@
     WEBCORE_EXPORT bool shouldDispatchSyntheticMouseEventsWhenModifyingSelection() const;
     WEBCORE_EXPORT bool shouldSuppressAutocorrectionAndAutocaptializationInHiddenEditableAreas() const;
-    WEBCORE_EXPORT bool shouldEmulateUndoRedoInHiddenEditableAreas() const;
+    WEBCORE_EXPORT bool shouldEmulateEditingButtonsAndGesturesInHiddenEditableAreas() const;
     WEBCORE_EXPORT bool isTouchBarUpdateSupressedForHiddenContentEditable() const;
     WEBCORE_EXPORT bool isNeverRichlyEditableForTouchBar() const;

trunk/Source/WebKit/ChangeLog

@@ +1 @@
+2019-06-07  Megan Gardner  <megan_gardner@apple.com>
+
+        Extend quirks to emulate bold/italic/underline in hidden editable areas
+        https://bugs.webkit.org/show_bug.cgi?id=198681
+
+        Reviewed by Wenson Hsieh.
+
+        * Shared/FocusedElementInformation.cpp:
+        (WebKit::FocusedElementInformation::encode const):
+        (WebKit::FocusedElementInformation::decode):
+        * Shared/FocusedElementInformation.h:
+        * Shared/SyntheticEditingCommandType.h:
+        * UIProcess/ios/WKContentView.mm:
+        (-[WKContentView undoManager]):
+        * UIProcess/ios/WKContentViewInteraction.mm:
+        (shouldSynthezieKeyEvents):
+        (-[WKContentView toggleBoldfaceForWebView:]):
+        (-[WKContentView toggleItalicsForWebView:]):
+        (-[WKContentView toggleUnderlineForWebView:]):
+        (-[WKContentView _elementDidBlur]):
+        * WebProcess/WebPage/ios/WebPageIOS.mm:
+        (WebKit::WebPage::generateSyntheticEditingCommand):
+        (WebKit::WebPage::getFocusedElementInformation):
+
 2019-06-05  Alex Christensen  <achristensen@webkit.org>
 

trunk/Source/WebKit/Shared/FocusedElementInformation.cpp

@@ -105 +105 @@
 #endif
 #endif
-    encoder << shouldSynthesizeKeyEventsForUndoAndRedo;
+    encoder << shouldSynthesizeKeyEventsForEditing;
 }
 
@@ -224 +224 @@
 #endif
 #endif
-    if (!decoder.decode(result.shouldSynthesizeKeyEventsForUndoAndRedo))
+    if (!decoder.decode(result.shouldSynthesizeKeyEventsForEditing))
         return false;
 

trunk/Source/WebKit/Shared/FocusedElementInformation.h

@@ -137 +137 @@
 #endif
 #endif
-    bool shouldSynthesizeKeyEventsForUndoAndRedo { false };
+    bool shouldSynthesizeKeyEventsForEditing { false };
 
     FocusedElementIdentifier focusedElementIdentifier { 0 };

trunk/Source/WebKit/Shared/SyntheticEditingCommandType.h

@@ -30 +30 @@
 enum class SyntheticEditingCommandType : uint8_t  {
     Undo,
-    Redo
+    Redo,
+    ToggleBoldface,
+    ToggleItalic,
+    ToggleUnderline
 };
 
@@ -41 +44 @@
     WebKit::SyntheticEditingCommandType,
     WebKit::SyntheticEditingCommandType::Undo,
-    WebKit::SyntheticEditingCommandType::Redo
+    WebKit::SyntheticEditingCommandType::Redo,
+    WebKit::SyntheticEditingCommandType::ToggleBoldface,
+    WebKit::SyntheticEditingCommandType::ToggleItalic,
+    WebKit::SyntheticEditingCommandType::ToggleUnderline
     >;
 };

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

@@ -444 +444 @@
 - (NSUndoManager *)undoManager
 {
-    if (self.focusedElementInformation.shouldSynthesizeKeyEventsForUndoAndRedo && self.hasHiddenContentEditable) {
+    if (self.focusedElementInformation.shouldSynthesizeKeyEventsForEditing && self.hasHiddenContentEditable) {
         if (!_quirkyUndoManager)
             _quirkyUndoManager = adoptNS([[WKQuirkyNSUndoManager alloc] initWithContentView:self]);

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

@@ -3119 +3119 @@
 }
 
+- (BOOL)shouldSynthesizeKeyEvents
+{
+    if (_focusedElementInformation.shouldSynthesizeKeyEventsForEditing && self.hasHiddenContentEditable)
+        return true;
+    return false;
+}
+
 - (void)toggleBoldfaceForWebView:(id)sender
 {
@@ -3125 +3132 @@
 
     [self executeEditCommandWithCallback:@"toggleBold"];
+
+    if (self.shouldSynthesizeKeyEvents)
+        _page->generateSyntheticEditingCommand(WebKit::SyntheticEditingCommandType::ToggleBoldface);
 }
 
@@ -3133 +3143 @@
 
     [self executeEditCommandWithCallback:@"toggleItalic"];
+
+    if (self.shouldSynthesizeKeyEvents)
+        _page->generateSyntheticEditingCommand(WebKit::SyntheticEditingCommandType::ToggleItalic);
 }
 
@@ -3141 +3154 @@
 
     [self executeEditCommandWithCallback:@"toggleUnderline"];
+
+    if (self.shouldSynthesizeKeyEvents)
+        _page->generateSyntheticEditingCommand(WebKit::SyntheticEditingCommandType::ToggleUnderline);
 }
 
@@ -5225 +5241 @@
 
     _focusedElementInformation.elementType = WebKit::InputType::None;
-    _focusedElementInformation.shouldSynthesizeKeyEventsForUndoAndRedo = false;
+    _focusedElementInformation.shouldSynthesizeKeyEventsForEditing = false;
     _inputPeripheral = nil;
     _focusRequiresStrongPasswordAssistance = NO;

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

@@ -616 +616 @@
         @"U+0059", 89, false, false, false, modifiers, WallTime::now());
         break;
+    case SyntheticEditingCommandType::ToggleBoldface:
+        keyEvent = PlatformKeyboardEvent(PlatformEvent::KeyDown, "b", "b",
+#if ENABLE(KEYBOARD_KEY_ATTRIBUTE)
+        "b",
+#endif
+#if ENABLE(KEYBOARD_CODE_ATTRIBUTE)
+        "KeyB"_s,
+#endif
+        @"U+0042", 66, false, false, false, modifiers, WallTime::now());
+        break;
+    case SyntheticEditingCommandType::ToggleItalic:
+        keyEvent = PlatformKeyboardEvent(PlatformEvent::KeyDown, "i", "i",
+#if ENABLE(KEYBOARD_KEY_ATTRIBUTE)
+        "i",
+#endif
+#if ENABLE(KEYBOARD_CODE_ATTRIBUTE)
+        "KeyI"_s,
+#endif
+        @"U+0049", 73, false, false, false, modifiers, WallTime::now());
+        break;
+    case SyntheticEditingCommandType::ToggleUnderline:
+        keyEvent = PlatformKeyboardEvent(PlatformEvent::KeyDown, "u", "u",
+#if ENABLE(KEYBOARD_KEY_ATTRIBUTE)
+        "u",
+#endif
+#if ENABLE(KEYBOARD_CODE_ATTRIBUTE)
+        "KeyU"_s,
+#endif
+        @"U+0055", 85, false, false, false, modifiers, WallTime::now());
+        break;
     default:
         break;
@@ -2878 +2908 @@
             information.autocapitalizeType = focusedElement.autocapitalizeType();
             information.inputMode = focusedElement.canonicalInputMode();
-            information.shouldSynthesizeKeyEventsForUndoAndRedo = focusedElement.document().quirks().shouldEmulateUndoRedoInHiddenEditableAreas();
+            information.shouldSynthesizeKeyEventsForEditing = focusedElement.document().quirks().shouldEmulateEditingButtonsAndGesturesInHiddenEditableAreas();
         } else {
             information.isAutocorrect = true;