REGRESSION(r236609): API tests for mso list preservation are failing

https://bugs.webkit.org/show_bug.cgi?id=190095

Reviewed by Wenson Hsieh.

The regression was caused by appendNodeToPreserveMSOList called after an early return for not having renderer.
Clearly, comment & style elements coming from a MS word document wouldn't have a renderer.

Fixed the bug by changing the order.

* editing/markup.cpp:
(WebCore::StyledMarkupAccumulator::traverseNodesForSerialization):

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@236618 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog
index 580ca8d..38cbd49 100644 (file)
--- a/Source/WebCore/ChangeLog
+++ b/Source/WebCore/ChangeLog
@@ -1,5 +1,20 @@
 2018-09-28  Ryosuke Niwa  <rniwa@webkit.org>
 
+        REGRESSION(r236609): API tests for mso list preservation are failing
+        https://bugs.webkit.org/show_bug.cgi?id=190095
+
+        Reviewed by Wenson Hsieh.
+
+        The regression was caused by appendNodeToPreserveMSOList called after an early return for not having renderer.
+        Clearly, comment & style elements coming from a MS word document wouldn't have a renderer.
+
+        Fixed the bug by changing the order.
+
+        * editing/markup.cpp:
+        (WebCore::StyledMarkupAccumulator::traverseNodesForSerialization):
+
+2018-09-28  Ryosuke Niwa  <rniwa@webkit.org>
+
         Build fix after r236612.
 
         * platform/win/PasteboardWin.cpp:

diff --git a/Source/WebCore/editing/markup.cpp b/Source/WebCore/editing/markup.cpp
index f12fd24..912f583 100644 (file)
--- a/Source/WebCore/editing/markup.cpp
+++ b/Source/WebCore/editing/markup.cpp
@@ -523,14 +523,14 @@ Node* StyledMarkupAccumulator::traverseNodesForSerialization(Node* startNode, No
 
     unsigned depth = 0;
     auto enterNode = [&] (Node& node) {
-        if (!node.renderer() && !enclosingElementWithTag(firstPositionInOrBeforeNode(&node), selectTag))
-            return false;
-
         if (UNLIKELY(m_shouldPreserveMSOList) && shouldEmit) {
             if (appendNodeToPreserveMSOList(node))
                 return false;
         }
 
+        if (!node.renderer() && !enclosingElementWithTag(firstPositionInOrBeforeNode(&node), selectTag))
+            return false;
+
         ++depth;
         if (shouldEmit)
             appendStartTag(node);