Changeset 217477 in webkit

Timestamp:

May 25, 2017 11:46:27 PM (7 years ago)

Author:

commit-queue@webkit.org

Message:

Don't reset m_hasDisplayContents on ElementRareData::resetComputedStyle.
​https://bugs.webkit.org/show_bug.cgi?id=172503

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

Source/WebCore:

We use that bit of information to determine whether we need to tear
down the renderers of a display: contents subtree, so better for it to
not change until the render tree is updated.

In practice, we may want to remove that bit and use ElementRareData's
RenderStyle instead (keeping it around as appropriate), to ensure they
don't go out of sync, but that's out of scope of this patch for now.

Tests: imported/w3c/web-platform-tests/css/css-display-3

• dom/ElementRareData.h:

(WebCore::ElementRareData::resetComputedStyle):

LayoutTests:

• TestExpectations:

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/TestExpectations (modified) (3 diffs)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/dom/ElementRareData.h (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2017-05-25  Emilio Cobos Álvarez  <ecobos@igalia.com>
+
+        Don't reset m_hasDisplayContents on ElementRareData::resetComputedStyle.
+        https://bugs.webkit.org/show_bug.cgi?id=172503
+
+        Reviewed by Antti Koivisto.
+
+        * TestExpectations:
+
 2017-05-25  Sam Weinig  <sam@webkit.org>
 

trunk/LayoutTests/TestExpectations

@@ -1160 +1160 @@
 webkit.org/b/157477 imported/w3c/web-platform-tests/css/css-display-3/display-contents-dynamic-before-after-first-letter-001.html [ ImageOnlyFailure ]
 webkit.org/b/157477 imported/w3c/web-platform-tests/css/css-display-3/display-contents-dynamic-before-after-001.html [ ImageOnlyFailure ]
-webkit.org/b/157477 imported/w3c/web-platform-tests/css/css-display-3/display-contents-dynamic-flex-001-none.html [ ImageOnlyFailure ]
 webkit.org/b/157477 imported/w3c/web-platform-tests/css/css-display-3/display-contents-dynamic-table-002-none.html [ ImageOnlyFailure ]
 webkit.org/b/157477 imported/w3c/web-platform-tests/css/css-display-3/display-contents-flex-003.html [ ImageOnlyFailure ]
@@ -1178 +1177 @@
 webkit.org/b/157477 imported/w3c/web-platform-tests/css/css-display-3/display-contents-dynamic-table-001-none.html [ ImageOnlyFailure ]
 webkit.org/b/157477 imported/w3c/web-platform-tests/css/css-display-3/display-contents-state-change-001.html [ ImageOnlyFailure ]
-
-webkit.org/b/172503 imported/w3c/web-platform-tests/css/css-display-3/display-contents-dynamic-flex-002-inline.html [ Skip ]
-webkit.org/b/172503 imported/w3c/web-platform-tests/css/css-display-3/display-contents-dynamic-flex-003-inline.html [ Skip ]
-webkit.org/b/172503 imported/w3c/web-platform-tests/css/css-display-3/display-contents-dynamic-list-001-inline.html [ Skip ]
-webkit.org/b/172503 imported/w3c/web-platform-tests/css/css-display-3/display-contents-dynamic-list-001-none.html [ Skip ]
-webkit.org/b/172503 imported/w3c/web-platform-tests/css/css-display-3/display-contents-dynamic-multicol-001-inline.html [ Skip ]
-webkit.org/b/172503 imported/w3c/web-platform-tests/css/css-display-3/display-contents-replaced-001.html [ Skip ]
+webkit.org/b/157477 imported/w3c/web-platform-tests/css/css-display-3/display-contents-dynamic-flex-002-inline.html [ ImageOnlyFailure ]
+webkit.org/b/157477 imported/w3c/web-platform-tests/css/css-display-3/display-contents-dynamic-flex-003-inline.html [ ImageOnlyFailure ]
+webkit.org/b/157477 imported/w3c/web-platform-tests/css/css-display-3/display-contents-dynamic-list-001-inline.html [ ImageOnlyFailure ]
+webkit.org/b/157477 imported/w3c/web-platform-tests/css/css-display-3/display-contents-dynamic-list-001-none.html [ ImageOnlyFailure ]
+
+webkit.org/b/172596 imported/w3c/web-platform-tests/css/css-display-3/display-contents-replaced-001.html [ Skip ]
 
 ### END OF display: contents failures
@@ -1375 +1373 @@
 webkit.org/b/172378 imported/blink/fast/frames/freed-frame.html [ Skip ]
 webkit.org/b/172378 imported/blink/printing/print-document-without-documentElement-crash.html [ Skip ]
-
-webkit.org/b/172514 imported/w3c/web-platform-tests/innerText/getter.html [ Skip ]

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2017-05-25  Emilio Cobos Álvarez  <ecobos@igalia.com>
+
+        Don't reset m_hasDisplayContents on ElementRareData::resetComputedStyle.
+        https://bugs.webkit.org/show_bug.cgi?id=172503
+
+        Reviewed by Antti Koivisto.
+
+        We use that bit of information to determine whether we need to tear
+        down the renderers of a display: contents subtree, so better for it to
+        not change until the render tree is updated.
+
+        In practice, we may want to remove that bit and use ElementRareData's
+        RenderStyle instead (keeping it around as appropriate), to ensure they
+        don't go out of sync, but that's out of scope of this patch for now.
+
+        Tests: imported/w3c/web-platform-tests/css/css-display-3
+
+        * dom/ElementRareData.h:
+        (WebCore::ElementRareData::resetComputedStyle):
+
 2017-05-25  Sam Weinig  <sam@webkit.org>
 

trunk/Source/WebCore/dom/ElementRareData.h

@@ -215 +215 @@
 {
     m_computedStyle = nullptr;
-    m_hasDisplayContents = false;
 }