[css-display] Support display: contents pseudo-elements.

third_party/WebKit/Source/core/css/resolver/StyleResolver.cpp

Index: third_party/WebKit/Source/core/css/resolver/StyleResolver.cpp
diff --git a/third_party/WebKit/Source/core/css/resolver/StyleResolver.cpp b/third_party/WebKit/Source/core/css/resolver/StyleResolver.cpp
index 7bec57d2a31bccc757cfb78acd0ad13c2691ce41..6fa31805fa7f89146dcd0297f0ae385a6d4119c4 100644
--- a/third_party/WebKit/Source/core/css/resolver/StyleResolver.cpp
+++ b/third_party/WebKit/Source/core/css/resolver/StyleResolver.cpp
@@ -826,15 +826,27 @@ PseudoElement* StyleResolver::createPseudoElement(Element* parent,
 
 PseudoElement* StyleResolver::createPseudoElementIfNeeded(Element& parent,
                                                           PseudoId pseudoId) {
+  if (!parent.canHaveGeneratedPseudo(pseudoId))
+    return nullptr;
+
   LayoutObject* parentLayoutObject = parent.layoutObject();
+  if (!parentLayoutObject) {
+    DCHECK(parent.hasDisplayContentsStyle());
+    parentLayoutObject = LayoutTreeBuilderTraversal::parentLayoutObject(parent);
+  }
+
   if (!parentLayoutObject)
     return nullptr;
 
+  ComputedStyle* parentStyle = parent.mutableComputedStyle();
+  DCHECK(parentStyle);
+
   // The first letter pseudo element has to look up the tree and see if any
   // of the ancestors are first letter.
   if (pseudoId < FirstInternalPseudoId && pseudoId != PseudoIdFirstLetter &&
-      !parentLayoutObject->style()->hasPseudoStyle(pseudoId))
+      !parentStyle->hasPseudoStyle(pseudoId)) {
     return nullptr;
+  }
 
   if (pseudoId == PseudoIdBackdrop && !parent.isInTopLayer())
     return nullptr;
@@ -847,7 +859,6 @@ PseudoElement* StyleResolver::createPseudoElementIfNeeded(Element& parent,
   if (!canHaveGeneratedChildren(*parentLayoutObject))
     return nullptr;
 
-  ComputedStyle* parentStyle = parentLayoutObject->mutableStyle();
   if (ComputedStyle* cachedStyle =
           parentStyle->getCachedPseudoStyle(pseudoId)) {
     if (!pseudoElementLayoutObjectIsNeeded(cachedStyle))
@@ -855,7 +866,8 @@ PseudoElement* StyleResolver::createPseudoElementIfNeeded(Element& parent,
     return createPseudoElement(&parent, pseudoId);
   }
 
-  StyleResolverState state(document(), &parent, parentStyle, parentStyle);
+  StyleResolverState state(document(), &parent, parentStyle,
+                           parentLayoutObject->style());
   if (!pseudoStyleForElementInternal(parent, pseudoId, parentStyle, state))
     return nullptr;
   RefPtr<ComputedStyle> style = state.takeStyle();