Changeset 252233 in webkit

Timestamp:

Nov 8, 2019 1:09:36 AM (4 years ago)

Author:

Carlos Garcia Campos

Message:

'Strikethrough' editing command reported as 'formatUnderline'
​https://bugs.webkit.org/show_bug.cgi?id=203944

Reviewed by Adrian Perez de Castro.

Source/WebCore:

Add an EditAction for strikeThrough command.

Test: fast/events/input-events-strikethrough-type.html

• editing/EditAction.cpp:

(WebCore::undoRedoLabel): Handle StrikeThrough action.

• editing/EditAction.h:
• editing/EditCommand.cpp:

(WebCore::inputTypeNameForEditingAction): Ditto.

• editing/EditorCommand.cpp:

(WebCore::executeStrikethrough): Use StrikeThrough action instead of Underline.

LayoutTests:

• fast/events/input-events-strikethrough-type-expected.txt: Added.
• fast/events/input-events-strikethrough-type.html: Added.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/fast/events/input-events-strikethrough-type-expected.txt (added)
• LayoutTests/fast/events/input-events-strikethrough-type.html (added)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/editing/EditAction.cpp (modified) (1 diff)
• Source/WebCore/editing/EditAction.h (modified) (1 diff)
• Source/WebCore/editing/EditCommand.cpp (modified) (1 diff)
• Source/WebCore/editing/EditorCommand.cpp (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2019-11-08  Carlos Garcia Campos  <cgarcia@igalia.com>
+
+        'Strikethrough' editing command reported as 'formatUnderline'
+        https://bugs.webkit.org/show_bug.cgi?id=203944
+
+        Reviewed by Adrian Perez de Castro.
+
+        * fast/events/input-events-strikethrough-type-expected.txt: Added.
+        * fast/events/input-events-strikethrough-type.html: Added.
+
 2019-11-07  Said Abou-Hallawa  <sabouhallawa@apple.com>
 

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2019-11-08  Carlos Garcia Campos  <cgarcia@igalia.com>
+
+        'Strikethrough' editing command reported as 'formatUnderline'
+        https://bugs.webkit.org/show_bug.cgi?id=203944
+
+        Reviewed by Adrian Perez de Castro.
+
+        Add an EditAction for strikeThrough command.
+
+        Test: fast/events/input-events-strikethrough-type.html
+
+        * editing/EditAction.cpp:
+        (WebCore::undoRedoLabel): Handle StrikeThrough action.
+        * editing/EditAction.h:
+        * editing/EditCommand.cpp:
+        (WebCore::inputTypeNameForEditingAction): Ditto.
+        * editing/EditorCommand.cpp:
+        (WebCore::executeStrikethrough): Use StrikeThrough action instead of Underline.
+
 2019-11-07  Said Abou-Hallawa  <sabouhallawa@apple.com>
 

trunk/Source/WebCore/editing/EditAction.cpp

@@ -85 +85 @@
     case EditAction::Underline:
         return WEB_UI_STRING_KEY("Underline", "Underline (Undo action name)", "Undo action name");
+    case EditAction::StrikeThrough:
+        return WEB_UI_STRING_KEY("StrikeThrough", "StrikeThrough (Undo action name)", "Undo action name");
     case EditAction::Outline:
         return WEB_UI_STRING_KEY("Outline", "Outline (Undo action name)", "Undo action name");

trunk/Source/WebCore/editing/EditAction.h

@@ -60 +60 @@
     Superscript,
     Underline,
+    StrikeThrough,
     Outline,
     Unscript,

trunk/Source/WebCore/editing/EditCommand.cpp

@@ -57 +57 @@
     case EditAction::Underline:
         return "formatUnderline"_s;
+    case EditAction::StrikeThrough:
+        return "formatStrikeThrough"_s;
     case EditAction::SetColor:
         return "formatFontColor"_s;

trunk/Source/WebCore/editing/EditorCommand.cpp

@@ -1083 +1083 @@
     Ref<EditingStyle> style = EditingStyle::create();
     style->setStrikeThroughChange(textDecorationChangeForToggling(frame.editor(), CSSPropertyWebkitTextDecorationsInEffect, "line-through"_s));
-    // FIXME: Needs a new EditAction!
-    return applyCommandToFrame(frame, source, EditAction::Underline, WTFMove(style));
+    return applyCommandToFrame(frame, source, EditAction::StrikeThrough, WTFMove(style));
 }