Attachment 349089 Details for Bug 189383 – Patch

[patch] Patch

bug-189383-20180906163637.patch (text/plain), 146.04 KB, created by Wenson Hsieh on 2018-09-06 16:36:38 PDT

(hide)

Description:

Filename:

MIME Type:

Creator: Wenson Hsieh

Created: 2018-09-06 16:36:38 PDT

Size: 146.04 KB

patch

obsolete

>Subversion Revision: 235749
>diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog
>index d370a89afe07ae683f5378a77edf9f6024594c2c..f8babaa8a4b39b776c77ee85b6e28acbe0b75482 100644
>--- a/Source/WebCore/ChangeLog
>+++ b/Source/WebCore/ChangeLog
>@@ -1,3 +1,141 @@
>+2018-09-06  Wenson Hsieh  <wenson_hsieh@apple.com>
>+
>+        Refactor WebCore::EditAction to be an 8-bit enum class
>+        https://bugs.webkit.org/show_bug.cgi?id=189383
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        Currently, EditAction.h defines an EditAction as an enum. This patch changes EditAction to instead be an 8-bit-
>+        wide enum class, and renames all EditAction values from EditAction(*) to EditAction::(*).
>+
>+        No change in behavior.
>+
>+        * editing/ApplyStyleCommand.h:
>+        (WebCore::ApplyStyleCommand::create):
>+        * editing/CompositeEditCommand.cpp:
>+        (WebCore::CompositeEditCommand::apply):
>+        (WebCore::deleteSelectionEditingActionForEditingAction):
>+        * editing/CompositeEditCommand.h:
>+        (WebCore::EditCommandComposition::wasCreateLinkCommand const):
>+        * editing/CreateLinkCommand.h:
>+        * editing/DeleteFromTextNodeCommand.h:
>+        (WebCore::DeleteFromTextNodeCommand::create):
>+        * editing/DeleteSelectionCommand.h:
>+        (WebCore::DeleteSelectionCommand::create):
>+        * editing/DictationCommand.cpp:
>+        (WebCore::DictationCommand::insertTextRunWithoutNewlines):
>+        (WebCore::DictationCommand::insertParagraphSeparator):
>+        * editing/EditAction.h:
>+        (): Deleted.
>+        * editing/EditCommand.cpp:
>+        (WebCore::inputTypeNameForEditingAction):
>+        * editing/EditCommand.h:
>+        * editing/Editor.cpp:
>+        (WebCore::inputEventDataForEditingStyleAndAction):
>+        (WebCore::ClearTextCommand::editingAction const):
>+        (WebCore::Editor::handleTextEvent):
>+        (WebCore::Editor::replaceSelectionWithFragment):
>+        (WebCore::Editor::performCutOrCopy):
>+        (WebCore::Editor::setBaseWritingDirection):
>+        (WebCore::Editor::markMisspellingsAfterTypingToWord):
>+        (WebCore::Editor::changeBackToReplacedString):
>+        (WebCore::Editor::transpose):
>+        * editing/Editor.h:
>+        * editing/EditorCommand.cpp:
>+        (WebCore::applyCommandToFrame):
>+        (WebCore::executeInsertFragment):
>+        (WebCore::executeBackColor):
>+        (WebCore::executeFontName):
>+        (WebCore::executeFontSize):
>+        (WebCore::executeFontSizeDelta):
>+        (WebCore::executeForeColor):
>+        (WebCore::executeJustifyCenter):
>+        (WebCore::executeJustifyFull):
>+        (WebCore::executeJustifyLeft):
>+        (WebCore::executeJustifyRight):
>+        (WebCore::executeMakeTextWritingDirectionLeftToRight):
>+        (WebCore::executeMakeTextWritingDirectionNatural):
>+        (WebCore::executeMakeTextWritingDirectionRightToLeft):
>+        (WebCore::executeStrikethrough):
>+        (WebCore::executeSubscript):
>+        (WebCore::executeSuperscript):
>+        (WebCore::executeToggleBold):
>+        (WebCore::executeToggleItalic):
>+        (WebCore::executeUnderline):
>+        (WebCore::executeUnscript):
>+        * editing/FormatBlockCommand.h:
>+        * editing/IndentOutdentCommand.h:
>+        * editing/InsertIntoTextNodeCommand.h:
>+        (WebCore::InsertIntoTextNodeCommand::create):
>+        * editing/InsertListCommand.cpp:
>+        (WebCore::InsertListCommand::editingAction const):
>+        * editing/InsertNodeBeforeCommand.h:
>+        (WebCore::InsertNodeBeforeCommand::create):
>+        * editing/InsertParagraphSeparatorCommand.h:
>+        (WebCore::InsertParagraphSeparatorCommand::create):
>+        * editing/InsertTextCommand.h:
>+        (WebCore::InsertTextCommand::create):
>+        (WebCore::InsertTextCommand::createWithMarkerSupplier):
>+        * editing/MoveSelectionCommand.cpp:
>+        (WebCore::MoveSelectionCommand::doApply):
>+        (WebCore::MoveSelectionCommand::editingAction const):
>+        * editing/RemoveFormatCommand.h:
>+        * editing/RemoveNodeCommand.h:
>+        (WebCore::RemoveNodeCommand::create):
>+        * editing/ReplaceRangeWithTextCommand.cpp:
>+        (WebCore::ReplaceRangeWithTextCommand::ReplaceRangeWithTextCommand):
>+        (WebCore::ReplaceRangeWithTextCommand::doApply):
>+        * editing/ReplaceSelectionCommand.cpp:
>+        (WebCore::ReplaceSelectionCommand::completeHTMLReplacement):
>+        (WebCore::ReplaceSelectionCommand::performTrivialReplace):
>+        * editing/ReplaceSelectionCommand.h:
>+        (WebCore::ReplaceSelectionCommand::create):
>+        * editing/SpellingCorrectionCommand.cpp:
>+        (WebCore::SpellingCorrectionCommand::SpellingCorrectionCommand):
>+        (WebCore::SpellingCorrectionCommand::doApply):
>+        * editing/TextInsertionBaseCommand.h:
>+        * editing/TypingCommand.cpp:
>+        (WebCore::editActionForTypingCommand):
>+        (WebCore::editActionIsDeleteByTyping):
>+        (WebCore::TypingCommand::isBeforeInputEventCancelable const):
>+        (WebCore::TypingCommand::inputEventData const):
>+        (WebCore::TypingCommand::inputEventDataTransfer const):
>+        (WebCore::TypingCommand::insertTextRunWithoutNewlines):
>+        (WebCore::TypingCommand::insertParagraphSeparator):
>+        * editing/UnlinkCommand.h:
>+        * editing/ios/DictationCommandIOS.cpp:
>+        (WebCore::DictationCommandIOS::DictationCommandIOS):
>+        * editing/ios/EditorIOS.mm:
>+        (WebCore::Editor::removeUnchangeableStyles):
>+        * page/DragController.cpp:
>+        (WebCore::DragController::concludeEditDrag):
>+
>+2018-09-06  Wenson Hsieh  <wenson_hsieh@apple.com>
>+
>+        [macOS] [WK2] Support changing attributes for selected text (text shadow, underline, strike-through)
>+        https://bugs.webkit.org/show_bug.cgi?id=189356
>+        <rdar://problem/44185674>
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        Add support for encoding and decoding FontAttributeChanges, so that we can send FontAttributeChanges over IPC in
>+        WebKit2. Also change m_verticalAlign to a new VerticalAlignChange enum type, so that it's no longer tied to the
>+        CSS property values of "vertical-align", and can be encoded/decoded separately from VerticalAlign in
>+        RenderStyleConstants.
>+
>+        Test: FontManagerTests.ChangeAttributesWithFontEffectsBox
>+
>+        * editing/FontAttributeChanges.cpp:
>+        (WebCore::FontAttributeChanges::createEditingStyle const):
>+        * editing/FontAttributeChanges.h:
>+        (WebCore::FontAttributeChanges::setVerticalAlign):
>+        (WebCore::FontShadow::encode const):
>+        (WebCore::FontShadow::decode):
>+        (WebCore::FontAttributeChanges::encode const):
>+        (WebCore::FontAttributeChanges::decode):
>+        * platform/mac/WebCoreNSFontManagerExtras.mm:
>+        (WebCore::computedFontAttributeChanges):
>+
> 2018-09-06  Frederic Wang  <fwang@igalia.com>
> 
>         Group options of scrollRectToVisible into a struct
>diff --git a/Source/WebKit/ChangeLog b/Source/WebKit/ChangeLog
>index ff354b0a08d59fa21959b0dfdca882a6afb0414e..67bcfcfe565dba4c4c4c901164e7f43be6c52d14 100644
>--- a/Source/WebKit/ChangeLog
>+++ b/Source/WebKit/ChangeLog
>@@ -1,3 +1,48 @@
>+2018-09-06  Wenson Hsieh  <wenson_hsieh@apple.com>
>+
>+        Refactor WebCore::EditAction to be an 8-bit enum class
>+        https://bugs.webkit.org/show_bug.cgi?id=189383
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        * UIProcess/WebEditCommandProxy.cpp:
>+        (WebKit::WebEditCommandProxy::nameForEditAction):
>+        * WebProcess/WebPage/mac/WebPageMac.mm:
>+        (WebKit::WebPage::changeFontAttributes):
>+        (WebKit::WebPage::changeFont):
>+
>+2018-09-06  Wenson Hsieh  <wenson_hsieh@apple.com>
>+
>+        [macOS] [WK2] Support changing attributes for selected text (text shadow, underline, strike-through)
>+        https://bugs.webkit.org/show_bug.cgi?id=189356
>+        <rdar://problem/44185674>
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        Implement -[WKWebView changeAttributes:], so that WKWebView can carry out more types of font style changes via
>+        NSFontPanel. This patch makes it possible to (1) change text shadow, (2) add or remove strike-through, and (3)
>+        add or remove underlines from selected text using the font panel.
>+
>+        This builds on the mechanisms introduced in r235748 to compute font attribute changes in the UI process and
>+        propagate this information to the web process, where we're able to create and apply an EditingStyle to the
>+        current selection.
>+
>+        * UIProcess/API/Cocoa/WKWebView.mm:
>+        (-[WKWebView changeAttributes:]):
>+        * UIProcess/Cocoa/WebViewImpl.h:
>+        * UIProcess/Cocoa/WebViewImpl.mm:
>+        (WebKit::WebViewImpl::changeFontAttributesFromSender):
>+        * UIProcess/WebPageProxy.h:
>+        * UIProcess/mac/WebPageProxyMac.mm:
>+        (WebKit::WebPageProxy::changeFontAttributes):
>+        * WebProcess/WebPage/WebPage.h:
>+        * WebProcess/WebPage/WebPage.messages.in:
>+
>+        Add boilerplate IPC support.
>+
>+        * WebProcess/WebPage/mac/WebPageMac.mm:
>+        (WebKit::WebPage::changeFontAttributes):
>+
> 2018-09-06  Wenson Hsieh  <wenson_hsieh@apple.com>
> 
>         [macOS] Cannot change font size at selection until font panel is shown
>diff --git a/Source/WebKitLegacy/mac/ChangeLog b/Source/WebKitLegacy/mac/ChangeLog
>index c6e27ea0e32d7981d61723b4690e689b0ac05818..71fc2c416937f3e394841dab32899c43c283e6be 100644
>--- a/Source/WebKitLegacy/mac/ChangeLog
>+++ b/Source/WebKitLegacy/mac/ChangeLog
>@@ -1,3 +1,21 @@
>+2018-09-06  Wenson Hsieh  <wenson_hsieh@apple.com>
>+
>+        Refactor WebCore::EditAction to be an 8-bit enum class
>+        https://bugs.webkit.org/show_bug.cgi?id=189383
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        * WebCoreSupport/WebEditorClient.mm:
>+        (undoNameForEditAction):
>+        * WebView/WebHTMLView.mm:
>+        (-[WebHTMLView pasteFont:]):
>+        (-[WebHTMLView changeFont:]):
>+        (-[WebHTMLView changeAttributes:]):
>+        (-[WebHTMLView _undoActionFromColorPanelWithSelector:]):
>+        (-[WebHTMLView changeColor:]):
>+        * WebView/WebView.mm:
>+        (-[WebView setTypingStyle:]):
>+
> 2018-09-06  Frederic Wang  <fwang@igalia.com>
> 
>         Group options of scrollRectToVisible into a struct
>diff --git a/Source/WebKitLegacy/win/ChangeLog b/Source/WebKitLegacy/win/ChangeLog
>index eebab742551de397a38cc42409c398295af6aa0f..8af81ead36c90e2f3aa2b182ccdb61e6914f33c3 100644
>--- a/Source/WebKitLegacy/win/ChangeLog
>+++ b/Source/WebKitLegacy/win/ChangeLog
>@@ -1,3 +1,13 @@
>+2018-09-06  Wenson Hsieh  <wenson_hsieh@apple.com>
>+
>+        Refactor WebCore::EditAction to be an 8-bit enum class
>+        https://bugs.webkit.org/show_bug.cgi?id=189383
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        * WebCoreSupport/WebEditorClient.cpp:
>+        (undoNameForEditAction):
>+
> 2018-09-04  Frederic Wang  <fwang@igalia.com>
> 
>         Add basic support for ScrollIntoViewOptions
>diff --git a/Source/WebCore/editing/ApplyStyleCommand.h b/Source/WebCore/editing/ApplyStyleCommand.h
>index 409fccf0d7d224d1c774d7a8305c43df8d7a88d5..869455142142bb389a7d6af89a62874c424b8bc7 100644
>--- a/Source/WebCore/editing/ApplyStyleCommand.h
>+++ b/Source/WebCore/editing/ApplyStyleCommand.h
>@@ -47,19 +47,19 @@ public:
>     enum EAddStyledElement { AddStyledElement, DoNotAddStyledElement };
>     typedef bool (*IsInlineElementToRemoveFunction)(const Element*);
> 
>-    static Ref<ApplyStyleCommand> create(Document& document, const EditingStyle* style, EditAction action = EditActionChangeAttributes, EPropertyLevel level = PropertyDefault)
>+    static Ref<ApplyStyleCommand> create(Document& document, const EditingStyle* style, EditAction action = EditAction::ChangeAttributes, EPropertyLevel level = PropertyDefault)
>     {
>         return adoptRef(*new ApplyStyleCommand(document, style, action, level));
>     }
>-    static Ref<ApplyStyleCommand> create(Document& document, const EditingStyle* style, const Position& start, const Position& end, EditAction action = EditActionChangeAttributes, EPropertyLevel level = PropertyDefault)
>+    static Ref<ApplyStyleCommand> create(Document& document, const EditingStyle* style, const Position& start, const Position& end, EditAction action = EditAction::ChangeAttributes, EPropertyLevel level = PropertyDefault)
>     {
>         return adoptRef(*new ApplyStyleCommand(document, style, start, end, action, level));
>     }
>-    static Ref<ApplyStyleCommand> create(Ref<Element>&& element, bool removeOnly = false, EditAction action = EditActionChangeAttributes)
>+    static Ref<ApplyStyleCommand> create(Ref<Element>&& element, bool removeOnly = false, EditAction action = EditAction::ChangeAttributes)
>     {
>         return adoptRef(*new ApplyStyleCommand(WTFMove(element), removeOnly, action));
>     }
>-    static Ref<ApplyStyleCommand> create(Document& document, const EditingStyle* style, IsInlineElementToRemoveFunction isInlineElementToRemoveFunction, EditAction action = EditActionChangeAttributes)
>+    static Ref<ApplyStyleCommand> create(Document& document, const EditingStyle* style, IsInlineElementToRemoveFunction isInlineElementToRemoveFunction, EditAction action = EditAction::ChangeAttributes)
>     {
>         return adoptRef(*new ApplyStyleCommand(document, style, isInlineElementToRemoveFunction, action));
>     }
>diff --git a/Source/WebCore/editing/CompositeEditCommand.cpp b/Source/WebCore/editing/CompositeEditCommand.cpp
>index b45227b7cb26a76bc399fc20b19ecb56c64e5bf5..e5f339253ee7daaa869e2f6abc7b2e526d24e68d 100644
>--- a/Source/WebCore/editing/CompositeEditCommand.cpp
>+++ b/Source/WebCore/editing/CompositeEditCommand.cpp
>@@ -321,30 +321,30 @@ void CompositeEditCommand::apply()
> {
>     if (!endingSelection().isContentRichlyEditable()) {
>         switch (editingAction()) {
>-        case EditActionTypingDeleteSelection:
>-        case EditActionTypingDeleteBackward:
>-        case EditActionTypingDeleteForward:
>-        case EditActionTypingDeleteWordBackward:
>-        case EditActionTypingDeleteWordForward:
>-        case EditActionTypingDeleteLineBackward:
>-        case EditActionTypingDeleteLineForward:
>-        case EditActionTypingDeletePendingComposition:
>-        case EditActionTypingDeleteFinalComposition:
>-        case EditActionTypingInsertText:
>-        case EditActionTypingInsertLineBreak:
>-        case EditActionTypingInsertParagraph:
>-        case EditActionTypingInsertPendingComposition:
>-        case EditActionTypingInsertFinalComposition:
>-        case EditActionPaste:
>-        case EditActionDeleteByDrag:
>-        case EditActionSetWritingDirection:
>-        case EditActionCut:
>-        case EditActionUnspecified:
>-        case EditActionInsert:
>-        case EditActionInsertReplacement:
>-        case EditActionInsertFromDrop:
>-        case EditActionDelete:
>-        case EditActionDictation:
>+        case EditAction::TypingDeleteSelection:
>+        case EditAction::TypingDeleteBackward:
>+        case EditAction::TypingDeleteForward:
>+        case EditAction::TypingDeleteWordBackward:
>+        case EditAction::TypingDeleteWordForward:
>+        case EditAction::TypingDeleteLineBackward:
>+        case EditAction::TypingDeleteLineForward:
>+        case EditAction::TypingDeletePendingComposition:
>+        case EditAction::TypingDeleteFinalComposition:
>+        case EditAction::TypingInsertText:
>+        case EditAction::TypingInsertLineBreak:
>+        case EditAction::TypingInsertParagraph:
>+        case EditAction::TypingInsertPendingComposition:
>+        case EditAction::TypingInsertFinalComposition:
>+        case EditAction::Paste:
>+        case EditAction::DeleteByDrag:
>+        case EditAction::SetWritingDirection:
>+        case EditAction::Cut:
>+        case EditAction::Unspecified:
>+        case EditAction::Insert:
>+        case EditAction::InsertReplacement:
>+        case EditAction::InsertFromDrop:
>+        case EditAction::Delete:
>+        case EditAction::Dictation:
>             break;
>         default:
>             ASSERT_NOT_REACHED();
>@@ -819,10 +819,10 @@ void CompositeEditCommand::insertNodeAtTabSpanPosition(Ref<Node>&& node, const P
> static EditAction deleteSelectionEditingActionForEditingAction(EditAction editingAction)
> {
>     switch (editingAction) {
>-    case EditActionCut:
>-        return EditActionCut;
>+    case EditAction::Cut:
>+        return EditAction::Cut;
>     default:
>-        return EditActionDelete;
>+        return EditAction::Delete;
>     }
> }
> 
>diff --git a/Source/WebCore/editing/CompositeEditCommand.h b/Source/WebCore/editing/CompositeEditCommand.h
>index d467bf158973b81168bbdfc99341438f3ee04b2c..4a424a1924fcaa9c664c8c75e5b79feac1f64d0a 100644
>--- a/Source/WebCore/editing/CompositeEditCommand.h
>+++ b/Source/WebCore/editing/CompositeEditCommand.h
>@@ -71,7 +71,7 @@ public:
>     void reapply() override;
>     EditAction editingAction() const override { return m_editAction; }
>     void append(SimpleEditCommand*);
>-    bool wasCreateLinkCommand() const { return m_editAction == EditActionCreateLink; }
>+    bool wasCreateLinkCommand() const { return m_editAction == EditAction::CreateLink; }
> 
>     const VisibleSelection& startingSelection() const { return m_startingSelection; }
>     const VisibleSelection& endingSelection() const { return m_endingSelection; }
>@@ -122,7 +122,7 @@ public:
>     virtual RefPtr<DataTransfer> inputEventDataTransfer() const;
> 
> protected:
>-    explicit CompositeEditCommand(Document&, EditAction = EditActionUnspecified);
>+    explicit CompositeEditCommand(Document&, EditAction = EditAction::Unspecified);
> 
>     // If willApplyCommand returns false, we won't proceed with applying the command.
>     virtual bool willApplyCommand();
>@@ -136,8 +136,8 @@ protected:
>     void appendNode(Ref<Node>&&, Ref<ContainerNode>&& parent);
>     void applyCommandToComposite(Ref<EditCommand>&&);
>     void applyCommandToComposite(Ref<CompositeEditCommand>&&, const VisibleSelection&);
>-    void applyStyle(const EditingStyle*, EditAction = EditActionChangeAttributes);
>-    void applyStyle(const EditingStyle*, const Position& start, const Position& end, EditAction = EditActionChangeAttributes);
>+    void applyStyle(const EditingStyle*, EditAction = EditAction::ChangeAttributes);
>+    void applyStyle(const EditingStyle*, const Position& start, const Position& end, EditAction = EditAction::ChangeAttributes);
>     void applyStyledElement(Ref<Element>&&);
>     void removeStyledElement(Ref<Element>&&);
>     void deleteSelection(bool smartDelete = false, bool mergeBlocksAfterDelete = true, bool replace = false, bool expandForSpecialElements = true, bool sanitizeMarkup = true);
>diff --git a/Source/WebCore/editing/CreateLinkCommand.h b/Source/WebCore/editing/CreateLinkCommand.h
>index 39b98d0dcf2bd5ecc6103b18edd02ad0b2df8751..b17f2317eb5523d7ba9658b11274d09a311bab91 100644
>--- a/Source/WebCore/editing/CreateLinkCommand.h
>+++ b/Source/WebCore/editing/CreateLinkCommand.h
>@@ -42,7 +42,7 @@ private:
>     CreateLinkCommand(Document&, const String& linkURL);
> 
>     void doApply() override;
>-    EditAction editingAction() const override { return EditActionCreateLink; }
>+    EditAction editingAction() const override { return EditAction::CreateLink; }
> 
>     String m_url;
> };
>diff --git a/Source/WebCore/editing/DeleteFromTextNodeCommand.h b/Source/WebCore/editing/DeleteFromTextNodeCommand.h
>index b81c62d37ee5b8ee1d1e99530c4111c1f7ee9fa8..da1df6b102902b22b30178c620b390dfdc602420 100644
>--- a/Source/WebCore/editing/DeleteFromTextNodeCommand.h
>+++ b/Source/WebCore/editing/DeleteFromTextNodeCommand.h
>@@ -33,7 +33,7 @@ class Text;
> 
> class DeleteFromTextNodeCommand : public SimpleEditCommand {
> public:
>-    static Ref<DeleteFromTextNodeCommand> create(Ref<Text>&& node, unsigned offset, unsigned count, EditAction editingAction = EditActionDelete)
>+    static Ref<DeleteFromTextNodeCommand> create(Ref<Text>&& node, unsigned offset, unsigned count, EditAction editingAction = EditAction::Delete)
>     {
>         return adoptRef(*new DeleteFromTextNodeCommand(WTFMove(node), offset, count, editingAction));
>     }
>diff --git a/Source/WebCore/editing/DeleteSelectionCommand.h b/Source/WebCore/editing/DeleteSelectionCommand.h
>index 82cfe2a9280969d8e42b0ac901f19af848ad9344..233688b67c5f12d862c648d1a40ed28e1590fce9 100644
>--- a/Source/WebCore/editing/DeleteSelectionCommand.h
>+++ b/Source/WebCore/editing/DeleteSelectionCommand.h
>@@ -33,17 +33,17 @@ class EditingStyle;
> 
> class DeleteSelectionCommand : public CompositeEditCommand { 
> public:
>-    static Ref<DeleteSelectionCommand> create(Document& document, bool smartDelete = false, bool mergeBlocksAfterDelete = true, bool replace = false, bool expandForSpecialElements = false, bool sanitizeMarkup = true, EditAction editingAction = EditActionDelete)
>+    static Ref<DeleteSelectionCommand> create(Document& document, bool smartDelete = false, bool mergeBlocksAfterDelete = true, bool replace = false, bool expandForSpecialElements = false, bool sanitizeMarkup = true, EditAction editingAction = EditAction::Delete)
>     {
>         return adoptRef(*new DeleteSelectionCommand(document, smartDelete, mergeBlocksAfterDelete, replace, expandForSpecialElements, sanitizeMarkup, editingAction));
>     }
>-    static Ref<DeleteSelectionCommand> create(const VisibleSelection& selection, bool smartDelete = false, bool mergeBlocksAfterDelete = true, bool replace = false, bool expandForSpecialElements = false, bool sanitizeMarkup = true, EditAction editingAction = EditActionDelete)
>+    static Ref<DeleteSelectionCommand> create(const VisibleSelection& selection, bool smartDelete = false, bool mergeBlocksAfterDelete = true, bool replace = false, bool expandForSpecialElements = false, bool sanitizeMarkup = true, EditAction editingAction = EditAction::Delete)
>     {
>         return adoptRef(*new DeleteSelectionCommand(selection, smartDelete, mergeBlocksAfterDelete, replace, expandForSpecialElements, sanitizeMarkup, editingAction));
>     }
> 
> protected:
>-    DeleteSelectionCommand(Document&, bool smartDelete, bool mergeBlocksAfterDelete, bool replace, bool expandForSpecialElements, bool santizeMarkup, EditAction = EditActionDelete);
>+    DeleteSelectionCommand(Document&, bool smartDelete, bool mergeBlocksAfterDelete, bool replace, bool expandForSpecialElements, bool santizeMarkup, EditAction = EditAction::Delete);
> 
> private:
>     DeleteSelectionCommand(const VisibleSelection&, bool smartDelete, bool mergeBlocksAfterDelete, bool replace, bool expandForSpecialElements, bool sanitizeMarkup, EditAction);
>diff --git a/Source/WebCore/editing/DictationCommand.cpp b/Source/WebCore/editing/DictationCommand.cpp
>index 282bdc9e315b72c25ad5be82c6bf0714d5c17ab9..975d41b45a9b76c622b2db9eec6ab46dc2649f76 100644
>--- a/Source/WebCore/editing/DictationCommand.cpp
>+++ b/Source/WebCore/editing/DictationCommand.cpp
>@@ -117,7 +117,7 @@ void DictationCommand::insertTextRunWithoutNewlines(size_t lineStart, size_t lin
> {
>     Vector<DictationAlternative> alternativesInLine;
>     collectDictationAlternativesInRange(lineStart, lineLength, alternativesInLine);
>-    auto command = InsertTextCommand::createWithMarkerSupplier(document(), m_textToInsert.substring(lineStart, lineLength), DictationMarkerSupplier::create(alternativesInLine), EditActionDictation);
>+    auto command = InsertTextCommand::createWithMarkerSupplier(document(), m_textToInsert.substring(lineStart, lineLength), DictationMarkerSupplier::create(alternativesInLine), EditAction::Dictation);
>     applyCommandToComposite(WTFMove(command), endingSelection());
> }
> 
>@@ -126,7 +126,7 @@ void DictationCommand::insertParagraphSeparator()
>     if (!canAppendNewLineFeedToSelection(endingSelection()))
>         return;
> 
>-    applyCommandToComposite(InsertParagraphSeparatorCommand::create(document(), false, false, EditActionDictation));
>+    applyCommandToComposite(InsertParagraphSeparatorCommand::create(document(), false, false, EditAction::Dictation));
> }
> 
> void DictationCommand::collectDictationAlternativesInRange(size_t rangeStart, size_t rangeLength, Vector<DictationAlternative>& alternatives)
>diff --git a/Source/WebCore/editing/EditAction.h b/Source/WebCore/editing/EditAction.h
>index 0aba4a5aad20e0a449d5f3edc0b510f7e8868618..e8122884ea0a7f01981794dbcdee979b9f5015e6 100644
>--- a/Source/WebCore/editing/EditAction.h
>+++ b/Source/WebCore/editing/EditAction.h
>@@ -1,5 +1,5 @@
> /*
>- * Copyright (C) 2004 Apple Inc.  All rights reserved.
>+ * Copyright (C) 2004-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
>@@ -26,64 +26,66 @@
> #pragma once
> 
> namespace WebCore {
>-    typedef enum {
>-        EditActionUnspecified,
>-        EditActionInsert,
>-        EditActionInsertReplacement,
>-        EditActionInsertFromDrop,
>-        EditActionSetColor,
>-        EditActionSetBackgroundColor,
>-        EditActionTurnOffKerning,
>-        EditActionTightenKerning,
>-        EditActionLoosenKerning,
>-        EditActionUseStandardKerning,
>-        EditActionTurnOffLigatures,
>-        EditActionUseStandardLigatures,
>-        EditActionUseAllLigatures,
>-        EditActionRaiseBaseline,
>-        EditActionLowerBaseline,
>-        EditActionSetTraditionalCharacterShape,
>-        EditActionSetFont,
>-        EditActionChangeAttributes,
>-        EditActionAlignLeft,
>-        EditActionAlignRight,
>-        EditActionCenter,
>-        EditActionJustify,
>-        EditActionSetWritingDirection,
>-        EditActionSubscript,
>-        EditActionSuperscript,
>-        EditActionUnderline,
>-        EditActionOutline,
>-        EditActionUnscript,
>-        EditActionDeleteByDrag,
>-        EditActionCut,
>-        EditActionBold,
>-        EditActionItalics,
>-        EditActionDelete,
>-        EditActionDictation,
>-        EditActionPaste,
>-        EditActionPasteFont,
>-        EditActionPasteRuler,
>-        EditActionTypingDeleteSelection,
>-        EditActionTypingDeleteBackward,
>-        EditActionTypingDeleteForward,
>-        EditActionTypingDeleteWordBackward,
>-        EditActionTypingDeleteWordForward,
>-        EditActionTypingDeleteLineBackward,
>-        EditActionTypingDeleteLineForward,
>-        EditActionTypingDeletePendingComposition,
>-        EditActionTypingDeleteFinalComposition,
>-        EditActionTypingInsertText,
>-        EditActionTypingInsertLineBreak,
>-        EditActionTypingInsertParagraph,
>-        EditActionTypingInsertPendingComposition,
>-        EditActionTypingInsertFinalComposition,
>-        EditActionCreateLink,
>-        EditActionUnlink,
>-        EditActionFormatBlock,
>-        EditActionInsertOrderedList,
>-        EditActionInsertUnorderedList,
>-        EditActionIndent,
>-        EditActionOutdent
>-    } EditAction;    
>+
>+enum class EditAction : uint8_t {
>+    Unspecified,
>+    Insert,
>+    InsertReplacement,
>+    InsertFromDrop,
>+    SetColor,
>+    SetBackgroundColor,
>+    TurnOffKerning,
>+    TightenKerning,
>+    LoosenKerning,
>+    UseStandardKerning,
>+    TurnOffLigatures,
>+    UseStandardLigatures,
>+    UseAllLigatures,
>+    RaiseBaseline,
>+    LowerBaseline,
>+    SetTraditionalCharacterShape,
>+    SetFont,
>+    ChangeAttributes,
>+    AlignLeft,
>+    AlignRight,
>+    Center,
>+    Justify,
>+    SetWritingDirection,
>+    Subscript,
>+    Superscript,
>+    Underline,
>+    Outline,
>+    Unscript,
>+    DeleteByDrag,
>+    Cut,
>+    Bold,
>+    Italics,
>+    Delete,
>+    Dictation,
>+    Paste,
>+    PasteFont,
>+    PasteRuler,
>+    TypingDeleteSelection,
>+    TypingDeleteBackward,
>+    TypingDeleteForward,
>+    TypingDeleteWordBackward,
>+    TypingDeleteWordForward,
>+    TypingDeleteLineBackward,
>+    TypingDeleteLineForward,
>+    TypingDeletePendingComposition,
>+    TypingDeleteFinalComposition,
>+    TypingInsertText,
>+    TypingInsertLineBreak,
>+    TypingInsertParagraph,
>+    TypingInsertPendingComposition,
>+    TypingInsertFinalComposition,
>+    CreateLink,
>+    Unlink,
>+    FormatBlock,
>+    InsertOrderedList,
>+    InsertUnorderedList,
>+    Indent,
>+    Outdent
>+};
>+
> } // namespace WebCore
>diff --git a/Source/WebCore/editing/EditCommand.cpp b/Source/WebCore/editing/EditCommand.cpp
>index db1f40845096b1a92444956cbf6bddf811b30b16..34c79c9a7d99a58ab030e93833b845cba8132e40 100644
>--- a/Source/WebCore/editing/EditCommand.cpp
>+++ b/Source/WebCore/editing/EditCommand.cpp
>@@ -42,75 +42,75 @@ namespace WebCore {
> String inputTypeNameForEditingAction(EditAction action)
> {
>     switch (action) {
>-    case EditActionJustify:
>+    case EditAction::Justify:
>         return "formatJustifyFull"_s;
>-    case EditActionAlignLeft:
>+    case EditAction::AlignLeft:
>         return "formatJustifyLeft"_s;
>-    case EditActionAlignRight:
>+    case EditAction::AlignRight:
>         return "formatJustifyRight"_s;
>-    case EditActionCenter:
>+    case EditAction::Center:
>         return "formatJustifyCenter"_s;
>-    case EditActionSubscript:
>+    case EditAction::Subscript:
>         return "formatSubscript"_s;
>-    case EditActionSuperscript:
>+    case EditAction::Superscript:
>         return "formatSuperscript"_s;
>-    case EditActionUnderline:
>+    case EditAction::Underline:
>         return "formatUnderline"_s;
>-    case EditActionSetColor:
>+    case EditAction::SetColor:
>         return "formatFontColor"_s;
>-    case EditActionDeleteByDrag:
>+    case EditAction::DeleteByDrag:
>         return "deleteByDrag"_s;
>-    case EditActionCut:
>+    case EditAction::Cut:
>         return "deleteByCut"_s;
>-    case EditActionBold:
>+    case EditAction::Bold:
>         return "formatBold"_s;
>-    case EditActionItalics:
>+    case EditAction::Italics:
>         return "formatItalic"_s;
>-    case EditActionPaste:
>+    case EditAction::Paste:
>         return "insertFromPaste"_s;
>-    case EditActionDelete:
>-    case EditActionTypingDeleteSelection:
>+    case EditAction::Delete:
>+    case EditAction::TypingDeleteSelection:
>         return "deleteContent"_s;
>-    case EditActionTypingDeleteBackward:
>+    case EditAction::TypingDeleteBackward:
>         return "deleteContentBackward"_s;
>-    case EditActionTypingDeleteForward:
>+    case EditAction::TypingDeleteForward:
>         return "deleteContentForward"_s;
>-    case EditActionTypingDeleteWordBackward:
>+    case EditAction::TypingDeleteWordBackward:
>         return "deleteWordBackward"_s;
>-    case EditActionTypingDeleteWordForward:
>+    case EditAction::TypingDeleteWordForward:
>         return "deleteWordForward"_s;
>-    case EditActionTypingDeleteLineBackward:
>+    case EditAction::TypingDeleteLineBackward:
>         return "deleteHardLineBackward"_s;
>-    case EditActionTypingDeleteLineForward:
>+    case EditAction::TypingDeleteLineForward:
>         return "deleteHardLineForward"_s;
>-    case EditActionTypingDeletePendingComposition:
>+    case EditAction::TypingDeletePendingComposition:
>         return "deleteCompositionText"_s;
>-    case EditActionTypingDeleteFinalComposition:
>+    case EditAction::TypingDeleteFinalComposition:
>         return "deleteByComposition"_s;
>-    case EditActionInsert:
>-    case EditActionTypingInsertText:
>+    case EditAction::Insert:
>+    case EditAction::TypingInsertText:
>         return "insertText"_s;
>-    case EditActionInsertReplacement:
>+    case EditAction::InsertReplacement:
>         return "insertReplacementText"_s;
>-    case EditActionInsertFromDrop:
>+    case EditAction::InsertFromDrop:
>         return "insertFromDrop"_s;
>-    case EditActionTypingInsertLineBreak:
>+    case EditAction::TypingInsertLineBreak:
>         return "insertLineBreak"_s;
>-    case EditActionTypingInsertParagraph:
>+    case EditAction::TypingInsertParagraph:
>         return "insertParagraph"_s;
>-    case EditActionInsertOrderedList:
>+    case EditAction::InsertOrderedList:
>         return "insertOrderedList"_s;
>-    case EditActionInsertUnorderedList:
>+    case EditAction::InsertUnorderedList:
>         return "insertUnorderedList"_s;
>-    case EditActionTypingInsertPendingComposition:
>+    case EditAction::TypingInsertPendingComposition:
>         return "insertCompositionText"_s;
>-    case EditActionTypingInsertFinalComposition:
>+    case EditAction::TypingInsertFinalComposition:
>         return "insertFromComposition"_s;
>-    case EditActionIndent:
>+    case EditAction::Indent:
>         return "formatIndent"_s;
>-    case EditActionOutdent:
>+    case EditAction::Outdent:
>         return "formatOutdent"_s;
>-    case EditActionSetWritingDirection:
>+    case EditAction::SetWritingDirection:
>         return "formatSetInlineTextDirection"_s;
>     default:
>         return emptyString();
>diff --git a/Source/WebCore/editing/EditCommand.h b/Source/WebCore/editing/EditCommand.h
>index 4fc0cb7c7a38b1f474419509dd0e8b46568de251..debcff0245edf0dee7dfbefed5f64081b512a367 100644
>--- a/Source/WebCore/editing/EditCommand.h
>+++ b/Source/WebCore/editing/EditCommand.h
>@@ -61,7 +61,7 @@ public:
>     virtual void doApply() = 0;
> 
> protected:
>-    explicit EditCommand(Document&, EditAction = EditActionUnspecified);
>+    explicit EditCommand(Document&, EditAction = EditAction::Unspecified);
>     EditCommand(Document&, const VisibleSelection&, const VisibleSelection&);
> 
>     const Frame& frame() const;
>@@ -82,7 +82,7 @@ private:
>     VisibleSelection m_startingSelection;
>     VisibleSelection m_endingSelection;
>     CompositeEditCommand* m_parent { nullptr };
>-    EditAction m_editingAction { EditActionUnspecified };
>+    EditAction m_editingAction { EditAction::Unspecified };
> };
> 
> enum ShouldAssumeContentIsAlwaysEditable {
>@@ -100,7 +100,7 @@ public:
> #endif
> 
> protected:
>-    explicit SimpleEditCommand(Document&, EditAction = EditActionUnspecified);
>+    explicit SimpleEditCommand(Document&, EditAction = EditAction::Unspecified);
> 
> #ifndef NDEBUG
>     void addNodeAndDescendants(Node*, HashSet<Node*>&);
>diff --git a/Source/WebCore/editing/Editor.cpp b/Source/WebCore/editing/Editor.cpp
>index eb8f5d233b3f369eaed69e0224be9d15d8dfe377..cf5da792154c2f90198c8fdbd129a2bd393de84d 100644
>--- a/Source/WebCore/editing/Editor.cpp
>+++ b/Source/WebCore/editing/Editor.cpp
>@@ -139,9 +139,9 @@ static String inputEventDataForEditingStyleAndAction(const StyleProperties* styl
>         return { };
> 
>     switch (action) {
>-    case EditActionSetColor:
>+    case EditAction::SetColor:
>         return style->getPropertyValue(CSSPropertyColor);
>-    case EditActionSetWritingDirection:
>+    case EditAction::SetWritingDirection:
>         return style->getPropertyValue(CSSPropertyDirection);
>     default:
>         return { };
>@@ -169,7 +169,7 @@ ClearTextCommand::ClearTextCommand(Document& document)
> 
> EditAction ClearTextCommand::editingAction() const
> {
>-    return EditActionDelete;
>+    return EditAction::Delete;
> }
> 
> void ClearTextCommand::CreateAndApply(const RefPtr<Frame> frame)
>@@ -296,9 +296,9 @@ bool Editor::handleTextEvent(TextEvent& event)
>             if (client()->performsTwoStepPaste(event.pastingFragment()))
>                 return true;
> #endif
>-            replaceSelectionWithFragment(*event.pastingFragment(), false, event.shouldSmartReplace(), event.shouldMatchStyle(), EditActionPaste, event.mailBlockquoteHandling());
>+            replaceSelectionWithFragment(*event.pastingFragment(), false, event.shouldSmartReplace(), event.shouldMatchStyle(), EditAction::Paste, event.mailBlockquoteHandling());
>         } else
>-            replaceSelectionWithText(event.data(), false, event.shouldSmartReplace(), EditActionPaste);
>+            replaceSelectionWithText(event.data(), false, event.shouldSmartReplace(), EditAction::Paste);
>         return true;
>     }
> 
>@@ -629,7 +629,7 @@ void Editor::replaceSelectionWithFragment(DocumentFragment& fragment, bool selec
>         return;
> 
>     AccessibilityReplacedText replacedText;
>-    if (AXObjectCache::accessibilityEnabled() && editingAction == EditActionPaste)
>+    if (AXObjectCache::accessibilityEnabled() && editingAction == EditAction::Paste)
>         replacedText = AccessibilityReplacedText(selection);
> 
>     OptionSet<ReplaceSelectionCommand::CommandOption> options { ReplaceSelectionCommand::PreventNesting, ReplaceSelectionCommand::SanitizeFragment };
>@@ -650,7 +650,7 @@ void Editor::replaceSelectionWithFragment(DocumentFragment& fragment, bool selec
>     if (selection.isInPasswordField())
>         return;
> 
>-    if (AXObjectCache::accessibilityEnabled() && editingAction == EditActionPaste) {
>+    if (AXObjectCache::accessibilityEnabled() && editingAction == EditAction::Paste) {
>         String text = AccessibilityObject::stringForVisiblePositionRange(command->visibleSelectionForInsertedText());
>         replacedText.postTextStateChangeNotification(document().existingAXObjectCache(), AXTextEditTypePaste, text, m_frame.selection().selection());
>         command->composition()->setRangeDeletedByUnapply(replacedText.replacedRange());
>@@ -1384,7 +1384,7 @@ void Editor::performCutOrCopy(EditorActionSpecifier action)
>         String text;
>         if (AXObjectCache::accessibilityEnabled())
>             text = AccessibilityObject::stringForVisiblePositionRange(m_frame.selection().selection());
>-        deleteSelectionWithSmartDelete(canSmartCopyOrDelete(), EditActionCut);
>+        deleteSelectionWithSmartDelete(canSmartCopyOrDelete(), EditAction::Cut);
>         if (AXObjectCache::accessibilityEnabled())
>             postTextStateChangeNotificationForCut(text, m_frame.selection().selection());
>     }
>@@ -1727,7 +1727,7 @@ void Editor::setBaseWritingDirection(WritingDirection direction)
> 
>         auto& focusedFormElement = downcast<HTMLTextFormControlElement>(*focusedElement);
>         auto directionValue = direction == LeftToRightWritingDirection ? "ltr" : "rtl";
>-        auto writingDirectionInputTypeName = inputTypeNameForEditingAction(EditActionSetWritingDirection);
>+        auto writingDirectionInputTypeName = inputTypeNameForEditingAction(EditAction::SetWritingDirection);
>         if (!dispatchBeforeInputEvent(focusedFormElement, writingDirectionInputTypeName, directionValue))
>             return;
> 
>@@ -1739,7 +1739,7 @@ void Editor::setBaseWritingDirection(WritingDirection direction)
> 
>     RefPtr<MutableStyleProperties> style = MutableStyleProperties::create();
>     style->setProperty(CSSPropertyDirection, direction == LeftToRightWritingDirection ? "ltr" : direction == RightToLeftWritingDirection ? "rtl" : "inherit", false);
>-    applyParagraphStyleToSelection(style.get(), EditActionSetWritingDirection);
>+    applyParagraphStyleToSelection(style.get(), EditAction::SetWritingDirection);
> }
> 
> WritingDirection Editor::baseWritingDirectionForSelectionStart() const
>@@ -2460,7 +2460,7 @@ void Editor::markMisspellingsAfterTypingToWord(const VisiblePosition &wordStart,
> 
>         if (!m_frame.editor().shouldInsertText(autocorrectedString, misspellingRange.get(), EditorInsertAction::Typed))
>             return;
>-        m_frame.editor().replaceSelectionWithText(autocorrectedString, false, false, EditActionInsert);
>+        m_frame.editor().replaceSelectionWithText(autocorrectedString, false, false, EditAction::Insert);
> 
>         // Reset the charet one character further.
>         m_frame.selection().moveTo(m_frame.selection().selection().end());
>@@ -2818,7 +2818,7 @@ void Editor::changeBackToReplacedString(const String& replacedString)
>     
>     m_alternativeTextController->recordAutocorrectionResponse(AutocorrectionResponse::Reverted, replacedString, selection.get());
>     TextCheckingParagraph paragraph(*selection);
>-    replaceSelectionWithText(replacedString, false, false, EditActionInsert);
>+    replaceSelectionWithText(replacedString, false, false, EditAction::Insert);
>     auto changedRange = paragraph.subrange(paragraph.checkingStart(), replacedString.length());
>     changedRange->startContainer().document().markers().addMarker(changedRange.ptr(), DocumentMarker::Replacement, String());
>     m_alternativeTextController->markReversed(changedRange);
>@@ -3064,7 +3064,7 @@ void Editor::transpose()
>     // Insert the transposed characters.
>     if (!shouldInsertText(transposed, range.get(), EditorInsertAction::Typed))
>         return;
>-    replaceSelectionWithText(transposed, false, false, EditActionInsert);
>+    replaceSelectionWithText(transposed, false, false, EditAction::Insert);
> }
> 
> void Editor::addRangeToKillRing(const Range& range, KillRingInsertionMode mode)
>diff --git a/Source/WebCore/editing/Editor.h b/Source/WebCore/editing/Editor.h
>index ab776464adba74e37e90ca43676fb47d26451ff4..20cbbb68766abdc4713be3d3617b1ad9577bedc1 100644
>--- a/Source/WebCore/editing/Editor.h
>+++ b/Source/WebCore/editing/Editor.h
>@@ -203,16 +203,16 @@ public:
> #endif
> 
>     WEBCORE_EXPORT bool deleteWithDirection(SelectionDirection, TextGranularity, bool killRing, bool isTypingAction);
>-    WEBCORE_EXPORT void deleteSelectionWithSmartDelete(bool smartDelete, EditAction = EditActionDelete);
>+    WEBCORE_EXPORT void deleteSelectionWithSmartDelete(bool smartDelete, EditAction = EditAction::Delete);
>     void clearText();
> #if PLATFORM(IOS)
>     WEBCORE_EXPORT void removeUnchangeableStyles();
> #endif
> 
>-    WEBCORE_EXPORT void applyStyle(StyleProperties*, EditAction = EditActionUnspecified);
>+    WEBCORE_EXPORT void applyStyle(StyleProperties*, EditAction = EditAction::Unspecified);
>     enum class ColorFilterMode { InvertColor, UseOriginalColor };
>     void applyStyle(RefPtr<EditingStyle>&&, EditAction, ColorFilterMode);
>-    void applyParagraphStyle(StyleProperties*, EditAction = EditActionUnspecified);
>+    void applyParagraphStyle(StyleProperties*, EditAction = EditAction::Unspecified);
>     WEBCORE_EXPORT void applyStyleToSelection(StyleProperties*, EditAction);
>     WEBCORE_EXPORT void applyStyleToSelection(Ref<EditingStyle>&&, EditAction, ColorFilterMode);
>     void applyParagraphStyleToSelection(StyleProperties*, EditAction);
>@@ -400,8 +400,8 @@ public:
>     const VisibleSelection& mark() const; // Mark, to be used as emacs uses it.
>     void setMark(const VisibleSelection&);
> 
>-    void computeAndSetTypingStyle(EditingStyle& , EditAction = EditActionUnspecified);
>-    WEBCORE_EXPORT void computeAndSetTypingStyle(StyleProperties& , EditAction = EditActionUnspecified);
>+    void computeAndSetTypingStyle(EditingStyle& , EditAction = EditAction::Unspecified);
>+    WEBCORE_EXPORT void computeAndSetTypingStyle(StyleProperties& , EditAction = EditAction::Unspecified);
>     WEBCORE_EXPORT void applyEditingStyleToBodyElement() const;
>     void applyEditingStyleToElement(Element*) const;
> 
>@@ -423,8 +423,8 @@ public:
>     void textDidChangeInTextArea(Element*);
>     WEBCORE_EXPORT WritingDirection baseWritingDirectionForSelectionStart() const;
> 
>-    WEBCORE_EXPORT void replaceSelectionWithFragment(DocumentFragment&, bool selectReplacement, bool smartReplace, bool matchStyle, EditAction = EditActionInsert, MailBlockquoteHandling = MailBlockquoteHandling::RespectBlockquote);
>-    WEBCORE_EXPORT void replaceSelectionWithText(const String&, bool selectReplacement, bool smartReplace, EditAction = EditActionInsert);
>+    WEBCORE_EXPORT void replaceSelectionWithFragment(DocumentFragment&, bool selectReplacement, bool smartReplace, bool matchStyle, EditAction = EditAction::Insert, MailBlockquoteHandling = MailBlockquoteHandling::RespectBlockquote);
>+    WEBCORE_EXPORT void replaceSelectionWithText(const String&, bool selectReplacement, bool smartReplace, EditAction = EditAction::Insert);
>     WEBCORE_EXPORT bool selectionStartHasMarkerFor(DocumentMarker::MarkerType, int from, int length) const;
>     void updateMarkersForWordsAffectedByEditing(bool onlyHandleWordsContainingSelection);
>     void deletedAutocorrectionAtPosition(const Position&, const String& originalString);
>diff --git a/Source/WebCore/editing/EditorCommand.cpp b/Source/WebCore/editing/EditorCommand.cpp
>index 4c93d4ab44267a0dcad1fc81afd5990ae517e159..cd9ef761aa9a79ce8d3302ee79dff9493c176f67 100644
>--- a/Source/WebCore/editing/EditorCommand.cpp
>+++ b/Source/WebCore/editing/EditorCommand.cpp
>@@ -105,7 +105,7 @@ static bool applyCommandToFrame(Frame& frame, EditorCommandSource source, EditAc
>         return true;
>     case CommandFromDOM:
>     case CommandFromDOMWithUserInterface:
>-        frame.editor().applyStyle(WTFMove(style), EditActionUnspecified, Editor::ColorFilterMode::UseOriginalColor);
>+        frame.editor().applyStyle(WTFMove(style), EditAction::Unspecified, Editor::ColorFilterMode::UseOriginalColor);
>         return true;
>     }
>     ASSERT_NOT_REACHED();
>@@ -159,7 +159,7 @@ static bool executeApplyParagraphStyle(Frame& frame, EditorCommandSource source,
> static bool executeInsertFragment(Frame& frame, Ref<DocumentFragment>&& fragment)
> {
>     ASSERT(frame.document());
>-    ReplaceSelectionCommand::create(*frame.document(), WTFMove(fragment), ReplaceSelectionCommand::PreventNesting, EditActionInsert)->apply();
>+    ReplaceSelectionCommand::create(*frame.document(), WTFMove(fragment), ReplaceSelectionCommand::PreventNesting, EditAction::Insert)->apply();
>     return true;
> }
> 
>@@ -237,7 +237,7 @@ static RefPtr<Range> unionDOMRanges(Range& a, Range& b)
> 
> static bool executeBackColor(Frame& frame, Event*, EditorCommandSource source, const String& value)
> {
>-    return executeApplyStyle(frame, source, EditActionSetBackgroundColor, CSSPropertyBackgroundColor, value);
>+    return executeApplyStyle(frame, source, EditAction::SetBackgroundColor, CSSPropertyBackgroundColor, value);
> }
> 
> static bool executeCopy(Frame& frame, Event*, EditorCommandSource, const String&)
>@@ -383,7 +383,7 @@ static bool executeFindString(Frame& frame, Event*, EditorCommandSource, const S
> 
> static bool executeFontName(Frame& frame, Event*, EditorCommandSource source, const String& value)
> {
>-    return executeApplyStyle(frame, source, EditActionSetFont, CSSPropertyFontFamily, value);
>+    return executeApplyStyle(frame, source, EditAction::SetFont, CSSPropertyFontFamily, value);
> }
> 
> static bool executeFontSize(Frame& frame, Event*, EditorCommandSource source, const String& value)
>@@ -391,17 +391,17 @@ static bool executeFontSize(Frame& frame, Event*, EditorCommandSource source, co
>     CSSValueID size;
>     if (!HTMLFontElement::cssValueFromFontSizeNumber(value, size))
>         return false;
>-    return executeApplyStyle(frame, source, EditActionChangeAttributes, CSSPropertyFontSize, size);
>+    return executeApplyStyle(frame, source, EditAction::ChangeAttributes, CSSPropertyFontSize, size);
> }
> 
> static bool executeFontSizeDelta(Frame& frame, Event*, EditorCommandSource source, const String& value)
> {
>-    return executeApplyStyle(frame, source, EditActionChangeAttributes, CSSPropertyWebkitFontSizeDelta, value);
>+    return executeApplyStyle(frame, source, EditAction::ChangeAttributes, CSSPropertyWebkitFontSizeDelta, value);
> }
> 
> static bool executeForeColor(Frame& frame, Event*, EditorCommandSource source, const String& value)
> {
>-    return executeApplyStyle(frame, source, EditActionSetColor, CSSPropertyColor, value);
>+    return executeApplyStyle(frame, source, EditAction::SetColor, CSSPropertyColor, value);
> }
> 
> static bool executeFormatBlock(Frame& frame, Event*, EditorCommandSource, const String& value)
>@@ -539,22 +539,22 @@ static bool executeInsertUnorderedList(Frame& frame, Event*, EditorCommandSource
> 
> static bool executeJustifyCenter(Frame& frame, Event*, EditorCommandSource source, const String&)
> {
>-    return executeApplyParagraphStyle(frame, source, EditActionCenter, CSSPropertyTextAlign, "center"_s);
>+    return executeApplyParagraphStyle(frame, source, EditAction::Center, CSSPropertyTextAlign, "center"_s);
> }
> 
> static bool executeJustifyFull(Frame& frame, Event*, EditorCommandSource source, const String&)
> {
>-    return executeApplyParagraphStyle(frame, source, EditActionJustify, CSSPropertyTextAlign, "justify"_s);
>+    return executeApplyParagraphStyle(frame, source, EditAction::Justify, CSSPropertyTextAlign, "justify"_s);
> }
> 
> static bool executeJustifyLeft(Frame& frame, Event*, EditorCommandSource source, const String&)
> {
>-    return executeApplyParagraphStyle(frame, source, EditActionAlignLeft, CSSPropertyTextAlign, "left"_s);
>+    return executeApplyParagraphStyle(frame, source, EditAction::AlignLeft, CSSPropertyTextAlign, "left"_s);
> }
> 
> static bool executeJustifyRight(Frame& frame, Event*, EditorCommandSource source, const String&)
> {
>-    return executeApplyParagraphStyle(frame, source, EditActionAlignRight, CSSPropertyTextAlign, "right"_s);
>+    return executeApplyParagraphStyle(frame, source, EditAction::AlignRight, CSSPropertyTextAlign, "right"_s);
> }
> 
> static bool executeMakeTextWritingDirectionLeftToRight(Frame& frame, Event*, EditorCommandSource, const String&)
>@@ -562,7 +562,7 @@ static bool executeMakeTextWritingDirectionLeftToRight(Frame& frame, Event*, Edi
>     RefPtr<MutableStyleProperties> style = MutableStyleProperties::create();
>     style->setProperty(CSSPropertyUnicodeBidi, CSSValueEmbed);
>     style->setProperty(CSSPropertyDirection, CSSValueLtr);
>-    frame.editor().applyStyle(style.get(), EditActionSetWritingDirection);
>+    frame.editor().applyStyle(style.get(), EditAction::SetWritingDirection);
>     return true;
> }
> 
>@@ -570,7 +570,7 @@ static bool executeMakeTextWritingDirectionNatural(Frame& frame, Event*, EditorC
> {
>     RefPtr<MutableStyleProperties> style = MutableStyleProperties::create();
>     style->setProperty(CSSPropertyUnicodeBidi, CSSValueNormal);
>-    frame.editor().applyStyle(style.get(), EditActionSetWritingDirection);
>+    frame.editor().applyStyle(style.get(), EditAction::SetWritingDirection);
>     return true;
> }
> 
>@@ -579,7 +579,7 @@ static bool executeMakeTextWritingDirectionRightToLeft(Frame& frame, Event*, Edi
>     RefPtr<MutableStyleProperties> style = MutableStyleProperties::create();
>     style->setProperty(CSSPropertyUnicodeBidi, CSSValueEmbed);
>     style->setProperty(CSSPropertyDirection, CSSValueRtl);
>-    frame.editor().applyStyle(style.get(), EditActionSetWritingDirection);
>+    frame.editor().applyStyle(style.get(), EditAction::SetWritingDirection);
>     return true;
> }
> 
>@@ -1030,7 +1030,7 @@ static bool executeStrikethrough(Frame& frame, Event*, EditorCommandSource sourc
>     Ref<EditingStyle> style = EditingStyle::create();
>     style->setStrikeThroughChange(textDecorationChangeForToggling(frame.editor(), CSSPropertyWebkitTextDecorationsInEffect, "line-through"_s));
>     // FIXME: Needs a new EditAction!
>-    return applyCommandToFrame(frame, source, EditActionUnderline, WTFMove(style));
>+    return applyCommandToFrame(frame, source, EditAction::Underline, WTFMove(style));
> }
> 
> static bool executeStyleWithCSS(Frame& frame, Event*, EditorCommandSource, const String& value)
>@@ -1047,12 +1047,12 @@ static bool executeUseCSS(Frame& frame, Event*, EditorCommandSource, const Strin
> 
> static bool executeSubscript(Frame& frame, Event*, EditorCommandSource source, const String&)
> {
>-    return executeToggleStyle(frame, source, EditActionSubscript, CSSPropertyVerticalAlign, "baseline"_s, "sub"_s);
>+    return executeToggleStyle(frame, source, EditAction::Subscript, CSSPropertyVerticalAlign, "baseline"_s, "sub"_s);
> }
> 
> static bool executeSuperscript(Frame& frame, Event*, EditorCommandSource source, const String&)
> {
>-    return executeToggleStyle(frame, source, EditActionSuperscript, CSSPropertyVerticalAlign, "baseline"_s, "super"_s);
>+    return executeToggleStyle(frame, source, EditAction::Superscript, CSSPropertyVerticalAlign, "baseline"_s, "super"_s);
> }
> 
> static bool executeSwapWithMark(Frame& frame, Event*, EditorCommandSource, const String&)
>@@ -1079,12 +1079,12 @@ static bool executeTakeFindStringFromSelection(Frame& frame, Event*, EditorComma
> 
> static bool executeToggleBold(Frame& frame, Event*, EditorCommandSource source, const String&)
> {
>-    return executeToggleStyle(frame, source, EditActionBold, CSSPropertyFontWeight, "normal"_s, "bold"_s);
>+    return executeToggleStyle(frame, source, EditAction::Bold, CSSPropertyFontWeight, "normal"_s, "bold"_s);
> }
> 
> static bool executeToggleItalic(Frame& frame, Event*, EditorCommandSource source, const String&)
> {
>-    return executeToggleStyle(frame, source, EditActionItalics, CSSPropertyFontStyle, "normal"_s, "italic"_s);
>+    return executeToggleStyle(frame, source, EditAction::Italics, CSSPropertyFontStyle, "normal"_s, "italic"_s);
> }
> 
> static bool executeTranspose(Frame& frame, Event*, EditorCommandSource, const String&)
>@@ -1098,7 +1098,7 @@ static bool executeUnderline(Frame& frame, Event*, EditorCommandSource source, c
>     Ref<EditingStyle> style = EditingStyle::create();
>     TextDecorationChange change = textDecorationChangeForToggling(frame.editor(), CSSPropertyWebkitTextDecorationsInEffect, "underline"_s);
>     style->setUnderlineChange(change);
>-    return applyCommandToFrame(frame, source, EditActionUnderline, WTFMove(style));
>+    return applyCommandToFrame(frame, source, EditAction::Underline, WTFMove(style));
> }
> 
> static bool executeUndo(Frame& frame, Event*, EditorCommandSource, const String&)
>@@ -1116,7 +1116,7 @@ static bool executeUnlink(Frame& frame, Event*, EditorCommandSource, const Strin
> 
> static bool executeUnscript(Frame& frame, Event*, EditorCommandSource source, const String&)
> {
>-    return executeApplyStyle(frame, source, EditActionUnscript, CSSPropertyVerticalAlign, "baseline"_s);
>+    return executeApplyStyle(frame, source, EditAction::Unscript, CSSPropertyVerticalAlign, "baseline"_s);
> }
> 
> static bool executeUnselect(Frame& frame, Event*, EditorCommandSource, const String&)
>diff --git a/Source/WebCore/editing/FontAttributeChanges.cpp b/Source/WebCore/editing/FontAttributeChanges.cpp
>index ec3f8fc6bb6b8281ce7b2c06b1824c85ac4a4069..40b3d62ab60eef5f5a9b5c767df5c06b484fc353 100644
>--- a/Source/WebCore/editing/FontAttributeChanges.cpp
>+++ b/Source/WebCore/editing/FontAttributeChanges.cpp
>@@ -112,14 +112,19 @@ Ref<EditingStyle> FontAttributeChanges::createEditingStyle() const
>     }
> 
>     if (m_verticalAlign) {
>-        if (*m_verticalAlign == VerticalAlign::Super)
>+        switch (*m_verticalAlign) {
>+        case VerticalAlignChange::Superscript:
>             style->setProperty(CSSPropertyVerticalAlign, CSSValueSuper);
>-        else if (*m_verticalAlign == VerticalAlign::Sub)
>+            break;
>+        case VerticalAlignChange::Subscript:
>             style->setProperty(CSSPropertyVerticalAlign, CSSValueSub);
>-        else if (*m_verticalAlign == VerticalAlign::Baseline)
>+            break;
>+        case VerticalAlignChange::Baseline:
>             style->setProperty(CSSPropertyVerticalAlign, CSSValueBaseline);
>-        else
>+            break;
>+        default:
>             ASSERT_NOT_REACHED();
>+        }
>     }
> 
>     auto editingStyle = EditingStyle::create(style.ptr());
>diff --git a/Source/WebCore/editing/FontAttributeChanges.h b/Source/WebCore/editing/FontAttributeChanges.h
>index b97fde809af539cc04cdc2718c519ac4da9a2245..cb667b5c50ece005ebe094d5b1b1e8e6e1c6109f 100644
>--- a/Source/WebCore/editing/FontAttributeChanges.h
>+++ b/Source/WebCore/editing/FontAttributeChanges.h
>@@ -26,7 +26,7 @@
> #pragma once
> 
> #include "Color.h"
>-#include "RenderStyleConstants.h"
>+#include <wtf/EnumTraits.h>
> #include <wtf/Forward.h>
> #include <wtf/Optional.h>
> 
>@@ -35,6 +35,8 @@ namespace WebCore {
> class EditingStyle;
> class MutableStyleProperties;
> 
>+enum class VerticalAlignChange : uint8_t { Superscript, Baseline, Subscript };
>+
> class FontChanges {
> public:
>     template<class Encoder> void encode(Encoder&) const;
>@@ -62,6 +64,9 @@ private:
> };
> 
> struct FontShadow {
>+    template<class Encoder> void encode(Encoder&) const;
>+    template<class Decoder> static bool decode(Decoder&, FontShadow&);
>+
>     Color color;
>     double width { 0 };
>     double height { 0 };
>@@ -70,7 +75,10 @@ struct FontShadow {
> 
> class FontAttributeChanges {
> public:
>-    void setVerticalAlign(VerticalAlign align) { m_verticalAlign = align; }
>+    template<class Encoder> void encode(Encoder&) const;
>+    template<class Decoder> static bool decode(Decoder&, FontAttributeChanges&);
>+
>+    void setVerticalAlign(VerticalAlignChange align) { m_verticalAlign = align; }
>     void setBackgroundColor(const Color& color) { m_backgroundColor = color; }
>     void setForegroundColor(const Color& color) { m_foregroundColor = color; }
>     void setShadow(const FontShadow& shadow) { m_shadow = shadow; }
>@@ -81,7 +89,7 @@ public:
>     WEBCORE_EXPORT Ref<EditingStyle> createEditingStyle() const;
> 
> private:
>-    std::optional<VerticalAlign> m_verticalAlign;
>+    std::optional<VerticalAlignChange> m_verticalAlign;
>     std::optional<Color> m_backgroundColor;
>     std::optional<Color> m_foregroundColor;
>     std::optional<FontShadow> m_shadow;
>@@ -122,4 +130,72 @@ bool FontChanges::decode(Decoder& decoder, FontChanges& changes)
>     return true;
> }
> 
>+template<class Encoder>
>+void FontShadow::encode(Encoder& encoder) const
>+{
>+    encoder << color << width << height << blurRadius;
>+}
>+
>+template<class Decoder>
>+bool FontShadow::decode(Decoder& decoder, FontShadow& shadow)
>+{
>+    if (!decoder.decode(shadow.color))
>+        return false;
>+
>+    if (!decoder.decode(shadow.width))
>+        return false;
>+
>+    if (!decoder.decode(shadow.height))
>+        return false;
>+
>+    if (!decoder.decode(shadow.blurRadius))
>+        return false;
>+
>+    return true;
>+}
>+
>+template<class Encoder>
>+void FontAttributeChanges::encode(Encoder& encoder) const
>+{
>+    encoder << m_verticalAlign << m_backgroundColor << m_foregroundColor << m_shadow << m_strikeThrough << m_underline << m_fontChanges;
>+}
>+
>+template<class Decoder>
>+bool FontAttributeChanges::decode(Decoder& decoder, FontAttributeChanges& changes)
>+{
>+    if (!decoder.decode(changes.m_verticalAlign))
>+        return false;
>+
>+    if (!decoder.decode(changes.m_backgroundColor))
>+        return false;
>+
>+    if (!decoder.decode(changes.m_foregroundColor))
>+        return false;
>+
>+    if (!decoder.decode(changes.m_shadow))
>+        return false;
>+
>+    if (!decoder.decode(changes.m_strikeThrough))
>+        return false;
>+
>+    if (!decoder.decode(changes.m_underline))
>+        return false;
>+
>+    if (!decoder.decode(changes.m_fontChanges))
>+        return false;
>+
>+    return true;
>+}
>+
> } // namespace WebCore
>+
>+namespace WTF {
>+template<> struct EnumTraits<WebCore::VerticalAlignChange> {
>+    using values = EnumValues<
>+        WebCore::VerticalAlignChange,
>+        WebCore::VerticalAlignChange::Superscript,
>+        WebCore::VerticalAlignChange::Baseline,
>+        WebCore::VerticalAlignChange::Subscript
>+    >;
>+};
>+}
>diff --git a/Source/WebCore/editing/FormatBlockCommand.h b/Source/WebCore/editing/FormatBlockCommand.h
>index 42e4571a4e33896038f7c33616136ff5cee3e789..79bedad17e0e64c82582016d52e9b9e96f2421c7 100644
>--- a/Source/WebCore/editing/FormatBlockCommand.h
>+++ b/Source/WebCore/editing/FormatBlockCommand.h
>@@ -54,7 +54,7 @@ private:
> 
>     void formatSelection(const VisiblePosition& startOfSelection, const VisiblePosition& endOfSelection) override;
>     void formatRange(const Position& start, const Position& end, const Position& endOfSelection, RefPtr<Element>&) override;
>-    EditAction editingAction() const override { return EditActionFormatBlock; }
>+    EditAction editingAction() const override { return EditAction::FormatBlock; }
> 
>     bool m_didApply;
> };
>diff --git a/Source/WebCore/editing/IndentOutdentCommand.h b/Source/WebCore/editing/IndentOutdentCommand.h
>index c30f743962321ade1ec6dc644270b951f776a986..90759ac1fec14a12419f6634e4ef3ba5af697fed 100644
>--- a/Source/WebCore/editing/IndentOutdentCommand.h
>+++ b/Source/WebCore/editing/IndentOutdentCommand.h
>@@ -43,7 +43,7 @@ public:
> private:
>     IndentOutdentCommand(Document&, EIndentType);
> 
>-    EditAction editingAction() const override { return m_typeOfAction == Indent ? EditActionIndent : EditActionOutdent; }
>+    EditAction editingAction() const override { return m_typeOfAction == Indent ? EditAction::Indent : EditAction::Outdent; }
> 
>     void indentRegion(const VisiblePosition&, const VisiblePosition&);
>     void outdentRegion(const VisiblePosition&, const VisiblePosition&);
>diff --git a/Source/WebCore/editing/InsertIntoTextNodeCommand.h b/Source/WebCore/editing/InsertIntoTextNodeCommand.h
>index 0d1905fe8726d3d7a79b9843d72c58c793ff8edd..1196e60f6d2d932b42b69ae1bbdecd19dc3b21f3 100644
>--- a/Source/WebCore/editing/InsertIntoTextNodeCommand.h
>+++ b/Source/WebCore/editing/InsertIntoTextNodeCommand.h
>@@ -33,7 +33,7 @@ class Text;
> 
> class InsertIntoTextNodeCommand : public SimpleEditCommand {
> public:
>-    static Ref<InsertIntoTextNodeCommand> create(Ref<Text>&& node, unsigned offset, const String& text, EditAction editingAction = EditActionInsert)
>+    static Ref<InsertIntoTextNodeCommand> create(Ref<Text>&& node, unsigned offset, const String& text, EditAction editingAction = EditAction::Insert)
>     {
>         return adoptRef(*new InsertIntoTextNodeCommand(WTFMove(node), offset, text, editingAction));
>     }
>diff --git a/Source/WebCore/editing/InsertListCommand.cpp b/Source/WebCore/editing/InsertListCommand.cpp
>index 97710be40dff9df901977d6dbe09b7d5e9c3a501..c571be1f343b6bad17b8ec19303e3f164b786585 100644
>--- a/Source/WebCore/editing/InsertListCommand.cpp
>+++ b/Source/WebCore/editing/InsertListCommand.cpp
>@@ -192,7 +192,7 @@ void InsertListCommand::doApply()
> 
> EditAction InsertListCommand::editingAction() const
> {
>-    return m_type == OrderedList ? EditActionInsertOrderedList : EditActionInsertUnorderedList;
>+    return m_type == OrderedList ? EditAction::InsertOrderedList : EditAction::InsertUnorderedList;
> }
> 
> void InsertListCommand::doApplyForSingleParagraph(bool forceCreateList, const HTMLQualifiedName& listTag, Range* currentSelection)
>diff --git a/Source/WebCore/editing/InsertNodeBeforeCommand.h b/Source/WebCore/editing/InsertNodeBeforeCommand.h
>index c4205961c22e943a9a6bb662ed98e5e8c1b49995..25d343c8e13316418e7400adc825a0f8ce51667b 100644
>--- a/Source/WebCore/editing/InsertNodeBeforeCommand.h
>+++ b/Source/WebCore/editing/InsertNodeBeforeCommand.h
>@@ -32,7 +32,7 @@ namespace WebCore {
> class InsertNodeBeforeCommand : public SimpleEditCommand {
> public:
>     static Ref<InsertNodeBeforeCommand> create(Ref<Node>&& childToInsert, Node& childToInsertBefore,
>-        ShouldAssumeContentIsAlwaysEditable shouldAssumeContentIsAlwaysEditable, EditAction editingAction = EditActionInsert)
>+        ShouldAssumeContentIsAlwaysEditable shouldAssumeContentIsAlwaysEditable, EditAction editingAction = EditAction::Insert)
>     {
>         return adoptRef(*new InsertNodeBeforeCommand(WTFMove(childToInsert), childToInsertBefore, shouldAssumeContentIsAlwaysEditable, editingAction));
>     }
>diff --git a/Source/WebCore/editing/InsertParagraphSeparatorCommand.h b/Source/WebCore/editing/InsertParagraphSeparatorCommand.h
>index 0285ae76960c66a933505fd5c00276fab4a056c1..689b2836dc3d089bb4e59c0f0929fbe5b41b165b 100644
>--- a/Source/WebCore/editing/InsertParagraphSeparatorCommand.h
>+++ b/Source/WebCore/editing/InsertParagraphSeparatorCommand.h
>@@ -33,7 +33,7 @@ class EditingStyle;
> 
> class InsertParagraphSeparatorCommand : public CompositeEditCommand {
> public:
>-    static Ref<InsertParagraphSeparatorCommand> create(Document& document, bool useDefaultParagraphElement = false, bool pasteBlockqutoeIntoUnquotedArea = false, EditAction editingAction = EditActionInsert)
>+    static Ref<InsertParagraphSeparatorCommand> create(Document& document, bool useDefaultParagraphElement = false, bool pasteBlockqutoeIntoUnquotedArea = false, EditAction editingAction = EditAction::Insert)
>     {
>         return adoptRef(*new InsertParagraphSeparatorCommand(document, useDefaultParagraphElement, pasteBlockqutoeIntoUnquotedArea, editingAction));
>     }
>diff --git a/Source/WebCore/editing/InsertTextCommand.h b/Source/WebCore/editing/InsertTextCommand.h
>index 78c95da55d6da538b1d0da01e6e4ce8b5c571ff8..2c3bcc4f30f0c68f35679eea0d2faf05b3b598e1 100644
>--- a/Source/WebCore/editing/InsertTextCommand.h
>+++ b/Source/WebCore/editing/InsertTextCommand.h
>@@ -48,12 +48,12 @@ public:
>     };
> 
>     static Ref<InsertTextCommand> create(Document& document, const String& text, bool selectInsertedText = false,
>-        RebalanceType rebalanceType = RebalanceLeadingAndTrailingWhitespaces, EditAction editingAction = EditActionInsert)
>+        RebalanceType rebalanceType = RebalanceLeadingAndTrailingWhitespaces, EditAction editingAction = EditAction::Insert)
>     {
>         return adoptRef(*new InsertTextCommand(document, text, selectInsertedText, rebalanceType, editingAction));
>     }
> 
>-    static Ref<InsertTextCommand> createWithMarkerSupplier(Document& document, const String& text, Ref<TextInsertionMarkerSupplier>&& markerSupplier, EditAction editingAction = EditActionInsert)
>+    static Ref<InsertTextCommand> createWithMarkerSupplier(Document& document, const String& text, Ref<TextInsertionMarkerSupplier>&& markerSupplier, EditAction editingAction = EditAction::Insert)
>     {
>         return adoptRef(*new InsertTextCommand(document, text, WTFMove(markerSupplier), editingAction));
>     }
>diff --git a/Source/WebCore/editing/MoveSelectionCommand.cpp b/Source/WebCore/editing/MoveSelectionCommand.cpp
>index 486d85aa59668ac990e62f3ee0cc5e621f2f5914..5e5037336a3418a038275560044076aac6797830 100644
>--- a/Source/WebCore/editing/MoveSelectionCommand.cpp
>+++ b/Source/WebCore/editing/MoveSelectionCommand.cpp
>@@ -61,7 +61,7 @@ void MoveSelectionCommand::doApply()
>     }
> 
>     {
>-        auto deleteSelection = DeleteSelectionCommand::create(document(), m_smartDelete, true, false, true, true, EditActionDeleteByDrag);
>+        auto deleteSelection = DeleteSelectionCommand::create(document(), m_smartDelete, true, false, true, true, EditAction::DeleteByDrag);
>         deleteSelection->setParent(this);
>         deleteSelection->apply();
>         m_commands.append(WTFMove(deleteSelection));
>@@ -87,7 +87,7 @@ void MoveSelectionCommand::doApply()
>         options.add(ReplaceSelectionCommand::SmartReplace);
> 
>     {
>-        auto replaceSelection = ReplaceSelectionCommand::create(document(), WTFMove(m_fragment), options, EditActionInsertFromDrop);
>+        auto replaceSelection = ReplaceSelectionCommand::create(document(), WTFMove(m_fragment), options, EditAction::InsertFromDrop);
>         replaceSelection->setParent(this);
>         replaceSelection->apply();
>         m_commands.append(WTFMove(replaceSelection));
>@@ -96,7 +96,7 @@ void MoveSelectionCommand::doApply()
> 
> EditAction MoveSelectionCommand::editingAction() const
> {
>-    return EditActionDeleteByDrag;
>+    return EditAction::DeleteByDrag;
> }
> 
> } // namespace WebCore
>diff --git a/Source/WebCore/editing/RemoveFormatCommand.h b/Source/WebCore/editing/RemoveFormatCommand.h
>index a493b3abf733927a5dcb29527e5412916feeab86..69120387f4e17e910fea677c3505c7e4a0ac3a37 100644
>--- a/Source/WebCore/editing/RemoveFormatCommand.h
>+++ b/Source/WebCore/editing/RemoveFormatCommand.h
>@@ -40,7 +40,7 @@ private:
>     explicit RemoveFormatCommand(Document&);
> 
>     void doApply() override;
>-    EditAction editingAction() const override { return EditActionUnspecified; }
>+    EditAction editingAction() const override { return EditAction::Unspecified; }
> };
> 
> } // namespace WebCore
>diff --git a/Source/WebCore/editing/RemoveNodeCommand.h b/Source/WebCore/editing/RemoveNodeCommand.h
>index 0c74072d05731df0480837e5d43dd12fdfc2c96c..316e2a49776705948e1564259d5d2b163edd1720 100644
>--- a/Source/WebCore/editing/RemoveNodeCommand.h
>+++ b/Source/WebCore/editing/RemoveNodeCommand.h
>@@ -31,7 +31,7 @@ namespace WebCore {
> 
> class RemoveNodeCommand : public SimpleEditCommand {
> public:
>-    static Ref<RemoveNodeCommand> create(Ref<Node>&& node, ShouldAssumeContentIsAlwaysEditable shouldAssumeContentIsAlwaysEditable, EditAction editingAction = EditActionUnspecified)
>+    static Ref<RemoveNodeCommand> create(Ref<Node>&& node, ShouldAssumeContentIsAlwaysEditable shouldAssumeContentIsAlwaysEditable, EditAction editingAction = EditAction::Unspecified)
>     {
>         return adoptRef(*new RemoveNodeCommand(WTFMove(node), shouldAssumeContentIsAlwaysEditable, editingAction));
>     }
>diff --git a/Source/WebCore/editing/ReplaceRangeWithTextCommand.cpp b/Source/WebCore/editing/ReplaceRangeWithTextCommand.cpp
>index 5b34d06436a98b5c9bf72dec2ed74bed60128cee..73a8ce3ac4f2c1229f59f52d13f2a4cd8653409b 100644
>--- a/Source/WebCore/editing/ReplaceRangeWithTextCommand.cpp
>+++ b/Source/WebCore/editing/ReplaceRangeWithTextCommand.cpp
>@@ -41,7 +41,7 @@
> namespace WebCore {
> 
> ReplaceRangeWithTextCommand::ReplaceRangeWithTextCommand(RefPtr<Range> rangeToBeReplaced, const String& text)
>-    : CompositeEditCommand(rangeToBeReplaced->startContainer().document(), EditActionInsertReplacement)
>+    : CompositeEditCommand(rangeToBeReplaced->startContainer().document(), EditAction::InsertReplacement)
>     , m_rangeToBeReplaced(rangeToBeReplaced)
>     , m_text(text)
> {
>@@ -68,7 +68,7 @@ void ReplaceRangeWithTextCommand::doApply()
>         return;
> 
>     applyCommandToComposite(SetSelectionCommand::create(selection, FrameSelection::defaultSetSelectionOptions()));
>-    applyCommandToComposite(ReplaceSelectionCommand::create(document(), WTFMove(m_textFragment), ReplaceSelectionCommand::MatchStyle, EditActionPaste));
>+    applyCommandToComposite(ReplaceSelectionCommand::create(document(), WTFMove(m_textFragment), ReplaceSelectionCommand::MatchStyle, EditAction::Paste));
> }
> 
> String ReplaceRangeWithTextCommand::inputEventData() const
>diff --git a/Source/WebCore/editing/ReplaceSelectionCommand.cpp b/Source/WebCore/editing/ReplaceSelectionCommand.cpp
>index 66d86ac15ceb12148960e691cc8aec4eb3914203..125eb3ea43bed3c787c679895f1e39eb01c24a36 100644
>--- a/Source/WebCore/editing/ReplaceSelectionCommand.cpp
>+++ b/Source/WebCore/editing/ReplaceSelectionCommand.cpp
>@@ -1412,7 +1412,7 @@ void ReplaceSelectionCommand::completeHTMLReplacement(const Position &lastPositi
>     else
>         return;
> 
>-    if (AXObjectCache::accessibilityEnabled() && editingAction() == EditActionPaste)
>+    if (AXObjectCache::accessibilityEnabled() && editingAction() == EditAction::Paste)
>         m_visibleSelectionForInsertedText = VisibleSelection(start, end);
> 
>     if (m_selectReplacement)
>@@ -1584,7 +1584,7 @@ bool ReplaceSelectionCommand::performTrivialReplace(const ReplacementFragment& f
> 
>     VisibleSelection selectionAfterReplace(m_selectReplacement ? start : end, end);
> 
>-    if (AXObjectCache::accessibilityEnabled() && editingAction() == EditActionPaste)
>+    if (AXObjectCache::accessibilityEnabled() && editingAction() == EditAction::Paste)
>         m_visibleSelectionForInsertedText = VisibleSelection(start, end);
> 
>     setEndingSelection(selectionAfterReplace);
>diff --git a/Source/WebCore/editing/ReplaceSelectionCommand.h b/Source/WebCore/editing/ReplaceSelectionCommand.h
>index 58c7e94a48b9d7ce45f83f0cc9aba48ee31002df..a2581cba06b7f40a69449cbfb75fcd8a8530ca26 100644
>--- a/Source/WebCore/editing/ReplaceSelectionCommand.h
>+++ b/Source/WebCore/editing/ReplaceSelectionCommand.h
>@@ -45,7 +45,7 @@ public:
>         IgnoreMailBlockquote = 1 << 6,
>     };
> 
>-    static Ref<ReplaceSelectionCommand> create(Document& document, RefPtr<DocumentFragment>&& fragment, OptionSet<CommandOption> options, EditAction editingAction = EditActionInsert)
>+    static Ref<ReplaceSelectionCommand> create(Document& document, RefPtr<DocumentFragment>&& fragment, OptionSet<CommandOption> options, EditAction editingAction = EditAction::Insert)
>     {
>         return adoptRef(*new ReplaceSelectionCommand(document, WTFMove(fragment), options, editingAction));
>     }
>diff --git a/Source/WebCore/editing/SpellingCorrectionCommand.cpp b/Source/WebCore/editing/SpellingCorrectionCommand.cpp
>index 3357e0a276dbe09c9cdfa7be95799128e7694480..870d4452f612c465085068a5c832917665e02420 100644
>--- a/Source/WebCore/editing/SpellingCorrectionCommand.cpp
>+++ b/Source/WebCore/editing/SpellingCorrectionCommand.cpp
>@@ -84,7 +84,7 @@ private:
> #endif
> 
> SpellingCorrectionCommand::SpellingCorrectionCommand(Range& rangeToBeCorrected, const String& correction)
>-    : CompositeEditCommand(rangeToBeCorrected.startContainer().document(), EditActionInsertReplacement)
>+    : CompositeEditCommand(rangeToBeCorrected.startContainer().document(), EditAction::InsertReplacement)
>     , m_rangeToBeCorrected(rangeToBeCorrected)
>     , m_selectionToBeCorrected(m_rangeToBeCorrected)
>     , m_correction(correction)
>@@ -111,7 +111,7 @@ void SpellingCorrectionCommand::doApply()
>     applyCommandToComposite(SpellingCorrectionRecordUndoCommand::create(document(), m_corrected, m_correction));
> #endif
> 
>-    applyCommandToComposite(ReplaceSelectionCommand::create(document(), WTFMove(m_correctionFragment), ReplaceSelectionCommand::MatchStyle, EditActionPaste));
>+    applyCommandToComposite(ReplaceSelectionCommand::create(document(), WTFMove(m_correctionFragment), ReplaceSelectionCommand::MatchStyle, EditAction::Paste));
> }
> 
> String SpellingCorrectionCommand::inputEventData() const
>diff --git a/Source/WebCore/editing/TextInsertionBaseCommand.h b/Source/WebCore/editing/TextInsertionBaseCommand.h
>index 10d9adb083fc3a77d87a3f2cc3413a4bc2d226e5..67445f0f40ac13974552faf8b00488461acf123c 100644
>--- a/Source/WebCore/editing/TextInsertionBaseCommand.h
>+++ b/Source/WebCore/editing/TextInsertionBaseCommand.h
>@@ -38,7 +38,7 @@ public:
>     virtual ~TextInsertionBaseCommand() { };
> 
> protected:
>-    explicit TextInsertionBaseCommand(Document&, EditAction = EditActionUnspecified);
>+    explicit TextInsertionBaseCommand(Document&, EditAction = EditAction::Unspecified);
>     static void applyTextInsertionCommand(Frame*, TextInsertionBaseCommand&, const VisibleSelection& selectionForInsertion, const VisibleSelection& endingSelection);
> };
> 
>diff --git a/Source/WebCore/editing/TypingCommand.cpp b/Source/WebCore/editing/TypingCommand.cpp
>index b94df5a1b69237e74b1d05e24042685e09165eaf..6b14fd90d5df2fc8f4a37b76ff91bd2b57353d7f 100644
>--- a/Source/WebCore/editing/TypingCommand.cpp
>+++ b/Source/WebCore/editing/TypingCommand.cpp
>@@ -83,58 +83,58 @@ static inline EditAction editActionForTypingCommand(TypingCommand::ETypingComman
> {
>     if (compositionType == TypingCommand::TextCompositionPending) {
>         if (command == TypingCommand::InsertText)
>-            return EditActionTypingInsertPendingComposition;
>+            return EditAction::TypingInsertPendingComposition;
>         if (command == TypingCommand::DeleteSelection)
>-            return EditActionTypingDeletePendingComposition;
>+            return EditAction::TypingDeletePendingComposition;
>         ASSERT_NOT_REACHED();
>     }
> 
>     if (compositionType == TypingCommand::TextCompositionFinal) {
>         if (command == TypingCommand::InsertText)
>-            return EditActionTypingInsertFinalComposition;
>+            return EditAction::TypingInsertFinalComposition;
>         if (command == TypingCommand::DeleteSelection)
>-            return EditActionTypingDeleteFinalComposition;
>+            return EditAction::TypingDeleteFinalComposition;
>         ASSERT_NOT_REACHED();
>     }
> 
>     switch (command) {
>     case TypingCommand::DeleteSelection:
>-        return EditActionTypingDeleteSelection;
>+        return EditAction::TypingDeleteSelection;
>     case TypingCommand::DeleteKey: {
>         if (granularity == WordGranularity)
>-            return EditActionTypingDeleteWordBackward;
>+            return EditAction::TypingDeleteWordBackward;
>         if (granularity == LineBoundary)
>-            return EditActionTypingDeleteLineBackward;
>-        return EditActionTypingDeleteBackward;
>+            return EditAction::TypingDeleteLineBackward;
>+        return EditAction::TypingDeleteBackward;
>     }
>     case TypingCommand::ForwardDeleteKey:
>         if (granularity == WordGranularity)
>-            return EditActionTypingDeleteWordForward;
>+            return EditAction::TypingDeleteWordForward;
>         if (granularity == LineBoundary)
>-            return EditActionTypingDeleteLineForward;
>-        return EditActionTypingDeleteForward;
>+            return EditAction::TypingDeleteLineForward;
>+        return EditAction::TypingDeleteForward;
>     case TypingCommand::InsertText:
>-        return isAutocompletion ? EditActionInsertReplacement : EditActionTypingInsertText;
>+        return isAutocompletion ? EditAction::InsertReplacement : EditAction::TypingInsertText;
>     case TypingCommand::InsertLineBreak:
>-        return EditActionTypingInsertLineBreak;
>+        return EditAction::TypingInsertLineBreak;
>     case TypingCommand::InsertParagraphSeparator:
>     case TypingCommand::InsertParagraphSeparatorInQuotedContent:
>-        return EditActionTypingInsertParagraph;
>+        return EditAction::TypingInsertParagraph;
>     default:
>-        return EditActionUnspecified;
>+        return EditAction::Unspecified;
>     }
> }
> 
> static inline bool editActionIsDeleteByTyping(EditAction action)
> {
>     switch (action) {
>-    case EditActionTypingDeleteSelection:
>-    case EditActionTypingDeleteBackward:
>-    case EditActionTypingDeleteWordBackward:
>-    case EditActionTypingDeleteLineBackward:
>-    case EditActionTypingDeleteForward:
>-    case EditActionTypingDeleteWordForward:
>-    case EditActionTypingDeleteLineForward:
>+    case EditAction::TypingDeleteSelection:
>+    case EditAction::TypingDeleteBackward:
>+    case EditAction::TypingDeleteWordBackward:
>+    case EditAction::TypingDeleteLineBackward:
>+    case EditAction::TypingDeleteForward:
>+    case EditAction::TypingDeleteWordForward:
>+    case EditAction::TypingDeleteLineForward:
>         return true;
>     default:
>         return false;
>@@ -401,17 +401,17 @@ String TypingCommand::inputEventTypeName() const
> 
> bool TypingCommand::isBeforeInputEventCancelable() const
> {
>-    return m_currentTypingEditAction != EditActionTypingInsertPendingComposition && m_currentTypingEditAction != EditActionTypingDeletePendingComposition;
>+    return m_currentTypingEditAction != EditAction::TypingInsertPendingComposition && m_currentTypingEditAction != EditAction::TypingDeletePendingComposition;
> }
> 
> String TypingCommand::inputEventData() const
> {
>     switch (m_currentTypingEditAction) {
>-    case EditActionTypingInsertText:
>-    case EditActionTypingInsertPendingComposition:
>-    case EditActionTypingInsertFinalComposition:
>+    case EditAction::TypingInsertText:
>+    case EditAction::TypingInsertPendingComposition:
>+    case EditAction::TypingInsertFinalComposition:
>         return m_currentTextToInsert;
>-    case EditActionInsertReplacement:
>+    case EditAction::InsertReplacement:
>         return isEditingTextAreaOrTextInput() ? m_currentTextToInsert : String();
>     default:
>         return CompositeEditCommand::inputEventData();
>@@ -420,7 +420,7 @@ String TypingCommand::inputEventData() const
> 
> RefPtr<DataTransfer> TypingCommand::inputEventDataTransfer() const
> {
>-    if (m_currentTypingEditAction != EditActionInsertReplacement || isEditingTextAreaOrTextInput())
>+    if (m_currentTypingEditAction != EditAction::InsertReplacement || isEditingTextAreaOrTextInput())
>         return nullptr;
> 
>     StringBuilder htmlText;
>@@ -548,7 +548,7 @@ void TypingCommand::insertTextRunWithoutNewlines(const String &text, bool select
>         return;
> 
>     auto command = InsertTextCommand::create(document(), text, selectInsertedText,
>-        m_compositionType == TextCompositionNone ? InsertTextCommand::RebalanceLeadingAndTrailingWhitespaces : InsertTextCommand::RebalanceAllWhitespaces, EditActionTypingInsertText);
>+        m_compositionType == TextCompositionNone ? InsertTextCommand::RebalanceLeadingAndTrailingWhitespaces : InsertTextCommand::RebalanceAllWhitespaces, EditAction::TypingInsertText);
> 
>     applyCommandToComposite(WTFMove(command), endingSelection());
> 
>@@ -583,7 +583,7 @@ void TypingCommand::insertParagraphSeparator()
>     if (!willAddTypingToOpenCommand(InsertParagraphSeparator, ParagraphGranularity))
>         return;
> 
>-    applyCommandToComposite(InsertParagraphSeparatorCommand::create(document(), false, false, EditActionTypingInsertParagraph));
>+    applyCommandToComposite(InsertParagraphSeparatorCommand::create(document(), false, false, EditAction::TypingInsertParagraph));
>     typingAddedToOpenCommand(InsertParagraphSeparator);
> }
> 
>diff --git a/Source/WebCore/editing/UnlinkCommand.h b/Source/WebCore/editing/UnlinkCommand.h
>index 17c50a9a345c5ed9cca4ecbcb9d52012b4993763..188a53164c7a8d94d2bb5671195732f7af5564d4 100644
>--- a/Source/WebCore/editing/UnlinkCommand.h
>+++ b/Source/WebCore/editing/UnlinkCommand.h
>@@ -40,7 +40,7 @@ private:
>     explicit UnlinkCommand(Document&);
> 
>     void doApply() override;
>-    EditAction editingAction() const override { return EditActionUnlink; }
>+    EditAction editingAction() const override { return EditAction::Unlink; }
> };
> 
> } // namespace WebCore
>diff --git a/Source/WebCore/editing/ios/DictationCommandIOS.cpp b/Source/WebCore/editing/ios/DictationCommandIOS.cpp
>index 632fdabec2f57985a3289119d41818d9a3bb1f8e..83ef19d83ae79a296275a36c1779aabfa3d31c69 100644
>--- a/Source/WebCore/editing/ios/DictationCommandIOS.cpp
>+++ b/Source/WebCore/editing/ios/DictationCommandIOS.cpp
>@@ -40,7 +40,7 @@
> namespace WebCore {
> 
> DictationCommandIOS::DictationCommandIOS(Document& document, Vector<Vector<String>>&& dictationPhrases, RetainPtr<id> metadata)
>-    : CompositeEditCommand(document, EditActionDictation)
>+    : CompositeEditCommand(document, EditAction::Dictation)
>     , m_dictationPhrases(WTFMove(dictationPhrases))
>     , m_metadata(WTFMove(metadata))
> {
>diff --git a/Source/WebCore/editing/ios/EditorIOS.mm b/Source/WebCore/editing/ios/EditorIOS.mm
>index c99b1e470a16ba5a6b9fa44c4cd356a50f60a179..a17892b55a6d4afc5ec0cc53ec33d20848133661 100644
>--- a/Source/WebCore/editing/ios/EditorIOS.mm
>+++ b/Source/WebCore/editing/ios/EditorIOS.mm
>@@ -163,8 +163,8 @@ void Editor::removeUnchangeableStyles()
>     defaultStyle->removeProperty(CSSPropertyTextDecoration);
>     defaultStyle->removeProperty(CSSPropertyWebkitTextDecorationsInEffect); // implements underline
> 
>-    // FIXME add EditActionMatchStlye <rdar://problem/9156507> Undo rich text's paste & match style should say "Undo Match Style"
>-    applyStyleToSelection(defaultStyle.get(), EditActionChangeAttributes);
>+    // FIXME add EditAction::MatchStlye <rdar://problem/9156507> Undo rich text's paste & match style should say "Undo Match Style"
>+    applyStyleToSelection(defaultStyle.get(), EditAction::ChangeAttributes);
> }
> 
> static void getImage(Element& imageElement, RefPtr<Image>& image, CachedImage*& cachedImage)
>diff --git a/Source/WebCore/page/DragController.cpp b/Source/WebCore/page/DragController.cpp
>index 5d92746eaa6db6b5db541485b08add13da469d9f..f44070501f37d8f7c493738cd5f81757079df0a2 100644
>--- a/Source/WebCore/page/DragController.cpp
>+++ b/Source/WebCore/page/DragController.cpp
>@@ -569,7 +569,7 @@ bool DragController::concludeEditDrag(const DragData& dragData)
>         if (!innerFrame->editor().shouldApplyStyle(style.ptr(), innerRange.get()))
>             return false;
>         m_client.willPerformDragDestinationAction(DragDestinationActionEdit, dragData);
>-        innerFrame->editor().applyStyle(style.ptr(), EditActionSetColor);
>+        innerFrame->editor().applyStyle(style.ptr(), EditAction::SetColor);
>         return true;
>     }
> 
>@@ -622,7 +622,7 @@ bool DragController::concludeEditDrag(const DragData& dragData)
>                     options.add(ReplaceSelectionCommand::SmartReplace);
>                 if (chosePlainText)
>                     options.add(ReplaceSelectionCommand::MatchStyle);
>-                ReplaceSelectionCommand::create(*m_documentUnderMouse, fragment.releaseNonNull(), options, EditActionInsertFromDrop)->apply();
>+                ReplaceSelectionCommand::create(*m_documentUnderMouse, fragment.releaseNonNull(), options, EditAction::InsertFromDrop)->apply();
>             }
>         }
>     } else {
>@@ -639,7 +639,7 @@ bool DragController::concludeEditDrag(const DragData& dragData)
>             return true;
> 
>         if (setSelectionToDragCaret(innerFrame.get(), dragCaret, range, point))
>-            ReplaceSelectionCommand::create(*m_documentUnderMouse, fragment.get(), { ReplaceSelectionCommand::SelectReplacement, ReplaceSelectionCommand::MatchStyle, ReplaceSelectionCommand::PreventNesting }, EditActionInsertFromDrop)->apply();
>+            ReplaceSelectionCommand::create(*m_documentUnderMouse, fragment.get(), { ReplaceSelectionCommand::SelectReplacement, ReplaceSelectionCommand::MatchStyle, ReplaceSelectionCommand::PreventNesting }, EditAction::InsertFromDrop)->apply();
>     }
> 
>     if (rootEditableElement) {
>diff --git a/Source/WebCore/platform/mac/WebCoreNSFontManagerExtras.mm b/Source/WebCore/platform/mac/WebCoreNSFontManagerExtras.mm
>index 951eb3a0b40d9199c5a2aeade6be7d1976589e01..26047ab9b996ddf72df34f12a10f436554d738bd 100644
>--- a/Source/WebCore/platform/mac/WebCoreNSFontManagerExtras.mm
>+++ b/Source/WebCore/platform/mac/WebCoreNSFontManagerExtras.mm
>@@ -144,11 +144,11 @@ FontAttributeChanges computedFontAttributeChanges(NSFontManager *fontManager, id
>     int convertedSuperscriptA = [[convertedAttributesA objectForKey:NSSuperscriptAttributeName] intValue];
>     if (convertedSuperscriptA == [[convertedAttributesB objectForKey:NSSuperscriptAttributeName] intValue]) {
>         if (convertedSuperscriptA > 0)
>-            changes.setVerticalAlign(VerticalAlign::Super);
>+            changes.setVerticalAlign(VerticalAlignChange::Superscript);
>         else if (convertedSuperscriptA < 0)
>-            changes.setVerticalAlign(VerticalAlign::Sub);
>+            changes.setVerticalAlign(VerticalAlignChange::Subscript);
>         else
>-            changes.setVerticalAlign(VerticalAlign::Baseline);
>+            changes.setVerticalAlign(VerticalAlignChange::Baseline);
>     }
> 
>     int convertedStrikeThroughA = [[convertedAttributesA objectForKey:NSStrikethroughStyleAttributeName] intValue];
>diff --git a/Source/WebKit/UIProcess/API/Cocoa/WKWebView.mm b/Source/WebKit/UIProcess/API/Cocoa/WKWebView.mm
>index 49f5180ed33603a454c51f401a7eb754f2f67d0c..66c28ebffcd523b7045c15adb2754f42a0cd8243 100644
>--- a/Source/WebKit/UIProcess/API/Cocoa/WKWebView.mm
>+++ b/Source/WebKit/UIProcess/API/Cocoa/WKWebView.mm
>@@ -3359,6 +3359,11 @@ WEBCORE_COMMAND(yankAndSelect)
>     _impl->changeFontFromFontManager();
> }
> 
>+- (void)changeAttributes:(id)sender
>+{
>+    _impl->changeFontAttributesFromSender(sender);
>+}
>+
> - (IBAction)startSpeaking:(id)sender
> {
>     _impl->startSpeaking();
>diff --git a/Source/WebKit/UIProcess/API/mac/WKView.mm b/Source/WebKit/UIProcess/API/mac/WKView.mm
>index fe97010375507b7d71119a4dafb0d528a72e4976..faf676db1bf687a83b8026bcd3b13cfccff4dd0b 100644
>--- a/Source/WebKit/UIProcess/API/mac/WKView.mm
>+++ b/Source/WebKit/UIProcess/API/mac/WKView.mm
>@@ -319,6 +319,11 @@ WEBCORE_COMMAND(yankAndSelect)
>     _data->_impl->changeFontFromFontManager();
> }
> 
>+- (void)changeAttributes:(id)sender
>+{
>+    _data->_impl->changeFontAttributesFromSender(sender);
>+}
>+
> /*
> 
> When possible, editing-related methods should be implemented in WebCore with the
>diff --git a/Source/WebKit/UIProcess/Cocoa/WebViewImpl.h b/Source/WebKit/UIProcess/Cocoa/WebViewImpl.h
>index c9f3b895c7ba8e77f0da639fad2eb971bf7347dd..796c928d091c0a66b98b4ce2721955c4b03f32b3 100644
>--- a/Source/WebKit/UIProcess/Cocoa/WebViewImpl.h
>+++ b/Source/WebKit/UIProcess/Cocoa/WebViewImpl.h
>@@ -316,6 +316,7 @@ public:
>     void didBecomeEditable();
>     void updateFontPanelIfNeeded();
>     void changeFontFromFontManager();
>+    void changeFontAttributesFromSender(id);
>     bool validateUserInterfaceItem(id <NSValidatedUserInterfaceItem>);
>     void setEditableElementIsFocused(bool);
> 
>diff --git a/Source/WebKit/UIProcess/Cocoa/WebViewImpl.mm b/Source/WebKit/UIProcess/Cocoa/WebViewImpl.mm
>index c25edf34f650abeecc529485b636a399c659d593..552d6505d2538b86c5fceee77d950ba8c25a4006 100644
>--- a/Source/WebKit/UIProcess/Cocoa/WebViewImpl.mm
>+++ b/Source/WebKit/UIProcess/Cocoa/WebViewImpl.mm
>@@ -2734,6 +2734,16 @@ void WebViewImpl::updateFontPanelIfNeeded()
>     }
> }
> 
>+void WebViewImpl::changeFontAttributesFromSender(id sender)
>+{
>+    auto& editorState = m_page->editorState();
>+    if (!editorState.isContentEditable || editorState.selectionIsNone)
>+        return;
>+
>+    m_page->changeFontAttributes(WebCore::computedFontAttributeChanges(NSFontManager.sharedFontManager, sender));
>+    updateFontPanelIfNeeded();
>+}
>+
> void WebViewImpl::changeFontFromFontManager()
> {
>     auto& editorState = m_page->editorState();
>diff --git a/Source/WebKit/UIProcess/WebEditCommandProxy.cpp b/Source/WebKit/UIProcess/WebEditCommandProxy.cpp
>index dfb11d75cbfd89e21a3fcbcf8a77743678d305e9..6fd8df5d1a6553fcf1478f94abe274462b9b7c41 100644
>--- a/Source/WebKit/UIProcess/WebEditCommandProxy.cpp
>+++ b/Source/WebKit/UIProcess/WebEditCommandProxy.cpp
>@@ -72,104 +72,104 @@ String WebEditCommandProxy::nameForEditAction(EditAction editAction)
> {
>     // FIXME: This is identical to code in WebKit's WebEditorClient class; would be nice to share the strings instead of having two copies.
>     switch (editAction) {
>-    case EditActionUnspecified:
>-    case EditActionInsert:
>-    case EditActionInsertReplacement:
>-    case EditActionInsertFromDrop:
>+    case EditAction::Unspecified:
>+    case EditAction::Insert:
>+    case EditAction::InsertReplacement:
>+    case EditAction::InsertFromDrop:
>         return String();
>-    case EditActionSetColor:
>+    case EditAction::SetColor:
>         return WEB_UI_STRING_KEY("Set Color", "Set Color (Undo action name)", "Undo action name");
>-    case EditActionSetBackgroundColor:
>+    case EditAction::SetBackgroundColor:
>         return WEB_UI_STRING_KEY("Set Background Color", "Set Background Color (Undo action name)", "Undo action name");
>-    case EditActionTurnOffKerning:
>+    case EditAction::TurnOffKerning:
>         return WEB_UI_STRING_KEY("Turn Off Kerning", "Turn Off Kerning (Undo action name)", "Undo action name");
>-    case EditActionTightenKerning:
>+    case EditAction::TightenKerning:
>         return WEB_UI_STRING_KEY("Tighten Kerning", "Tighten Kerning (Undo action name)", "Undo action name");
>-    case EditActionLoosenKerning:
>+    case EditAction::LoosenKerning:
>         return WEB_UI_STRING_KEY("Loosen Kerning", "Loosen Kerning (Undo action name)", "Undo action name");
>-    case EditActionUseStandardKerning:
>+    case EditAction::UseStandardKerning:
>         return WEB_UI_STRING_KEY("Use Standard Kerning", "Use Standard Kerning (Undo action name)", "Undo action name");
>-    case EditActionTurnOffLigatures:
>+    case EditAction::TurnOffLigatures:
>         return WEB_UI_STRING_KEY("Turn Off Ligatures", "Turn Off Ligatures (Undo action name)", "Undo action name");
>-    case EditActionUseStandardLigatures:
>+    case EditAction::UseStandardLigatures:
>         return WEB_UI_STRING_KEY("Use Standard Ligatures", "Use Standard Ligatures (Undo action name)", "Undo action name");
>-    case EditActionUseAllLigatures:
>+    case EditAction::UseAllLigatures:
>         return WEB_UI_STRING_KEY("Use All Ligatures", "Use All Ligatures (Undo action name)", "Undo action name");
>-    case EditActionRaiseBaseline:
>+    case EditAction::RaiseBaseline:
>         return WEB_UI_STRING_KEY("Raise Baseline", "Raise Baseline (Undo action name)", "Undo action name");
>-    case EditActionLowerBaseline:
>+    case EditAction::LowerBaseline:
>         return WEB_UI_STRING_KEY("Lower Baseline", "Lower Baseline (Undo action name)", "Undo action name");
>-    case EditActionSetTraditionalCharacterShape:
>+    case EditAction::SetTraditionalCharacterShape:
>         return WEB_UI_STRING_KEY("Set Traditional Character Shape", "Set Traditional Character Shape (Undo action name)", "Undo action name");
>-    case EditActionSetFont:
>+    case EditAction::SetFont:
>         return WEB_UI_STRING_KEY("Set Font", "Set Font (Undo action name)", "Undo action name");
>-    case EditActionChangeAttributes:
>+    case EditAction::ChangeAttributes:
>         return WEB_UI_STRING_KEY("Change Attributes", "Change Attributes (Undo action name)", "Undo action name");
>-    case EditActionAlignLeft:
>+    case EditAction::AlignLeft:
>         return WEB_UI_STRING_KEY("Align Left", "Align Left (Undo action name)", "Undo action name");
>-    case EditActionAlignRight:
>+    case EditAction::AlignRight:
>         return WEB_UI_STRING_KEY("Align Right", "Align Right (Undo action name)", "Undo action name");
>-    case EditActionCenter:
>+    case EditAction::Center:
>         return WEB_UI_STRING_KEY("Center", "Center (Undo action name)", "Undo action name");
>-    case EditActionJustify:
>+    case EditAction::Justify:
>         return WEB_UI_STRING_KEY("Justify", "Justify (Undo action name)", "Undo action name");
>-    case EditActionSetWritingDirection:
>+    case EditAction::SetWritingDirection:
>         return WEB_UI_STRING_KEY("Set Writing Direction", "Set Writing Direction (Undo action name)", "Undo action name");
>-    case EditActionSubscript:
>+    case EditAction::Subscript:
>         return WEB_UI_STRING_KEY("Subscript", "Subscript (Undo action name)", "Undo action name");
>-    case EditActionSuperscript:
>+    case EditAction::Superscript:
>         return WEB_UI_STRING_KEY("Superscript", "Superscript (Undo action name)", "Undo action name");
>-    case EditActionUnderline:
>+    case EditAction::Underline:
>         return WEB_UI_STRING_KEY("Underline", "Underline (Undo action name)", "Undo action name");
>-    case EditActionOutline:
>+    case EditAction::Outline:
>         return WEB_UI_STRING_KEY("Outline", "Outline (Undo action name)", "Undo action name");
>-    case EditActionUnscript:
>+    case EditAction::Unscript:
>         return WEB_UI_STRING_KEY("Unscript", "Unscript (Undo action name)", "Undo action name");
>-    case EditActionDeleteByDrag:
>+    case EditAction::DeleteByDrag:
>         return WEB_UI_STRING_KEY("Drag", "Drag (Undo action name)", "Undo action name");
>-    case EditActionCut:
>+    case EditAction::Cut:
>         return WEB_UI_STRING_KEY("Cut", "Cut (Undo action name)", "Undo action name");
>-    case EditActionBold:
>+    case EditAction::Bold:
>         return WEB_UI_STRING_KEY("Bold", "Bold (Undo action name)", "Undo action name");
>-    case EditActionItalics:
>+    case EditAction::Italics:
>         return WEB_UI_STRING_KEY("Italics", "Italics (Undo action name)", "Undo action name");
>-    case EditActionDelete:
>+    case EditAction::Delete:
>         return WEB_UI_STRING_KEY("Delete", "Delete (Undo action name)", "Undo action name");
>-    case EditActionDictation:
>+    case EditAction::Dictation:
>         return WEB_UI_STRING_KEY("Dictation", "Dictation (Undo action name)", "Undo action name");
>-    case EditActionPaste:
>+    case EditAction::Paste:
>         return WEB_UI_STRING_KEY("Paste", "Paste (Undo action name)", "Undo action name");
>-    case EditActionPasteFont:
>+    case EditAction::PasteFont:
>         return WEB_UI_STRING_KEY("Paste Font", "Paste Font (Undo action name)", "Undo action name");
>-    case EditActionPasteRuler:
>+    case EditAction::PasteRuler:
>         return WEB_UI_STRING_KEY("Paste Ruler", "Paste Ruler (Undo action name)", "Undo action name");
>-    case EditActionTypingDeleteSelection:
>-    case EditActionTypingDeleteBackward:
>-    case EditActionTypingDeleteForward:
>-    case EditActionTypingDeleteWordBackward:
>-    case EditActionTypingDeleteWordForward:
>-    case EditActionTypingDeleteLineBackward:
>-    case EditActionTypingDeleteLineForward:
>-    case EditActionTypingDeletePendingComposition:
>-    case EditActionTypingDeleteFinalComposition:
>-    case EditActionTypingInsertText:
>-    case EditActionTypingInsertLineBreak:
>-    case EditActionTypingInsertParagraph:
>-    case EditActionTypingInsertPendingComposition:
>-    case EditActionTypingInsertFinalComposition:
>+    case EditAction::TypingDeleteSelection:
>+    case EditAction::TypingDeleteBackward:
>+    case EditAction::TypingDeleteForward:
>+    case EditAction::TypingDeleteWordBackward:
>+    case EditAction::TypingDeleteWordForward:
>+    case EditAction::TypingDeleteLineBackward:
>+    case EditAction::TypingDeleteLineForward:
>+    case EditAction::TypingDeletePendingComposition:
>+    case EditAction::TypingDeleteFinalComposition:
>+    case EditAction::TypingInsertText:
>+    case EditAction::TypingInsertLineBreak:
>+    case EditAction::TypingInsertParagraph:
>+    case EditAction::TypingInsertPendingComposition:
>+    case EditAction::TypingInsertFinalComposition:
>         return WEB_UI_STRING_KEY("Typing", "Typing (Undo action name)", "Undo action name");
>-    case EditActionCreateLink:
>+    case EditAction::CreateLink:
>         return WEB_UI_STRING_KEY("Create Link", "Create Link (Undo action name)", "Undo action name");
>-    case EditActionUnlink:
>+    case EditAction::Unlink:
>         return WEB_UI_STRING_KEY("Unlink", "Unlink (Undo action name)", "Undo action name");
>-    case EditActionInsertUnorderedList:
>-    case EditActionInsertOrderedList:
>+    case EditAction::InsertUnorderedList:
>+    case EditAction::InsertOrderedList:
>         return WEB_UI_STRING_KEY("Insert List", "Insert List (Undo action name)", "Undo action name");
>-    case EditActionFormatBlock:
>+    case EditAction::FormatBlock:
>         return WEB_UI_STRING_KEY("Formatting", "Format Block (Undo action name)", "Undo action name");
>-    case EditActionIndent:
>+    case EditAction::Indent:
>         return WEB_UI_STRING_KEY("Indent", "Indent (Undo action name)", "Undo action name");
>-    case EditActionOutdent:
>+    case EditAction::Outdent:
>         return WEB_UI_STRING_KEY("Outdent", "Outdent (Undo action name)", "Undo action name");
>     }
>     return String();
>diff --git a/Source/WebKit/UIProcess/WebPageProxy.h b/Source/WebKit/UIProcess/WebPageProxy.h
>index 94b0433f84fe01bf93eb8a36bb35c3afb1b67960..a98fd72eee4bf7a05086b585abbe73a1d66355eb 100644
>--- a/Source/WebKit/UIProcess/WebPageProxy.h
>+++ b/Source/WebKit/UIProcess/WebPageProxy.h
>@@ -162,6 +162,7 @@ class CertificateInfo;
> class Cursor;
> class DragData;
> class FloatRect;
>+class FontAttributeChanges;
> class FontChanges;
> class GraphicsLayer;
> class IntSize;
>@@ -681,6 +682,7 @@ public:
> #if PLATFORM(MAC)
>     void insertDictatedTextAsync(const String& text, const EditingRange& replacementRange, const Vector<WebCore::TextAlternativeWithRange>& dictationAlternatives, bool registerUndoGroup);
>     void attributedSubstringForCharacterRangeAsync(const EditingRange&, WTF::Function<void (const AttributedString&, const EditingRange&, CallbackBase::Error)>&&);
>+    void changeFontAttributes(WebCore::FontAttributeChanges&&);
>     void changeFont(WebCore::FontChanges&&);
>     void fontAtSelection(WTF::Function<void (const String&, double, bool, CallbackBase::Error)>&&);
> 
>diff --git a/Source/WebKit/UIProcess/mac/WebPageProxyMac.mm b/Source/WebKit/UIProcess/mac/WebPageProxyMac.mm
>index 1446ae0d12f135bcd2fa25387a0fbbaa979dd33b..5d0cedc089fdf910629ee969025a73c0c3f85d59 100644
>--- a/Source/WebKit/UIProcess/mac/WebPageProxyMac.mm
>+++ b/Source/WebKit/UIProcess/mac/WebPageProxyMac.mm
>@@ -626,6 +626,14 @@ bool WebPageProxy::appleMailLinesClampEnabled()
> {
>     return MacApplication::isAppleMail();
> }
>+
>+void WebPageProxy::changeFontAttributes(WebCore::FontAttributeChanges&& changes)
>+{
>+    if (!isValid())
>+        return;
>+
>+    process().send(Messages::WebPage::ChangeFontAttributes(WTFMove(changes)), m_pageID);
>+}
>     
> void WebPageProxy::changeFont(WebCore::FontChanges&& changes)
> {
>diff --git a/Source/WebKit/WebProcess/WebPage/WebPage.h b/Source/WebKit/WebProcess/WebPage/WebPage.h
>index fbaf780db3f8cb7669c2854e28104e2d222923ed..14499480293c5e42eaee87b75a435ee8d1fe508e 100644
>--- a/Source/WebKit/WebProcess/WebPage/WebPage.h
>+++ b/Source/WebKit/WebProcess/WebPage/WebPage.h
>@@ -135,6 +135,7 @@ namespace WebCore {
> class CaptureDevice;
> class DocumentLoader;
> class DragData;
>+class FontAttributeChanges;
> class FontChanges;
> class Frame;
> class FrameSelection;
>@@ -1363,6 +1364,7 @@ private:
>     void immediateActionDidCancel();
>     void immediateActionDidComplete();
>     void changeFont(WebCore::FontChanges&&);
>+    void changeFontAttributes(WebCore::FontAttributeChanges&&);
> 
>     void dataDetectorsDidPresentUI(WebCore::PageOverlay::PageOverlayID);
>     void dataDetectorsDidChangeUI(WebCore::PageOverlay::PageOverlayID);
>diff --git a/Source/WebKit/WebProcess/WebPage/WebPage.messages.in b/Source/WebKit/WebProcess/WebPage/WebPage.messages.in
>index 70f220dd375aa95a8d210fe8e7105df21592f1c4..c34afeb1d08a9ae7d4879b4447ae2f7b82b152de 100644
>--- a/Source/WebKit/WebProcess/WebPage/WebPage.messages.in
>+++ b/Source/WebKit/WebProcess/WebPage/WebPage.messages.in
>@@ -191,6 +191,7 @@ messages -> WebPage LegacyReceiver {
> #if PLATFORM(MAC)
>     PerformDictionaryLookupOfCurrentSelection()
>     ChangeFont(WebCore::FontChanges changes)
>+    ChangeFontAttributes(WebCore::FontAttributeChanges changes)
> #endif
> 
>     PreferencesDidChange(struct WebKit::WebPreferencesStore store)
>diff --git a/Source/WebKit/WebProcess/WebPage/mac/WebPageMac.mm b/Source/WebKit/WebProcess/WebPage/mac/WebPageMac.mm
>index 8d20d2eff06bc46b0cfc99159c8e989f5db3f387..2bdd08fdd83fdb5d50855e7cc58e596e2ec0a7f4 100644
>--- a/Source/WebKit/WebProcess/WebPage/mac/WebPageMac.mm
>+++ b/Source/WebKit/WebProcess/WebPage/mac/WebPageMac.mm
>@@ -1115,11 +1115,18 @@ void WebPage::dataDetectorsDidHideUI(PageOverlay::PageOverlayID overlayID)
>     }
> }
> 
>+void WebPage::changeFontAttributes(WebCore::FontAttributeChanges&& changes)
>+{
>+    auto& frame = m_page->focusController().focusedOrMainFrame();
>+    if (frame.selection().selection().isContentEditable())
>+        frame.editor().applyStyleToSelection(changes.createEditingStyle(), EditAction::ChangeAttributes, Editor::ColorFilterMode::InvertColor);
>+}
>+
> void WebPage::changeFont(WebCore::FontChanges&& changes)
> {
>     auto& frame = m_page->focusController().focusedOrMainFrame();
>     if (frame.selection().selection().isContentEditable())
>-        frame.editor().applyStyleToSelection(changes.createEditingStyle(), EditActionSetFont, Editor::ColorFilterMode::InvertColor);
>+        frame.editor().applyStyleToSelection(changes.createEditingStyle(), EditAction::SetFont, Editor::ColorFilterMode::InvertColor);
> }
> 
> #if ENABLE(WIRELESS_PLAYBACK_TARGET) && !PLATFORM(IOS)
>diff --git a/Source/WebKitLegacy/mac/WebCoreSupport/WebEditorClient.mm b/Source/WebKitLegacy/mac/WebCoreSupport/WebEditorClient.mm
>index e28112dee410042cedc5c6026be219823f31feb7..5079ec3805806a02bc32d43ccfeee9a19db9ab78 100644
>--- a/Source/WebKitLegacy/mac/WebCoreSupport/WebEditorClient.mm
>+++ b/Source/WebKitLegacy/mac/WebCoreSupport/WebEditorClient.mm
>@@ -602,66 +602,66 @@ static NSString* undoNameForEditAction(EditAction editAction)
> {
>     // FIXME: This is identical to code in WebKit2's WebEditCommandProxy class; would be nice to share the strings instead of having two copies.
>     switch (editAction) {
>-        case EditActionUnspecified: return nil;
>-        case EditActionInsert: return nil;
>-        case EditActionInsertReplacement: return nil;
>-        case EditActionInsertFromDrop: return nil;
>-        case EditActionSetColor: return UI_STRING_KEY_INTERNAL("Set Color", "Set Color (Undo action name)", "Undo action name");
>-        case EditActionSetBackgroundColor: return UI_STRING_KEY_INTERNAL("Set Background Color", "Set Background Color (Undo action name)", "Undo action name");
>-        case EditActionTurnOffKerning: return UI_STRING_KEY_INTERNAL("Turn Off Kerning", "Turn Off Kerning (Undo action name)", "Undo action name");
>-        case EditActionTightenKerning: return UI_STRING_KEY_INTERNAL("Tighten Kerning", "Tighten Kerning (Undo action name)", "Undo action name");
>-        case EditActionLoosenKerning: return UI_STRING_KEY_INTERNAL("Loosen Kerning", "Loosen Kerning (Undo action name)", "Undo action name");
>-        case EditActionUseStandardKerning: return UI_STRING_KEY_INTERNAL("Use Standard Kerning", "Use Standard Kerning (Undo action name)", "Undo action name");
>-        case EditActionTurnOffLigatures: return UI_STRING_KEY_INTERNAL("Turn Off Ligatures", "Turn Off Ligatures (Undo action name)", "Undo action name");
>-        case EditActionUseStandardLigatures: return UI_STRING_KEY_INTERNAL("Use Standard Ligatures", "Use Standard Ligatures (Undo action name)", "Undo action name");
>-        case EditActionUseAllLigatures: return UI_STRING_KEY_INTERNAL("Use All Ligatures", "Use All Ligatures (Undo action name)", "Undo action name");
>-        case EditActionRaiseBaseline: return UI_STRING_KEY_INTERNAL("Raise Baseline", "Raise Baseline (Undo action name)", "Undo action name");
>-        case EditActionLowerBaseline: return UI_STRING_KEY_INTERNAL("Lower Baseline", "Lower Baseline (Undo action name)", "Undo action name");
>-        case EditActionSetTraditionalCharacterShape: return UI_STRING_KEY_INTERNAL("Set Traditional Character Shape", "Set Traditional Character Shape (Undo action name)", "Undo action name");
>-        case EditActionSetFont: return UI_STRING_KEY_INTERNAL("Set Font", "Set Font (Undo action name)", "Undo action name");
>-        case EditActionChangeAttributes: return UI_STRING_KEY_INTERNAL("Change Attributes", "Change Attributes (Undo action name)", "Undo action name");
>-        case EditActionAlignLeft: return UI_STRING_KEY_INTERNAL("Align Left", "Align Left (Undo action name)", "Undo action name");
>-        case EditActionAlignRight: return UI_STRING_KEY_INTERNAL("Align Right", "Align Right (Undo action name)", "Undo action name");
>-        case EditActionCenter: return UI_STRING_KEY_INTERNAL("Center", "Center (Undo action name)", "Undo action name");
>-        case EditActionJustify: return UI_STRING_KEY_INTERNAL("Justify", "Justify (Undo action name)", "Undo action name");
>-        case EditActionSetWritingDirection: return UI_STRING_KEY_INTERNAL("Set Writing Direction", "Set Writing Direction (Undo action name)", "Undo action name");
>-        case EditActionSubscript: return UI_STRING_KEY_INTERNAL("Subscript", "Subscript (Undo action name)", "Undo action name");
>-        case EditActionSuperscript: return UI_STRING_KEY_INTERNAL("Superscript", "Superscript (Undo action name)", "Undo action name");
>-        case EditActionUnderline: return UI_STRING_KEY_INTERNAL("Underline", "Underline (Undo action name)", "Undo action name");
>-        case EditActionOutline: return UI_STRING_KEY_INTERNAL("Outline", "Outline (Undo action name)", "Undo action name");
>-        case EditActionUnscript: return UI_STRING_KEY_INTERNAL("Unscript", "Unscript (Undo action name)", "Undo action name");
>-        case EditActionDeleteByDrag: return UI_STRING_KEY_INTERNAL("Drag", "Drag (Undo action name)", "Undo action name");
>-        case EditActionCut: return UI_STRING_KEY_INTERNAL("Cut", "Cut (Undo action name)", "Undo action name");
>-        case EditActionPaste: return UI_STRING_KEY_INTERNAL("Paste", "Paste (Undo action name)", "Undo action name");
>-        case EditActionPasteFont: return UI_STRING_KEY_INTERNAL("Paste Font", "Paste Font (Undo action name)", "Undo action name");
>-        case EditActionPasteRuler: return UI_STRING_KEY_INTERNAL("Paste Ruler", "Paste Ruler (Undo action name)", "Undo action name");
>-        case EditActionTypingDeleteSelection:
>-        case EditActionTypingDeleteBackward:
>-        case EditActionTypingDeleteForward:
>-        case EditActionTypingDeleteWordBackward:
>-        case EditActionTypingDeleteWordForward:
>-        case EditActionTypingDeleteLineBackward:
>-        case EditActionTypingDeleteLineForward:
>-        case EditActionTypingDeletePendingComposition:
>-        case EditActionTypingDeleteFinalComposition:
>-        case EditActionTypingInsertText:
>-        case EditActionTypingInsertLineBreak:
>-        case EditActionTypingInsertParagraph:
>-        case EditActionTypingInsertPendingComposition:
>-        case EditActionTypingInsertFinalComposition:
>-            return UI_STRING_KEY_INTERNAL("Typing", "Typing (Undo action name)", "Undo action name");
>-        case EditActionCreateLink: return UI_STRING_KEY_INTERNAL("Create Link", "Create Link (Undo action name)", "Undo action name");
>-        case EditActionUnlink: return UI_STRING_KEY_INTERNAL("Unlink", "Unlink (Undo action name)", "Undo action name");
>-        case EditActionInsertOrderedList:
>-        case EditActionInsertUnorderedList:
>-            return UI_STRING_KEY_INTERNAL("Insert List", "Insert List (Undo action name)", "Undo action name");
>-        case EditActionFormatBlock: return UI_STRING_KEY_INTERNAL("Formatting", "Format Block (Undo action name)", "Undo action name");
>-        case EditActionIndent: return UI_STRING_KEY_INTERNAL("Indent", "Indent (Undo action name)", "Undo action name");
>-        case EditActionOutdent: return UI_STRING_KEY_INTERNAL("Outdent", "Outdent (Undo action name)", "Undo action name");
>-        case EditActionBold: return UI_STRING_KEY_INTERNAL("Bold", "Bold (Undo action name)", "Undo action name");
>-        case EditActionItalics: return UI_STRING_KEY_INTERNAL("Italics", "Italics (Undo action name)", "Undo action name");
>-        case EditActionDelete: return UI_STRING_KEY_INTERNAL("Delete", "Delete (Undo action name)", "Undo action name");
>-        case EditActionDictation: return UI_STRING_KEY_INTERNAL("Dictation", "Dictation (Undo action name)", "Undo action name");
>+    case EditAction::Unspecified: return nil;
>+    case EditAction::Insert: return nil;
>+    case EditAction::InsertReplacement: return nil;
>+    case EditAction::InsertFromDrop: return nil;
>+    case EditAction::SetColor: return UI_STRING_KEY_INTERNAL("Set Color", "Set Color (Undo action name)", "Undo action name");
>+    case EditAction::SetBackgroundColor: return UI_STRING_KEY_INTERNAL("Set Background Color", "Set Background Color (Undo action name)", "Undo action name");
>+    case EditAction::TurnOffKerning: return UI_STRING_KEY_INTERNAL("Turn Off Kerning", "Turn Off Kerning (Undo action name)", "Undo action name");
>+    case EditAction::TightenKerning: return UI_STRING_KEY_INTERNAL("Tighten Kerning", "Tighten Kerning (Undo action name)", "Undo action name");
>+    case EditAction::LoosenKerning: return UI_STRING_KEY_INTERNAL("Loosen Kerning", "Loosen Kerning (Undo action name)", "Undo action name");
>+    case EditAction::UseStandardKerning: return UI_STRING_KEY_INTERNAL("Use Standard Kerning", "Use Standard Kerning (Undo action name)", "Undo action name");
>+    case EditAction::TurnOffLigatures: return UI_STRING_KEY_INTERNAL("Turn Off Ligatures", "Turn Off Ligatures (Undo action name)", "Undo action name");
>+    case EditAction::UseStandardLigatures: return UI_STRING_KEY_INTERNAL("Use Standard Ligatures", "Use Standard Ligatures (Undo action name)", "Undo action name");
>+    case EditAction::UseAllLigatures: return UI_STRING_KEY_INTERNAL("Use All Ligatures", "Use All Ligatures (Undo action name)", "Undo action name");
>+    case EditAction::RaiseBaseline: return UI_STRING_KEY_INTERNAL("Raise Baseline", "Raise Baseline (Undo action name)", "Undo action name");
>+    case EditAction::LowerBaseline: return UI_STRING_KEY_INTERNAL("Lower Baseline", "Lower Baseline (Undo action name)", "Undo action name");
>+    case EditAction::SetTraditionalCharacterShape: return UI_STRING_KEY_INTERNAL("Set Traditional Character Shape", "Set Traditional Character Shape (Undo action name)", "Undo action name");
>+    case EditAction::SetFont: return UI_STRING_KEY_INTERNAL("Set Font", "Set Font (Undo action name)", "Undo action name");
>+    case EditAction::ChangeAttributes: return UI_STRING_KEY_INTERNAL("Change Attributes", "Change Attributes (Undo action name)", "Undo action name");
>+    case EditAction::AlignLeft: return UI_STRING_KEY_INTERNAL("Align Left", "Align Left (Undo action name)", "Undo action name");
>+    case EditAction::AlignRight: return UI_STRING_KEY_INTERNAL("Align Right", "Align Right (Undo action name)", "Undo action name");
>+    case EditAction::Center: return UI_STRING_KEY_INTERNAL("Center", "Center (Undo action name)", "Undo action name");
>+    case EditAction::Justify: return UI_STRING_KEY_INTERNAL("Justify", "Justify (Undo action name)", "Undo action name");
>+    case EditAction::SetWritingDirection: return UI_STRING_KEY_INTERNAL("Set Writing Direction", "Set Writing Direction (Undo action name)", "Undo action name");
>+    case EditAction::Subscript: return UI_STRING_KEY_INTERNAL("Subscript", "Subscript (Undo action name)", "Undo action name");
>+    case EditAction::Superscript: return UI_STRING_KEY_INTERNAL("Superscript", "Superscript (Undo action name)", "Undo action name");
>+    case EditAction::Underline: return UI_STRING_KEY_INTERNAL("Underline", "Underline (Undo action name)", "Undo action name");
>+    case EditAction::Outline: return UI_STRING_KEY_INTERNAL("Outline", "Outline (Undo action name)", "Undo action name");
>+    case EditAction::Unscript: return UI_STRING_KEY_INTERNAL("Unscript", "Unscript (Undo action name)", "Undo action name");
>+    case EditAction::DeleteByDrag: return UI_STRING_KEY_INTERNAL("Drag", "Drag (Undo action name)", "Undo action name");
>+    case EditAction::Cut: return UI_STRING_KEY_INTERNAL("Cut", "Cut (Undo action name)", "Undo action name");
>+    case EditAction::Paste: return UI_STRING_KEY_INTERNAL("Paste", "Paste (Undo action name)", "Undo action name");
>+    case EditAction::PasteFont: return UI_STRING_KEY_INTERNAL("Paste Font", "Paste Font (Undo action name)", "Undo action name");
>+    case EditAction::PasteRuler: return UI_STRING_KEY_INTERNAL("Paste Ruler", "Paste Ruler (Undo action name)", "Undo action name");
>+    case EditAction::TypingDeleteSelection:
>+    case EditAction::TypingDeleteBackward:
>+    case EditAction::TypingDeleteForward:
>+    case EditAction::TypingDeleteWordBackward:
>+    case EditAction::TypingDeleteWordForward:
>+    case EditAction::TypingDeleteLineBackward:
>+    case EditAction::TypingDeleteLineForward:
>+    case EditAction::TypingDeletePendingComposition:
>+    case EditAction::TypingDeleteFinalComposition:
>+    case EditAction::TypingInsertText:
>+    case EditAction::TypingInsertLineBreak:
>+    case EditAction::TypingInsertParagraph:
>+    case EditAction::TypingInsertPendingComposition:
>+    case EditAction::TypingInsertFinalComposition:
>+        return UI_STRING_KEY_INTERNAL("Typing", "Typing (Undo action name)", "Undo action name");
>+    case EditAction::CreateLink: return UI_STRING_KEY_INTERNAL("Create Link", "Create Link (Undo action name)", "Undo action name");
>+    case EditAction::Unlink: return UI_STRING_KEY_INTERNAL("Unlink", "Unlink (Undo action name)", "Undo action name");
>+    case EditAction::InsertOrderedList:
>+    case EditAction::InsertUnorderedList:
>+        return UI_STRING_KEY_INTERNAL("Insert List", "Insert List (Undo action name)", "Undo action name");
>+    case EditAction::FormatBlock: return UI_STRING_KEY_INTERNAL("Formatting", "Format Block (Undo action name)", "Undo action name");
>+    case EditAction::Indent: return UI_STRING_KEY_INTERNAL("Indent", "Indent (Undo action name)", "Undo action name");
>+    case EditAction::Outdent: return UI_STRING_KEY_INTERNAL("Outdent", "Outdent (Undo action name)", "Undo action name");
>+    case EditAction::Bold: return UI_STRING_KEY_INTERNAL("Bold", "Bold (Undo action name)", "Undo action name");
>+    case EditAction::Italics: return UI_STRING_KEY_INTERNAL("Italics", "Italics (Undo action name)", "Undo action name");
>+    case EditAction::Delete: return UI_STRING_KEY_INTERNAL("Delete", "Delete (Undo action name)", "Undo action name");
>+    case EditAction::Dictation: return UI_STRING_KEY_INTERNAL("Dictation", "Dictation (Undo action name)", "Undo action name");
>     }
>     return nil;
> }
>diff --git a/Source/WebKitLegacy/mac/WebView/WebHTMLView.mm b/Source/WebKitLegacy/mac/WebView/WebHTMLView.mm
>index fb855005a16f55a52ccf91edf41af5f27c7a0e12..192e183513c0bed874c499f065ecc3a243ea31ed 100644
>--- a/Source/WebKitLegacy/mac/WebView/WebHTMLView.mm
>+++ b/Source/WebKitLegacy/mac/WebView/WebHTMLView.mm
>@@ -5297,7 +5297,7 @@ static RefPtr<KeyboardEvent> currentKeyboardEvent(Frame* coreFrame)
> 
>     // Read RTF with font attributes from the pasteboard.
>     // Maybe later we should add a pasteboard type that contains CSS text for "native" copy and paste font.
>-    [self _applyStyleToSelection:[self _styleFromFontAttributes:[self _fontAttributesFromFontPasteboard]] withUndoAction:EditActionPasteFont];
>+    [self _applyStyleToSelection:[self _styleFromFontAttributes:[self _fontAttributesFromFontPasteboard]] withUndoAction:EditAction::PasteFont];
> }
> 
> - (void)pasteAsRichText:(id)sender
>@@ -5313,14 +5313,14 @@ static RefPtr<KeyboardEvent> currentKeyboardEvent(Frame* coreFrame)
> {
>     COMMAND_PROLOGUE
> 
>-    [self _applyEditingStyleToSelection:computedFontChanges(NSFontManager.sharedFontManager).createEditingStyle() withUndoAction:EditActionSetFont];
>+    [self _applyEditingStyleToSelection:computedFontChanges(NSFontManager.sharedFontManager).createEditingStyle() withUndoAction:EditAction::SetFont];
> }
> 
> - (void)changeAttributes:(id)sender
> {
>     COMMAND_PROLOGUE
> 
>-    [self _applyEditingStyleToSelection:computedFontAttributeChanges(NSFontManager.sharedFontManager, sender).createEditingStyle() withUndoAction:EditActionChangeAttributes];
>+    [self _applyEditingStyleToSelection:computedFontAttributeChanges(NSFontManager.sharedFontManager, sender).createEditingStyle() withUndoAction:EditAction::ChangeAttributes];
> }
> 
> - (DOMCSSStyleDeclaration *)_styleFromColorPanelWithSelector:(SEL)selector
>@@ -5336,8 +5336,8 @@ static RefPtr<KeyboardEvent> currentKeyboardEvent(Frame* coreFrame)
> - (EditAction)_undoActionFromColorPanelWithSelector:(SEL)selector
> {
>     if (selector == @selector(setBackgroundColor:))
>-        return EditActionSetBackgroundColor;    
>-    return EditActionSetColor;
>+        return EditAction::SetBackgroundColor;
>+    return EditAction::SetColor;
> }
> 
> - (void)_changeCSSColorUsingSelector:(SEL)selector inRange:(DOMRange *)range
>@@ -5381,8 +5381,7 @@ static RefPtr<KeyboardEvent> currentKeyboardEvent(Frame* coreFrame)
>     // AppKit will have to be revised to allow this to work with anything that isn't an 
>     // NSTextView. However, this might not be required for Tiger, since the background-color 
>     // changing box in the font panel doesn't work in Mail (3674481), though it does in TextEdit.
>-    [self _applyStyleToSelection:[self _styleFromColorPanelWithSelector:@selector(setColor:)] 
>-                  withUndoAction:EditActionSetColor];
>+    [self _applyStyleToSelection:[self _styleFromColorPanelWithSelector:@selector(setColor:)] withUndoAction:EditAction::SetColor];
> }
> 
> #endif // PLATFORM(MAC)
>diff --git a/Source/WebKitLegacy/mac/WebView/WebView.mm b/Source/WebKitLegacy/mac/WebView/WebView.mm
>index 09d9a69bd568863d1ab871016585c597a7d34a7f..f24ea727023d1b46023b44f4817e863e546c90dc 100644
>--- a/Source/WebKitLegacy/mac/WebView/WebView.mm
>+++ b/Source/WebKitLegacy/mac/WebView/WebView.mm
>@@ -8254,7 +8254,7 @@ static NSAppleEventDescriptor* aeDescFromJSValue(ExecState* exec, JSC::JSValue j
> {
>     // We don't know enough at thls level to pass in a relevant WebUndoAction; we'd have to
>     // change the API to allow this.
>-    [[self _selectedOrMainFrame] _setTypingStyle:style withUndoAction:EditActionUnspecified];
>+    [[self _selectedOrMainFrame] _setTypingStyle:style withUndoAction:EditAction::Unspecified];
> }
> 
> - (DOMCSSStyleDeclaration *)typingStyle
>diff --git a/Source/WebKitLegacy/win/WebCoreSupport/WebEditorClient.cpp b/Source/WebKitLegacy/win/WebCoreSupport/WebEditorClient.cpp
>index 56e7cf0b48c9a5422ff0add67468fe8dec4dac0e..b58de5b138c2cfc70590577a281af95b10308186 100644
>--- a/Source/WebKitLegacy/win/WebCoreSupport/WebEditorClient.cpp
>+++ b/Source/WebKitLegacy/win/WebCoreSupport/WebEditorClient.cpp
>@@ -573,59 +573,59 @@ ULONG WebEditorUndoCommand::Release()
> static String undoNameForEditAction(EditAction editAction)
> {
>     switch (editAction) {
>-    case EditActionUnspecified:
>-    case EditActionInsertReplacement:
>+    case EditAction::Unspecified:
>+    case EditAction::InsertReplacement:
>         return String();
>-    case EditActionSetColor: return WEB_UI_STRING_KEY("Set Color", "Set Color (Undo action name)", "Undo action name");
>-    case EditActionSetBackgroundColor: return WEB_UI_STRING_KEY("Set Background Color", "Set Background Color (Undo action name)", "Undo action name");
>-    case EditActionTurnOffKerning: return WEB_UI_STRING_KEY("Turn Off Kerning", "Turn Off Kerning (Undo action name)", "Undo action name");
>-    case EditActionTightenKerning: return WEB_UI_STRING_KEY("Tighten Kerning", "Tighten Kerning (Undo action name)", "Undo action name");
>-    case EditActionLoosenKerning: return WEB_UI_STRING_KEY("Loosen Kerning", "Loosen Kerning (Undo action name)", "Undo action name");
>-    case EditActionUseStandardKerning: return WEB_UI_STRING_KEY("Use Standard Kerning", "Use Standard Kerning (Undo action name)", "Undo action name");
>-    case EditActionTurnOffLigatures: return WEB_UI_STRING_KEY("Turn Off Ligatures", "Turn Off Ligatures (Undo action name)", "Undo action name");
>-    case EditActionUseStandardLigatures: return WEB_UI_STRING_KEY("Use Standard Ligatures", "Use Standard Ligatures (Undo action name)", "Undo action name");
>-    case EditActionUseAllLigatures: return WEB_UI_STRING_KEY("Use All Ligatures", "Use All Ligatures (Undo action name)", "Undo action name");
>-    case EditActionRaiseBaseline: return WEB_UI_STRING_KEY("Raise Baseline", "Raise Baseline (Undo action name)", "Undo action name");
>-    case EditActionLowerBaseline: return WEB_UI_STRING_KEY("Lower Baseline", "Lower Baseline (Undo action name)", "Undo action name");
>-    case EditActionSetTraditionalCharacterShape: return WEB_UI_STRING_KEY("Set Traditional Character Shape", "Set Traditional Character Shape (Undo action name)", "Undo action name");
>-    case EditActionSetFont: return WEB_UI_STRING_KEY("Set Font", "Set Font (Undo action name)", "Undo action name");
>-    case EditActionChangeAttributes: return WEB_UI_STRING_KEY("Change Attributes", "Change Attributes (Undo action name)", "Undo action name");
>-    case EditActionAlignLeft: return WEB_UI_STRING_KEY("Align Left", "Align Left (Undo action name)", "Undo action name");
>-    case EditActionAlignRight: return WEB_UI_STRING_KEY("Align Right", "Align Right (Undo action name)", "Undo action name");
>-    case EditActionCenter: return WEB_UI_STRING_KEY("Center", "Center (Undo action name)", "Undo action name");
>-    case EditActionJustify: return WEB_UI_STRING_KEY("Justify", "Justify (Undo action name)", "Undo action name");
>-    case EditActionSetWritingDirection: return WEB_UI_STRING_KEY("Set Writing Direction", "Set Writing Direction (Undo action name)", "Undo action name");
>-    case EditActionSubscript: return WEB_UI_STRING_KEY("Subscript", "Subscript (Undo action name)", "Undo action name");
>-    case EditActionSuperscript: return WEB_UI_STRING_KEY("Superscript", "Superscript (Undo action name)", "Undo action name");
>-    case EditActionBold: return WEB_UI_STRING_KEY("Bold", "Bold (Undo action name)", "Undo action name");
>-    case EditActionItalics: return WEB_UI_STRING_KEY("Italics", "Italics (Undo action name)", "Undo action name");
>-    case EditActionUnderline: return WEB_UI_STRING_KEY("Underline", "Underline (Undo action name)", "Undo action name");
>-    case EditActionOutline: return WEB_UI_STRING_KEY("Outline", "Outline (Undo action name)", "Undo action name");
>-    case EditActionUnscript: return WEB_UI_STRING_KEY("Unscript", "Unscript (Undo action name)", "Undo action name");
>-    case EditActionDeleteByDrag: return WEB_UI_STRING_KEY("Drag", "Drag (Undo action name)", "Undo action name");
>-    case EditActionCut: return WEB_UI_STRING_KEY("Cut", "Cut (Undo action name)", "Undo action name");
>-    case EditActionPaste: return WEB_UI_STRING_KEY("Paste", "Paste (Undo action name)", "Undo action name");
>-    case EditActionPasteFont: return WEB_UI_STRING_KEY("Paste Font", "Paste Font (Undo action name)", "Undo action name");
>-    case EditActionPasteRuler: return WEB_UI_STRING_KEY("Paste Ruler", "Paste Ruler (Undo action name)", "Undo action name");
>-    case EditActionTypingDeleteSelection:
>-    case EditActionTypingDeleteBackward:
>-    case EditActionTypingDeleteForward:
>-    case EditActionTypingDeleteWordBackward:
>-    case EditActionTypingDeleteWordForward:
>-    case EditActionTypingDeleteLineBackward:
>-    case EditActionTypingDeleteLineForward:
>-    case EditActionTypingInsertText:
>-    case EditActionTypingInsertLineBreak:
>-    case EditActionTypingInsertParagraph:
>+    case EditAction::SetColor: return WEB_UI_STRING_KEY("Set Color", "Set Color (Undo action name)", "Undo action name");
>+    case EditAction::SetBackgroundColor: return WEB_UI_STRING_KEY("Set Background Color", "Set Background Color (Undo action name)", "Undo action name");
>+    case EditAction::TurnOffKerning: return WEB_UI_STRING_KEY("Turn Off Kerning", "Turn Off Kerning (Undo action name)", "Undo action name");
>+    case EditAction::TightenKerning: return WEB_UI_STRING_KEY("Tighten Kerning", "Tighten Kerning (Undo action name)", "Undo action name");
>+    case EditAction::LoosenKerning: return WEB_UI_STRING_KEY("Loosen Kerning", "Loosen Kerning (Undo action name)", "Undo action name");
>+    case EditAction::UseStandardKerning: return WEB_UI_STRING_KEY("Use Standard Kerning", "Use Standard Kerning (Undo action name)", "Undo action name");
>+    case EditAction::TurnOffLigatures: return WEB_UI_STRING_KEY("Turn Off Ligatures", "Turn Off Ligatures (Undo action name)", "Undo action name");
>+    case EditAction::UseStandardLigatures: return WEB_UI_STRING_KEY("Use Standard Ligatures", "Use Standard Ligatures (Undo action name)", "Undo action name");
>+    case EditAction::UseAllLigatures: return WEB_UI_STRING_KEY("Use All Ligatures", "Use All Ligatures (Undo action name)", "Undo action name");
>+    case EditAction::RaiseBaseline: return WEB_UI_STRING_KEY("Raise Baseline", "Raise Baseline (Undo action name)", "Undo action name");
>+    case EditAction::LowerBaseline: return WEB_UI_STRING_KEY("Lower Baseline", "Lower Baseline (Undo action name)", "Undo action name");
>+    case EditAction::SetTraditionalCharacterShape: return WEB_UI_STRING_KEY("Set Traditional Character Shape", "Set Traditional Character Shape (Undo action name)", "Undo action name");
>+    case EditAction::SetFont: return WEB_UI_STRING_KEY("Set Font", "Set Font (Undo action name)", "Undo action name");
>+    case EditAction::ChangeAttributes: return WEB_UI_STRING_KEY("Change Attributes", "Change Attributes (Undo action name)", "Undo action name");
>+    case EditAction::AlignLeft: return WEB_UI_STRING_KEY("Align Left", "Align Left (Undo action name)", "Undo action name");
>+    case EditAction::AlignRight: return WEB_UI_STRING_KEY("Align Right", "Align Right (Undo action name)", "Undo action name");
>+    case EditAction::Center: return WEB_UI_STRING_KEY("Center", "Center (Undo action name)", "Undo action name");
>+    case EditAction::Justify: return WEB_UI_STRING_KEY("Justify", "Justify (Undo action name)", "Undo action name");
>+    case EditAction::SetWritingDirection: return WEB_UI_STRING_KEY("Set Writing Direction", "Set Writing Direction (Undo action name)", "Undo action name");
>+    case EditAction::Subscript: return WEB_UI_STRING_KEY("Subscript", "Subscript (Undo action name)", "Undo action name");
>+    case EditAction::Superscript: return WEB_UI_STRING_KEY("Superscript", "Superscript (Undo action name)", "Undo action name");
>+    case EditAction::Bold: return WEB_UI_STRING_KEY("Bold", "Bold (Undo action name)", "Undo action name");
>+    case EditAction::Italics: return WEB_UI_STRING_KEY("Italics", "Italics (Undo action name)", "Undo action name");
>+    case EditAction::Underline: return WEB_UI_STRING_KEY("Underline", "Underline (Undo action name)", "Undo action name");
>+    case EditAction::Outline: return WEB_UI_STRING_KEY("Outline", "Outline (Undo action name)", "Undo action name");
>+    case EditAction::Unscript: return WEB_UI_STRING_KEY("Unscript", "Unscript (Undo action name)", "Undo action name");
>+    case EditAction::DeleteByDrag: return WEB_UI_STRING_KEY("Drag", "Drag (Undo action name)", "Undo action name");
>+    case EditAction::Cut: return WEB_UI_STRING_KEY("Cut", "Cut (Undo action name)", "Undo action name");
>+    case EditAction::Paste: return WEB_UI_STRING_KEY("Paste", "Paste (Undo action name)", "Undo action name");
>+    case EditAction::PasteFont: return WEB_UI_STRING_KEY("Paste Font", "Paste Font (Undo action name)", "Undo action name");
>+    case EditAction::PasteRuler: return WEB_UI_STRING_KEY("Paste Ruler", "Paste Ruler (Undo action name)", "Undo action name");
>+    case EditAction::TypingDeleteSelection:
>+    case EditAction::TypingDeleteBackward:
>+    case EditAction::TypingDeleteForward:
>+    case EditAction::TypingDeleteWordBackward:
>+    case EditAction::TypingDeleteWordForward:
>+    case EditAction::TypingDeleteLineBackward:
>+    case EditAction::TypingDeleteLineForward:
>+    case EditAction::TypingInsertText:
>+    case EditAction::TypingInsertLineBreak:
>+    case EditAction::TypingInsertParagraph:
>         return WEB_UI_STRING_KEY("Typing", "Typing (Undo action name)", "Undo action name");
>-    case EditActionCreateLink: return WEB_UI_STRING_KEY("Create Link", "Create Link (Undo action name)", "Undo action name");
>-    case EditActionUnlink: return WEB_UI_STRING_KEY("Unlink", "Unlink (Undo action name)", "Undo action name");
>-    case EditActionInsertUnorderedList:
>-    case EditActionInsertOrderedList:
>+    case EditAction::CreateLink: return WEB_UI_STRING_KEY("Create Link", "Create Link (Undo action name)", "Undo action name");
>+    case EditAction::Unlink: return WEB_UI_STRING_KEY("Unlink", "Unlink (Undo action name)", "Undo action name");
>+    case EditAction::InsertUnorderedList:
>+    case EditAction::InsertOrderedList:
>         return WEB_UI_STRING_KEY("Insert List", "Insert List (Undo action name)", "Undo action name");
>-    case EditActionFormatBlock: return WEB_UI_STRING_KEY("Formatting", "Format Block (Undo action name)", "Undo action name");
>-    case EditActionIndent: return WEB_UI_STRING_KEY("Indent", "Indent (Undo action name)", "Undo action name");
>-    case EditActionOutdent: return WEB_UI_STRING_KEY("Outdent", "Outdent (Undo action name)", "Undo action name");
>+    case EditAction::FormatBlock: return WEB_UI_STRING_KEY("Formatting", "Format Block (Undo action name)", "Undo action name");
>+    case EditAction::Indent: return WEB_UI_STRING_KEY("Indent", "Indent (Undo action name)", "Undo action name");
>+    case EditAction::Outdent: return WEB_UI_STRING_KEY("Outdent", "Outdent (Undo action name)", "Undo action name");
>     }
>     return String();
> }
>diff --git a/Tools/ChangeLog b/Tools/ChangeLog
>index a2d3dc091241d461b037efc295ecea71dcf338cc..ec012d70b39d17f9b3882e2ae16adc6012f203ca 100644
>--- a/Tools/ChangeLog
>+++ b/Tools/ChangeLog
>@@ -1,3 +1,54 @@
>+2018-09-06  Wenson Hsieh  <wenson_hsieh@apple.com>
>+
>+        [macOS] [WK2] Support changing attributes for selected text (text shadow, underline, strike-through)
>+        https://bugs.webkit.org/show_bug.cgi?id=189356
>+        <rdar://problem/44185674>
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        Adds a new API test to verify that some font attributes (text shadow, underline, and strike-through) can be
>+        added and removed using NSFontPanel.
>+
>+        * TestWebKitAPI/TestWebKitAPI.xcodeproj/project.pbxproj:
>+        * TestWebKitAPI/Tests/mac/FontManagerTests.mm:
>+
>+        Add the new API test.
>+
>+        (TestWebKitAPI::TEST):
>+        * TestWebKitAPI/cocoa/TestWKWebView.h:
>+        * TestWebKitAPI/mac/NSFontPanelTesting.h: Added.
>+        * TestWebKitAPI/mac/NSFontPanelTesting.mm: Added.
>+
>+        Introduce a new file that extends NSFontPanel with some additional testing functionality. This includes the
>+        ability to interact with the text shadow toggle button, choose the text shadow blur radius and opacity, and
>+        change underline and strike-through styles.
>+
>+        (findSubviewOfClass):
>+        (findMenuItemWithTitle):
>+        (-[NSFontPanel fontEffectsBox]):
>+
>+        NSFontEffectsBox (an internal AppKit class) is the sender in the case where -changeAttributes: is invoked
>+        through interaction with the font panel. To simulate this for testing, grab this font effects box and pass it
>+        directory to -changeAttributes:.
>+
>+        (-[NSFontPanel chooseUnderlineMenuItemWithTitle:]):
>+        (-[NSFontPanel chooseStrikeThroughMenuItemWithTitle:]):
>+
>+        The supported values for these menu items are "none" and "single", which adds a single underline or
>+        strike-through to selected text. We grab these menu items by asking for the font panel's NSToolbar, and finding
>+        the relevant menu items via toolbar item identifiers.
>+
>+        (-[NSFontPanel _didChangeAttributes]):
>+        (-[NSFontPanel shadowBlurSlider]):
>+        (-[NSFontPanel shadowOpacitySlider]):
>+        (-[NSFontPanel shadowToggleButton]):
>+        (-[NSFontPanel toggleShadow]):
>+        (-[NSFontPanel shadowOpacity]):
>+        (-[NSFontPanel setShadowOpacity:]):
>+        (-[NSFontPanel shadowBlur]):
>+        (-[NSFontPanel setShadowBlur:]):
>+        (-[NSFontPanel _toolbarItemWithIdentifier:]):
>+
> 2018-09-06  Wenson Hsieh  <wenson_hsieh@apple.com>
> 
>         [macOS] Cannot change font size at selection until font panel is shown
>diff --git a/Tools/TestWebKitAPI/TestWebKitAPI.xcodeproj/project.pbxproj b/Tools/TestWebKitAPI/TestWebKitAPI.xcodeproj/project.pbxproj
>index 236777a8358ece327611b7ce5b652f92cc1c0379..4cb5ecca4c4a7190cd1e34eac6f1441c9b7d15c4 100644
>--- a/Tools/TestWebKitAPI/TestWebKitAPI.xcodeproj/project.pbxproj
>+++ b/Tools/TestWebKitAPI/TestWebKitAPI.xcodeproj/project.pbxproj
>@@ -794,6 +794,7 @@
> 		F42DA5161D8CEFE400336F40 /* large-input-field-focus-onload.html in Copy Resources */ = {isa = PBXBuildFile; fileRef = F42DA5151D8CEFDB00336F40 /* large-input-field-focus-onload.html */; };
> 		F43E3BBF20DADA1E00A4E7ED /* WKScrollViewTests.mm in Sources */ = {isa = PBXBuildFile; fileRef = F43E3BBE20DADA1E00A4E7ED /* WKScrollViewTests.mm */; };
> 		F43E3BC120DADBC500A4E7ED /* fixed-nav-bar.html in Copy Resources */ = {isa = PBXBuildFile; fileRef = F43E3BC020DADB8000A4E7ED /* fixed-nav-bar.html */; };
>+		F442851D2140DF2900CCDA22 /* NSFontPanelTesting.mm in Sources */ = {isa = PBXBuildFile; fileRef = F442851C2140DF2900CCDA22 /* NSFontPanelTesting.mm */; };
> 		F4451C761EB8FD890020C5DA /* two-paragraph-contenteditable.html in Copy Resources */ = {isa = PBXBuildFile; fileRef = F4451C751EB8FD7C0020C5DA /* two-paragraph-contenteditable.html */; };
> 		F44C79FF20F9E8710014478C /* ParserYieldTokenTests.mm in Sources */ = {isa = PBXBuildFile; fileRef = F44C79FE20F9E8710014478C /* ParserYieldTokenTests.mm */; };
> 		F44C7A0020F9EEBF0014478C /* ParserYieldTokenPlugIn.mm in Sources */ = {isa = PBXBuildFile; fileRef = F44C79FB20F9E50C0014478C /* ParserYieldTokenPlugIn.mm */; };
>@@ -2035,6 +2036,8 @@
> 		F42DA5151D8CEFDB00336F40 /* large-input-field-focus-onload.html */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.html; name = "large-input-field-focus-onload.html"; path = "Tests/WebKitCocoa/large-input-field-focus-onload.html"; sourceTree = SOURCE_ROOT; };
> 		F43E3BBE20DADA1E00A4E7ED /* WKScrollViewTests.mm */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.objcpp; path = WKScrollViewTests.mm; sourceTree = "<group>"; };
> 		F43E3BC020DADB8000A4E7ED /* fixed-nav-bar.html */ = {isa = PBXFileReference; lastKnownFileType = text.html; path = "fixed-nav-bar.html"; sourceTree = "<group>"; };
>+		F442851B2140DF2900CCDA22 /* NSFontPanelTesting.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = NSFontPanelTesting.h; sourceTree = "<group>"; };
>+		F442851C2140DF2900CCDA22 /* NSFontPanelTesting.mm */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.objcpp; path = NSFontPanelTesting.mm; sourceTree = "<group>"; };
> 		F4451C751EB8FD7C0020C5DA /* two-paragraph-contenteditable.html */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.html; path = "two-paragraph-contenteditable.html"; sourceTree = "<group>"; };
> 		F44C79FB20F9E50C0014478C /* ParserYieldTokenPlugIn.mm */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.objcpp; path = ParserYieldTokenPlugIn.mm; sourceTree = "<group>"; };
> 		F44C79FD20F9E8710014478C /* ParserYieldTokenTests.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = ParserYieldTokenTests.h; sourceTree = "<group>"; };
>@@ -3149,6 +3152,8 @@
> 				1AEDE22413E5E7A000E62FE8 /* InjectedBundleControllerMac.mm */,
> 				C081224013FC172400DC39AE /* JavaScriptTestMac.mm */,
> 				2E7765CE16C4D81100BA2BB1 /* mainMac.mm */,
>+				F442851B2140DF2900CCDA22 /* NSFontPanelTesting.h */,
>+				F442851C2140DF2900CCDA22 /* NSFontPanelTesting.mm */,
> 				BC131884117114B600B69727 /* PlatformUtilitiesMac.mm */,
> 				BC90955C125548AA00083756 /* PlatformWebViewMac.mm */,
> 				C081224313FC19EC00DC39AE /* SyntheticBackingScaleFactorWindow.h */,
>@@ -3880,6 +3885,7 @@
> 				CD2D0D1A213465560018C784 /* NowPlaying.mm in Sources */,
> 				2ECFF5551D9B12F800B55394 /* NowPlayingControlsTests.mm in Sources */,
> 				A10F047E1E3AD29C00C95E19 /* NSFileManagerExtras.mm in Sources */,
>+				F442851D2140DF2900CCDA22 /* NSFontPanelTesting.mm in Sources */,
> 				37A22AA71DCAA27200AFBFC4 /* ObservedRenderingProgressEventsAfterCrash.mm in Sources */,
> 				7CCE7F251A411AF600447C4C /* OpenAndCloseWindow.mm in Sources */,
> 				CEBCA12F1E3A660100C73293 /* OverrideContentSecurityPolicy.mm in Sources */,
>diff --git a/Tools/TestWebKitAPI/Tests/mac/FontManagerTests.mm b/Tools/TestWebKitAPI/Tests/mac/FontManagerTests.mm
>index d15a0c35a698d1d60174737eac6293cd9c83ccd8..22bf87c6abe5b0cc03319066bb01b0ce10a718cf 100644
>--- a/Tools/TestWebKitAPI/Tests/mac/FontManagerTests.mm
>+++ b/Tools/TestWebKitAPI/Tests/mac/FontManagerTests.mm
>@@ -27,6 +27,8 @@
> 
> #if PLATFORM(MAC) && WK_API_ENABLED
> 
>+#import "AppKitSPI.h"
>+#import "NSFontPanelTesting.h"
> #import "PlatformUtilities.h"
> #import "TestWKWebView.h"
> #import <WebKit/WKWebViewPrivate.h>
>@@ -178,6 +180,74 @@ TEST(FontManagerTests, ChangeFontWithPanel)
>     EXPECT_EQ(largeItalicLightAvenirFont, fontManager.selectedFont);
> }
> 
>+TEST(FontManagerTests, ChangeAttributesWithFontEffectsBox)
>+{
>+    NSFontManager *fontManager = [NSFontManager sharedFontManager];
>+    auto webView = webViewForFontManagerTesting(fontManager);
>+
>+    NSFontPanel *fontPanel = [fontManager fontPanel:YES];
>+    [fontPanel setIsVisible:YES];
>+
>+    auto textDecorationsAroundSelection = [webView] {
>+        NSString *decorationsAtStart = [webView stylePropertyAtSelectionStart:@"-webkit-text-decorations-in-effect"];
>+        NSString *decorationsAtEnd = [webView stylePropertyAtSelectionEnd:@"-webkit-text-decorations-in-effect"];
>+        if ([decorationsAtStart isEqualToString:decorationsAtEnd] || decorationsAtStart == decorationsAtEnd)
>+            return decorationsAtStart;
>+        return [NSString stringWithFormat:@"(%@, %@)", decorationsAtStart, decorationsAtEnd];
>+    };
>+
>+    auto textShadowAroundSelection = [webView] {
>+        NSString *shadowAtStart = [webView stylePropertyAtSelectionStart:@"text-shadow"];
>+        NSString *shadowAtEnd = [webView stylePropertyAtSelectionEnd:@"text-shadow"];
>+        if ([shadowAtStart isEqualToString:shadowAtEnd] || shadowAtStart == shadowAtEnd)
>+            return shadowAtStart;
>+        return [NSString stringWithFormat:@"(%@, %@)", shadowAtStart, shadowAtEnd];
>+    };
>+
>+    [webView selectWord:nil];
>+    [fontPanel chooseUnderlineMenuItemWithTitle:@"single"];
>+    EXPECT_WK_STREQ("foo", [webView selectedText]);
>+    EXPECT_WK_STREQ("underline", textDecorationsAroundSelection());
>+
>+    [fontPanel chooseUnderlineMenuItemWithTitle:@"none"];
>+    EXPECT_WK_STREQ("none", textDecorationsAroundSelection());
>+
>+    [webView selectNextWord];
>+    [fontPanel chooseStrikeThroughMenuItemWithTitle:@"single"];
>+    EXPECT_WK_STREQ("bar", [webView selectedText]);
>+    EXPECT_WK_STREQ("line-through", textDecorationsAroundSelection());
>+
>+    [fontPanel chooseStrikeThroughMenuItemWithTitle:@"none"];
>+    EXPECT_WK_STREQ("none", textDecorationsAroundSelection());
>+
>+    [webView selectNextWord];
>+    fontPanel.shadowBlur = 8;
>+    fontPanel.shadowOpacity = 1;
>+    [fontPanel toggleShadow];
>+    EXPECT_WK_STREQ("baz", [webView selectedText]);
>+    EXPECT_WK_STREQ("rgb(0, 0, 0) 0px 1px 8px", textShadowAroundSelection());
>+
>+    [fontPanel toggleShadow];
>+    EXPECT_WK_STREQ("none", textShadowAroundSelection());
>+
>+    // Now combine all three attributes together.
>+    [webView selectAll:nil];
>+    fontPanel.shadowBlur = 5;
>+    fontPanel.shadowOpacity = 0.2;
>+    [fontPanel toggleShadow];
>+    [fontPanel chooseUnderlineMenuItemWithTitle:@"single"];
>+    [fontPanel chooseStrikeThroughMenuItemWithTitle:@"single"];
>+    EXPECT_WK_STREQ("foo bar baz", [webView selectedText]);
>+    EXPECT_WK_STREQ("rgba(0, 0, 0, 0.2) 0px 1px 5px", textShadowAroundSelection());
>+    EXPECT_WK_STREQ("underline line-through", textDecorationsAroundSelection());
>+
>+    [fontPanel toggleShadow];
>+    [fontPanel chooseUnderlineMenuItemWithTitle:@"none"];
>+    [fontPanel chooseStrikeThroughMenuItemWithTitle:@"none"];
>+    EXPECT_WK_STREQ("none", textShadowAroundSelection());
>+    EXPECT_WK_STREQ("none", textDecorationsAroundSelection());
>+}
>+
> } // namespace TestWebKitAPI
> 
> #endif // PLATFORM(MAC) && WK_API_ENABLED
>diff --git a/Tools/TestWebKitAPI/cocoa/TestWKWebView.h b/Tools/TestWebKitAPI/cocoa/TestWKWebView.h
>index 613dfae8aa1dff764c773cfc5014e5c3e1638166..5f169d9b4d74da5713e3ea3c8185a2a72a8ad591 100644
>--- a/Tools/TestWebKitAPI/cocoa/TestWKWebView.h
>+++ b/Tools/TestWebKitAPI/cocoa/TestWKWebView.h
>@@ -37,6 +37,7 @@
> @interface WKWebView (AdditionalDeclarations)
> #if PLATFORM(MAC)
> - (void)paste:(id)sender;
>+- (void)changeAttributes:(id)sender;
> #endif
> @end
> 
>diff --git a/Tools/TestWebKitAPI/mac/NSFontPanelTesting.h b/Tools/TestWebKitAPI/mac/NSFontPanelTesting.h
>new file mode 100644
>index 0000000000000000000000000000000000000000..0b04d48f3e985fa221da61c69da1beb286141d9b
>--- /dev/null
>+++ b/Tools/TestWebKitAPI/mac/NSFontPanelTesting.h
>@@ -0,0 +1,43 @@
>+/*
>+ * 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
>+
>+#if PLATFORM(MAC) && WK_API_ENABLED
>+
>+#import <AppKit/AppKit.h>
>+
>+@interface NSFontPanel (TestWebKitAPI)
>+
>+@property (nonatomic) double shadowOpacity;
>+@property (nonatomic) double shadowBlur;
>+
>+- (void)toggleShadow;
>+- (void)chooseUnderlineMenuItemWithTitle:(NSString *)itemTitle;
>+- (void)chooseStrikeThroughMenuItemWithTitle:(NSString *)itemTitle;
>+
>+@end
>+
>+#endif
>diff --git a/Tools/TestWebKitAPI/mac/NSFontPanelTesting.mm b/Tools/TestWebKitAPI/mac/NSFontPanelTesting.mm
>new file mode 100644
>index 0000000000000000000000000000000000000000..681d1d578b0a2ff441fd190e77919b17cbdded7f
>--- /dev/null
>+++ b/Tools/TestWebKitAPI/mac/NSFontPanelTesting.mm
>@@ -0,0 +1,153 @@
>+/*
>+ * 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.
>+ */
>+
>+#include "config.h"
>+#include "NSFontPanelTesting.h"
>+
>+#if PLATFORM(MAC) && WK_API_ENABLED
>+
>+#import <objc/runtime.h>
>+
>+#if __MAC_OS_X_VERSION_MAX_ALLOWED < 101300
>+static const NSCellStateValue NSControlStateValueOff = NSOffState;
>+static const NSCellStateValue NSControlStateValueOn = NSOnState;
>+#endif
>+
>+@interface NSBox (NSFontEffectsBox)
>+// Invoked after a font effect (e.g. single strike-through) is chosen.
>+- (void)_openEffectsButton:(id)sender;
>+@end
>+
>+static NSView *findSubviewOfClass(NSView *view, Class targetClass)
>+{
>+    if ([view isKindOfClass:targetClass])
>+        return view;
>+
>+    for (NSView *subview in view.subviews) {
>+        if (NSView *targetView = findSubviewOfClass(subview, targetClass))
>+            return targetView;
>+    }
>+    return nil;
>+}
>+
>+static NSMenuItem *findMenuItemWithTitle(NSPopUpButton *button, NSString *title)
>+{
>+    for (NSMenuItem *item in button.itemArray) {
>+        if ([item.title.lowercaseString isEqualToString:title.lowercaseString])
>+            return item;
>+    }
>+    return nil;
>+}
>+
>+@implementation NSFontPanel (TestWebKitAPI)
>+
>+- (NSBox *)fontEffectsBox
>+{
>+    void* result = nullptr;
>+    object_getInstanceVariable(self, "_fontEffectsBox", &result);
>+    return static_cast<NSBox *>(result);
>+}
>+
>+- (void)chooseUnderlineMenuItemWithTitle:(NSString *)itemTitle
>+{
>+    NSPopUpButton *button = (NSPopUpButton *)[self _toolbarItemWithIdentifier:@"NSFontPanelUnderlineToolbarItem"].view;
>+    [button selectItem:findMenuItemWithTitle(button, itemTitle)];
>+    [self.fontEffectsBox _openEffectsButton:button];
>+    [self _didChangeAttributes];
>+}
>+
>+- (void)chooseStrikeThroughMenuItemWithTitle:(NSString *)itemTitle
>+{
>+    NSPopUpButton *button = (NSPopUpButton *)[self _toolbarItemWithIdentifier:@"NSFontPanelStrikethroughToolbarItem"].view;
>+    [button selectItem:findMenuItemWithTitle(button, itemTitle)];
>+    [self.fontEffectsBox _openEffectsButton:button];
>+    [self _didChangeAttributes];
>+}
>+
>+- (void)_didChangeAttributes
>+{
>+    NSFontManager *fontManager = NSFontManager.sharedFontManager;
>+    if (self == [fontManager fontPanel:NO])
>+        [fontManager.target changeAttributes:self.fontEffectsBox];
>+}
>+
>+- (NSSlider *)shadowBlurSlider
>+{
>+    return (NSSlider *)findSubviewOfClass([self _toolbarItemWithIdentifier:@"NSFontPanelShadowBlurToolbarItem"].view, NSSlider.class);
>+}
>+
>+- (NSSlider *)shadowOpacitySlider
>+{
>+    return (NSSlider *)findSubviewOfClass([self _toolbarItemWithIdentifier:@"NSFontPanelShadowOpacityToolbarItem"].view, NSSlider.class);
>+}
>+
>+- (NSButton *)shadowToggleButton
>+{
>+    return (NSButton *)[self _toolbarItemWithIdentifier:@"NSFontPanelShadowToggleToolbarItem"].view;
>+}
>+
>+- (void)toggleShadow
>+{
>+    NSButton *shadowToggleButton = self.shadowToggleButton;
>+    shadowToggleButton.state = shadowToggleButton.state == NSControlStateValueOff ? NSControlStateValueOn : NSControlStateValueOff;
>+    [self _didChangeAttributes];
>+}
>+
>+- (double)shadowOpacity
>+{
>+    return self.shadowOpacitySlider.doubleValue;
>+}
>+
>+- (void)setShadowOpacity:(double)shadowOpacity
>+{
>+    self.shadowOpacitySlider.doubleValue = shadowOpacity;
>+    if (self.shadowToggleButton.state == NSControlStateValueOn)
>+        [self _didChangeAttributes];
>+}
>+
>+- (double)shadowBlur
>+{
>+    return self.shadowBlurSlider.doubleValue;
>+}
>+
>+- (void)setShadowBlur:(double)shadowBlur
>+{
>+    self.shadowBlurSlider.doubleValue = shadowBlur;
>+    if (self.shadowToggleButton.state == NSControlStateValueOn)
>+        [self _didChangeAttributes];
>+}
>+
>+- (NSToolbarItem *)_toolbarItemWithIdentifier:(NSString *)itemIdentifier
>+{
>+    for (NSToolbarItem *item in self.toolbar.items) {
>+        if ([item.itemIdentifier isEqualToString:itemIdentifier])
>+            return item;
>+    }
>+    return nil;
>+}
>+
>+@end
>+
>+#endif // PLATFORM(MAC) && WK_API_ENABLED

Actions: View | Formatted Diff | Diff

Attachments on bug 189383: 349089 | 349097