Support display: contents for elements, first-line and first-letter pseudos.

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

Index: third_party/WebKit/Source/core/css/resolver/StyleResolverState.cpp
diff --git a/third_party/WebKit/Source/core/css/resolver/StyleResolverState.cpp b/third_party/WebKit/Source/core/css/resolver/StyleResolverState.cpp
index 5f790d539c389aab9624e269e788bcf76ea00cdc..fafcd6219c9ed6571835b65e15977d797908ef19 100644
--- a/third_party/WebKit/Source/core/css/resolver/StyleResolverState.cpp
+++ b/third_party/WebKit/Source/core/css/resolver/StyleResolverState.cpp
@@ -34,34 +34,46 @@ namespace blink {
 StyleResolverState::StyleResolverState(
     Document& document,
     const ElementResolveContext& elementContext,
-    const ComputedStyle* parentStyle)
+    const ComputedStyle* parentStyle,
+    const ComputedStyle* layoutParentStyle)
     : m_elementContext(elementContext),
       m_document(document),
       m_style(nullptr),
       // TODO(jchaffraix): We should make m_parentStyle const
       // (https://crbug.com/468152)
       m_parentStyle(const_cast<ComputedStyle*>(parentStyle)),
+      m_layoutParentStyle(layoutParentStyle),
       m_applyPropertyToRegularStyle(true),
       m_applyPropertyToVisitedLinkStyle(false),
       m_hasDirAutoAttribute(false),
       m_fontBuilder(document),
       m_elementStyleResources(document, document.devicePixelRatio()) {
+  DCHECK(!!m_parentStyle == !!m_layoutParentStyle);
+
   if (!m_parentStyle) {
     // TODO(jchaffraix): We should make m_parentStyle const
     // (https://crbug.com/468152)
     m_parentStyle = const_cast<ComputedStyle*>(m_elementContext.parentStyle());
   }
 
+  if (!m_layoutParentStyle)
+    m_layoutParentStyle = m_elementContext.layoutParentStyle();
+
+  if (!m_layoutParentStyle)
+    m_layoutParentStyle = m_parentStyle;
+
   DCHECK(document.isActive());
 }
 
 StyleResolverState::StyleResolverState(Document& document,
                                        Element* element,
-                                       const ComputedStyle* parentStyle)
+                                       const ComputedStyle* parentStyle,
+                                       const ComputedStyle* layoutParentStyle)
     : StyleResolverState(document,
                          element ? ElementResolveContext(*element)
                                  : ElementResolveContext(document),
-                         parentStyle) {}
+                         parentStyle,
+                         layoutParentStyle) {}
 
 StyleResolverState::~StyleResolverState() {
   // For performance reasons, explicitly clear HeapVectors and