Changeset 207244 in webkit

Timestamp:

Oct 12, 2016 2:49:10 PM (8 years ago)

Author:

Wenson Hsieh

Message:

Add experimental support for the "formatForeColor" inputType
​https://bugs.webkit.org/show_bug.cgi?id=163348
<rdar://problem/28739334>

Reviewed by Ryosuke Niwa.

Source/WebCore:

Adds support for the "formatForeColor" attribute. This patch introduces a simple hook in Editor.cpp to extract
data for an input event from an EditingStyle when performing an editing action.

Test: fast/events/input-events-forecolor-data.html

• editing/EditCommand.cpp:

(WebCore::inputTypeNameForEditingAction):

• editing/Editor.cpp:

(WebCore::inputEventDataForEditingStyleAndAction):

Added a new static helper to compute the data attribute of an InputEvent when handling a style change.

(WebCore::Editor::computeAndSetTypingStyle):

LayoutTests:

Adds a new test verifying that input events with inputType "formatForeColor" are dispatched when changing
foreground color, and that their data attributes are as expected.

• fast/events/input-events-forecolor-data-expected.txt: Added.
• fast/events/input-events-forecolor-data.html: Added.
• platform/ios-simulator/TestExpectations:

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/fast/events/input-events-forecolor-data-expected.txt (added)
• LayoutTests/fast/events/input-events-forecolor-data.html (added)
• LayoutTests/platform/ios-simulator/TestExpectations (modified) (1 diff)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/editing/EditCommand.cpp (modified) (1 diff)
• Source/WebCore/editing/Editor.cpp (modified) (3 diffs)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2016-10-12  Wenson Hsieh  <wenson_hsieh@apple.com>
+
+        Add experimental support for the "formatForeColor" inputType
+        https://bugs.webkit.org/show_bug.cgi?id=163348
+        <rdar://problem/28739334>
+
+        Reviewed by Ryosuke Niwa.
+
+        Adds a new test verifying that input events with inputType "formatForeColor" are dispatched when changing
+        foreground color, and that their data attributes are as expected.
+
+        * fast/events/input-events-forecolor-data-expected.txt: Added.
+        * fast/events/input-events-forecolor-data.html: Added.
+        * platform/ios-simulator/TestExpectations:
+
 2016-10-12  Yusuke Suzuki  <utatane.tea@gmail.com>
 

trunk/LayoutTests/platform/ios-simulator/TestExpectations

@@ -1209 +1209 @@
 fast/events/input-events-paste-data.html [ Failure ]
 fast/events/input-events-typing-data.html [ Failure ]
+fast/events/input-events-forecolor-data.html [ Failure ]
 fast/events/before-input-events-prevent-default.html [ Failure ]
 fast/events/before-input-events-prevent-default-in-textfield.html [ Failure ]

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2016-10-12  Wenson Hsieh  <wenson_hsieh@apple.com>
+
+        Add experimental support for the "formatForeColor" inputType
+        https://bugs.webkit.org/show_bug.cgi?id=163348
+        <rdar://problem/28739334>
+
+        Reviewed by Ryosuke Niwa.
+
+        Adds support for the "formatForeColor" attribute. This patch introduces a simple hook in Editor.cpp to extract
+        data for an input event from an EditingStyle when performing an editing action.
+
+        Test: fast/events/input-events-forecolor-data.html
+
+        * editing/EditCommand.cpp:
+        (WebCore::inputTypeNameForEditingAction):
+        * editing/Editor.cpp:
+        (WebCore::inputEventDataForEditingStyleAndAction):
+
+        Added a new static helper to compute the data attribute of an InputEvent when handling a style change.
+
+        (WebCore::Editor::computeAndSetTypingStyle):
+
 2016-10-12  Chris Dumez  <cdumez@apple.com>
 

trunk/Source/WebCore/editing/EditCommand.cpp

@@ -57 +57 @@
     case EditActionUnderline:
         return ASCIILiteral("formatUnderline");
+    case EditActionSetColor:
+        return ASCIILiteral("formatForeColor");
     case EditActionDrag:
         return ASCIILiteral("deleteByDrag");

trunk/Source/WebCore/editing/Editor.cpp

@@ -133 +133 @@
 }
 
+static String inputEventDataForEditingStyleAndAction(EditingStyle& style, EditAction action)
+{
+    auto* properties = style.style();
+    if (!properties)
+        return { };
+
+    switch (action) {
+    case EditActionSetColor:
+        return properties->getPropertyValue(CSSPropertyColor);
+    default:
+        return { };
+    }
+}
+
 class ClearTextCommand : public DeleteSelectionCommand {
 public:
@@ -3108 +3122 @@
 
     String inputTypeName = inputTypeNameForEditingAction(editingAction);
+    String inputEventData = inputEventDataForEditingStyleAndAction(style, editingAction);
     auto* element = m_frame.selection().selection().rootEditableElement();
-    if (element && !dispatchBeforeInputEvent(*element, inputTypeName))
+    if (element && !dispatchBeforeInputEvent(*element, inputTypeName, inputEventData))
         return;
 
@@ -3126 +3141 @@
 
     if (element)
-        dispatchInputEvent(*element, inputTypeName);
+        dispatchInputEvent(*element, inputTypeName, inputEventData);
 
     // Set the remaining style as the typing style.