Changeset 217238 in webkit

Timestamp:

May 22, 2017 12:43:39 PM (7 years ago)

Author:

commit-queue@webkit.org

Message:

Don't unconditionally reset TextIterator::m_handledChildren for display: contents nodes.
​https://bugs.webkit.org/show_bug.cgi?id=172443

This avoids an infinite hang when enabling display: contents in bug 171984.

Patch by Emilio Cobos Álvarez <​ecobos@igalia.com> on 2017-05-22
Reviewed by Antti Koivisto.

No new tests. Relanding bug 171984 will add test coverage for this.

• editing/TextIterator.cpp:

(WebCore::hasDisplayContents):
(WebCore::fullyClipsContents):
(WebCore::TextIterator::advance):

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• editing/TextIterator.cpp (modified) (2 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2017-05-22  Emilio Cobos Álvarez  <ecobos@igalia.com>
+
+        Don't unconditionally reset TextIterator::m_handledChildren for display: contents nodes.
+        https://bugs.webkit.org/show_bug.cgi?id=172443
+
+        This avoids an infinite hang when enabling display: contents in bug 171984.
+
+        Reviewed by Antti Koivisto.
+
+        No new tests. Relanding bug 171984 will add test coverage for this.
+
+        * editing/TextIterator.cpp:
+        (WebCore::hasDisplayContents):
+        (WebCore::fullyClipsContents):
+        (WebCore::TextIterator::advance):
+
 2017-05-22  Sam Weinig  <sam@webkit.org>
 

trunk/Source/WebCore/editing/TextIterator.cpp

@@ -445 +445 @@
 }
 
+static inline bool hasDisplayContents(Node& node)
+{
+    return is<Element>(node) && downcast<Element>(node).hasDisplayContents();
+}
+
 void TextIterator::advance()
 {
@@ -492 +497 @@
         
         auto* renderer = m_node->renderer();
-        if (!renderer) {
-            m_handledNode = true;
-            m_handledChildren = !(is<Element>(*m_node) && downcast<Element>(*m_node).hasDisplayContents());
-        } else {
-            // handle current node according to its type
-            if (!m_handledNode) {
+        if (!m_handledNode) {
+            if (!renderer) {
+                m_handledNode = true;
+                m_handledChildren = !hasDisplayContents(*m_node);
+            } else {
+                // handle current node according to its type
                 if (renderer->isText() && m_node->isTextNode())
                     m_handledNode = handleTextNode();