Changeset 282209 in webkit

Timestamp:

Sep 9, 2021, 4:38:34 AM (5 years ago)

Author:

commit-queue@webkit.org

Message:

Chromium test-case asserts with ASSERTION FAILED: propertyMissingOrEqualToNone
​https://bugs.webkit.org/show_bug.cgi?id=202904

Patch by Frederic Wang <​fwang@igalia.com> on 2021-09-09
Reviewed by Darin Adler.

Source/WebCore:

WebCore::CompositeEditCommand::moveParagraphs calls createFragmentFromMarkup with a parameter
AnnotateForInterchange set to No. As a consequence, StyledMarkupAccumulator::serializeNodes
will not call EditingStyle::wrappingStyleForSerialization (in order to remove
-webkit-text-decorations-in-effect) contrary to the assumption of the ASSERT in
propertyMissingOrEqualToNone. This can lead to the ASSERT failing e.g. with the JustifyRight
command. This patch fixes that wrong expectation by importing the corresponding change and
test from Chromium [1].

[1] ​https://codereview.chromium.org/1522063002

Test: imported/blink/editing/execCommand/justify-right-in-effect-crash.html

• editing/markup.cpp:

(WebCore::StyledMarkupAccumulator::appendStyleNodeOpenTag): Skip the assert if we should not
annotate and update the code comment accordingly.

LayoutTests:

Import regression test from Blink.

• imported/blink/editing/execCommand/justify-right-in-effect-crash-expected.txt: Added.
• imported/blink/editing/execCommand/justify-right-in-effect-crash.html: Added.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/imported/blink/editing/execCommand/justify-right-in-effect-crash-expected.txt (added)
• LayoutTests/imported/blink/editing/execCommand/justify-right-in-effect-crash.html (added)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/editing/markup.cpp (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2021-09-09  Frederic Wang  <fwang@igalia.com>
+
+        Chromium test-case asserts with ASSERTION FAILED: propertyMissingOrEqualToNone
+        https://bugs.webkit.org/show_bug.cgi?id=202904
+
+        Reviewed by Darin Adler.
+
+        Import regression test from Blink.
+
+        * imported/blink/editing/execCommand/justify-right-in-effect-crash-expected.txt: Added.
+        * imported/blink/editing/execCommand/justify-right-in-effect-crash.html: Added.
+
 2021-09-09  Manuel Rego Casasnovas  <rego@igalia.com>
 

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2021-09-09  Frederic Wang  <fwang@igalia.com>
+
+        Chromium test-case asserts with ASSERTION FAILED: propertyMissingOrEqualToNone
+        https://bugs.webkit.org/show_bug.cgi?id=202904
+
+        Reviewed by Darin Adler.
+
+        WebCore::CompositeEditCommand::moveParagraphs calls createFragmentFromMarkup with a parameter
+        AnnotateForInterchange set to No. As a consequence, StyledMarkupAccumulator::serializeNodes
+        will not call EditingStyle::wrappingStyleForSerialization (in order to remove
+        -webkit-text-decorations-in-effect) contrary to the assumption of the ASSERT in
+        propertyMissingOrEqualToNone. This can lead to the ASSERT failing e.g. with the JustifyRight
+        command. This patch fixes that wrong expectation by importing the corresponding change and
+        test from Chromium [1].
+
+        [1] https://codereview.chromium.org/1522063002
+
+        Test: imported/blink/editing/execCommand/justify-right-in-effect-crash.html
+
+        * editing/markup.cpp:
+        (WebCore::StyledMarkupAccumulator::appendStyleNodeOpenTag): Skip the assert if we should not
+        annotate and update the code comment accordingly.
+
 2021-09-09  Myles C. Maxfield  <mmaxfield@apple.com>
 

trunk/Source/WebCore/editing/markup.cpp

@@ -384 +384 @@
 void StyledMarkupAccumulator::appendStyleNodeOpenTag(StringBuilder& out, StyleProperties* style, Document& document, bool isBlock)
 {
-    // wrappingStyleForSerialization should have removed -webkit-text-decorations-in-effect
-    ASSERT(propertyMissingOrEqualToNone(style, CSSPropertyWebkitTextDecorationsInEffect));
+    // With AnnotateForInterchange::Yes, wrappingStyleForSerialization should have removed -webkit-text-decorations-in-effect
+    ASSERT(!shouldAnnotate() || propertyMissingOrEqualToNone(style, CSSPropertyWebkitTextDecorationsInEffect));
     if (isBlock)
         out.append("<div style=\"");