Do not override kReattach for ::first-letter.

We incorrectly did an override with kForce for ::first-letter recalc when we were already recalculating style for re-attachment (kReattach). This caused crashes in FirstLetterPseudoElement::DidRecalcStyle. Bug: 853621, 853476, 853471, 853470, 853433, 853411 Change-Id: Id34e6bdbaaeb3b4933a3e963b68f0bffcda0e40e Reviewed-on: https://chromium-review.googlesource.com/1104176 Commit-Queue: Rune Lillesveen <futhark@chromium.org> Reviewed-by: Anders Ruud <andruud@chromium.org> Cr-Commit-Position: refs/heads/master@{#568006}

Do not override kReattach for ::first-letter.
We incorrectly did an override with kForce for ::first-letter recalc when we were already recalculating style for re-attachment (kReattach). This caused crashes in FirstLetterPseudoElement::DidRecalcStyle. Bug: 853621, 853476, 853471, 853470, 853433, 853411 Change-Id: Id34e6bdbaaeb3b4933a3e963b68f0bffcda0e40e Reviewed-on: https://chromium-review.googlesource.com/1104176 Commit-Queue: Rune Lillesveen <futhark@chromium.org> Reviewed-by: Anders Ruud <andruud@chromium.org> Cr-Commit-Position: refs/heads/master@{#568006}
de5c1819 · Rune Lillesveen · Commit Bot · e792609b · de5c1819 · de5c1819
Commit de5c1819 authored Jun 18, 2018 by Rune Lillesveen Committed by Commit Bot Jun 18, 2018
3 changed files
--- a/third_party/WebKit/LayoutTests/external/wpt/css/css-pseudo/first-letter-block-to-inline-ref.html
+++ b/third_party/WebKit/LayoutTests/external/wpt/css/css-pseudo/first-letter-block-to-inline-ref.html
+<!DOCTYPE html>
+<span style="color:green">This text should be green.</span>
--- a/third_party/WebKit/LayoutTests/external/wpt/css/css-pseudo/first-letter-block-to-inline.html
+++ b/third_party/WebKit/LayoutTests/external/wpt/css/css-pseudo/first-letter-block-to-inline.html
+<!DOCTYPE html>
+<title>CSS Test: ::first-letter stops applying to element becoming inline.</title>
+<link rel="author" title="Rune Lillesveen" href="mailto:futhark@chromium.org">
+<link rel="match" href="first-letter-block-to-inline-ref.html">
+<link rel="help" href="https://drafts.csswg.org/css-pseudo-4/#first-letter-pseudo">
+<style>
+  #outer.block::first-letter { color: red }
+  #outer.block { display: block }
+</style>
+<span id="outer" class="block">
+  <span id="inner">This text should be green.</span>
+</span>
+<script>
+  outer.offsetTop;
+  outer.className = "";
+  inner.style.color = "green";
+</script>
--- a/third_party/blink/renderer/core/dom/element.cc
+++ b/third_party/blink/renderer/core/dom/element.cc
@@ -2205,8 +2205,9 @@ void Element::RecalcStyle(StyleRecalcChange change) {
    // checks as we don't know if they effected the first letter or not.
    // This can be seen when a child transitions from floating to
    // non-floating we have to take it into account for the first letter.
-    UpdatePseudoElement(kPseudoIdFirstLetter,
-                        ChildNeedsStyleRecalc() ? kForce : change);
+    UpdatePseudoElement(
+        kPseudoIdFirstLetter,
+        change < kForce && ChildNeedsStyleRecalc() ? kForce : change);

    ClearChildNeedsStyleRecalc();
  }