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

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

 /*
  * Copyright (C) 1999 Lars Knoll (knoll@kde.org)
  *           (C) 2004-2005 Allan Sandfeld Jensen (kde@carewolf.com)
  * Copyright (C) 2006, 2007 Nicholas Shanks (webkit@nickshanks.com)
  * Copyright (C) 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013 Apple Inc.
  * All rights reserved.
  * Copyright (C) 2007 Alexey Proskuryakov <ap@webkit.org>
  * Copyright (C) 2007, 2008 Eric Seidel <eric@webkit.org>
  * Copyright (C) 2008, 2009 Torch Mobile Inc. All rights reserved.
  * (http://www.torchmobile.com/)
@@ skipping 561 matching lines @@
   documentStyle->setOverflowX(EOverflow::Auto);
   documentStyle->setOverflowY(EOverflow::Auto);
 
   document.setupFontBuilder(*documentStyle);
 
   return documentStyle.release();
 }
 
 void StyleResolver::adjustComputedStyle(StyleResolverState& state,
                                         Element* element) {
+  DCHECK(state.layoutParentStyle());
+  DCHECK(state.parentStyle());
   StyleAdjuster::adjustComputedStyle(state.mutableStyleRef(),
-                                     *state.parentStyle(), element);
+                                     *state.parentStyle(),
+                                     *state.layoutParentStyle(), element);
 }
 
 // Start loading resources referenced by this style.
 void StyleResolver::loadPendingResources(StyleResolverState& state) {
   state.elementStyleResources().loadPendingResources(state.style());
 }
 
 static const ComputedStyle* calculateBaseComputedStyle(
     StyleResolverState& state,
     const Element* animatingElement) {
@@ skipping 21 matching lines @@
     return;
 
   ElementAnimations* elementAnimations = animatingElement->elementAnimations();
   if (elementAnimations)
     elementAnimations->updateBaseComputedStyle(state.style());
 }
 
 PassRefPtr<ComputedStyle> StyleResolver::styleForElement(
     Element* element,
     const ComputedStyle* defaultParent,
+    const ComputedStyle* defaultLayoutParent,
     StyleSharingBehavior sharingBehavior,
     RuleMatchingBehavior matchingBehavior) {
   DCHECK(document().frame());
   DCHECK(document().settings());
 
   // Once an element has a layoutObject, we don't try to destroy it, since
   // otherwise the layoutObject will vanish if a style recalc happens during
   // loading.
   if (sharingBehavior == AllowStyleSharing && !document().isRenderingReady() &&
       !element->layoutObject()) {
@@ skipping 16 matching lines @@
   ElementResolveContext elementContext(*element);
 
   if (RuntimeEnabledFeatures::styleSharingEnabled() &&
       sharingBehavior == AllowStyleSharing &&
       (defaultParent || elementContext.parentStyle())) {
     if (RefPtr<ComputedStyle> sharedStyle =
             document().styleEngine().findSharedStyle(elementContext))
       return sharedStyle.release();
   }
 
-  StyleResolverState state(document(), elementContext, defaultParent);
+  StyleResolverState state(document(), elementContext, defaultParent,
+                           defaultLayoutParent);
 
   const ComputedStyle* baseComputedStyle =
       calculateBaseComputedStyle(state, element);
 
   if (baseComputedStyle) {
     state.setStyle(ComputedStyle::clone(*baseComputedStyle));
-    if (!state.parentStyle())
+    if (!state.parentStyle()) {
       state.setParentStyle(initialStyleForElement());
+      state.setLayoutParentStyle(state.parentStyle());
+    }
   } else {
     if (state.parentStyle()) {
       RefPtr<ComputedStyle> style = ComputedStyle::create();
       style->inheritFrom(*state.parentStyle(),
                          isAtShadowBoundary(element)
                              ? ComputedStyleBase::AtShadowBoundary
                              : ComputedStyleBase::NotAtShadowBoundary);
       state.setStyle(std::move(style));
     } else {
       state.setStyle(initialStyleForElement());
       state.setParentStyle(ComputedStyle::clone(*state.style()));
+      state.setLayoutParentStyle(state.parentStyle());
     }
   }
 
   // contenteditable attribute (implemented by -webkit-user-modify) should
   // be propagated from shadow host to distributed node.
   if (state.distributedToInsertionPoint()) {
     if (Element* parent = element->parentElement()) {
       if (ComputedStyle* styleOfShadowHost = parent->mutableComputedStyle())
         state.style()->setUserModify(styleOfShadowHost->userModify());
     }
@@ skipping 94 matching lines @@
 // TODO(alancutter): Create compositor keyframe values directly instead of
 // intermediate AnimatableValues.
 PassRefPtr<AnimatableValue> StyleResolver::createAnimatableValueSnapshot(
     Element& element,
     const ComputedStyle& baseStyle,
     const ComputedStyle* parentStyle,
     CSSPropertyID property,
     const CSSValue* value) {
   // TODO(alancutter): Avoid creating a StyleResolverState just to apply a
   // single value on a ComputedStyle.
-  StyleResolverState state(element.document(), &element, parentStyle);
+  StyleResolverState state(element.document(), &element, parentStyle,
+                           parentStyle);

[rune, 2017/01/27 13:09:23]

Is it correct to use parentStyle both places here?

[emilio, 2017/01/27 22:13:15]

We only use it to apply a given property as far as I understand this code, so
there should be no difference. Indeed there's a TODO comment above about getting
rid of the StyleResolverState construction entirely.

[rune, 2017/02/06 22:40:43]

Right, these are for compositor animations which do not include any
styleAdjusted properties (and we don't adjust style here, which the layout
parent style is used for).

   state.setStyle(ComputedStyle::clone(baseStyle));
   if (value) {
     StyleBuilder::applyProperty(property, state, *value);
     state.fontBuilder().createFont(
         state.document().styleEngine().fontSelector(), state.mutableStyleRef());
   }
   return CSSAnimatableValueFactory::create(property, *state.style());
 }
 
 PseudoElement* StyleResolver::createPseudoElement(Element* parent,
@@ skipping 27 matching lines @@
     return nullptr;
 
   ComputedStyle* parentStyle = parentLayoutObject->mutableStyle();
   if (ComputedStyle* cachedStyle =
           parentStyle->getCachedPseudoStyle(pseudoId)) {
     if (!pseudoElementLayoutObjectIsNeeded(cachedStyle))
       return nullptr;
     return createPseudoElement(&parent, pseudoId);
   }
 
-  StyleResolverState state(document(), &parent, parentStyle);
+  StyleResolverState state(document(), &parent, parentStyle, parentStyle);
   if (!pseudoStyleForElementInternal(parent, pseudoId, parentStyle, state))
     return nullptr;
   RefPtr<ComputedStyle> style = state.takeStyle();
   DCHECK(style);
   parentStyle->addCachedPseudoStyle(style);
 
   if (!pseudoElementLayoutObjectIsNeeded(style.get()))
     return nullptr;
 
   PseudoElement* pseudo = createPseudoElement(&parent, pseudoId);
@@ skipping 80 matching lines @@
 
   if (state.style()->hasViewportUnits())
     document().setHasViewportUnits();
 
   return true;
 }
 
 PassRefPtr<ComputedStyle> StyleResolver::pseudoStyleForElement(
     Element* element,
     const PseudoStyleRequest& pseudoStyleRequest,
-    const ComputedStyle* parentStyle) {
+    const ComputedStyle* parentStyle,
+    const ComputedStyle* parentLayoutObjectStyle) {
   DCHECK(parentStyle);
   if (!element)
     return nullptr;
 
-  StyleResolverState state(document(), element, parentStyle);
+  StyleResolverState state(document(), element, parentStyle,
+                           parentLayoutObjectStyle);
   if (!pseudoStyleForElementInternal(*element, pseudoStyleRequest, parentStyle,
                                      state)) {
     if (pseudoStyleRequest.type == PseudoStyleRequest::ForRenderer)
       return nullptr;
     return state.takeStyle();
   }
 
   if (PseudoElement* pseudoElement =
           element->pseudoElement(pseudoStyleRequest.pseudoId))
     setAnimationUpdateIfNeeded(state, *pseudoElement);
@@ skipping 945 matching lines @@
 
 void StyleResolver::computeFont(ComputedStyle* style,
                                 const StylePropertySet& propertySet) {
   CSSPropertyID properties[] = {
       CSSPropertyFontSize,   CSSPropertyFontFamily,      CSSPropertyFontStretch,
       CSSPropertyFontStyle,  CSSPropertyFontVariantCaps, CSSPropertyFontWeight,
       CSSPropertyLineHeight,
   };
 
   // TODO(timloh): This is weird, the style is being used as its own parent
-  StyleResolverState state(document(), nullptr, style);
+  StyleResolverState state(document(), nullptr, style, style);
   state.setStyle(style);
 
   for (CSSPropertyID property : properties) {
     if (property == CSSPropertyLineHeight)
       updateFont(state);
     StyleBuilder::applyProperty(property, state,
                                 *propertySet.getPropertyCSSValue(property));
   }
 }
 
 void StyleResolver::updateMediaType() {
   if (FrameView* view = document().view()) {
     bool wasPrint = m_printMediaType;
     m_printMediaType =
         equalIgnoringCase(view->mediaType(), MediaTypeNames::print);
     if (wasPrint != m_printMediaType)
       m_matchedPropertiesCache.clearViewportDependent();
   }
 }
 
 DEFINE_TRACE(StyleResolver) {
   visitor->trace(m_matchedPropertiesCache);
   visitor->trace(m_selectorFilter);
   visitor->trace(m_styleSharingLists);
   visitor->trace(m_document);
   visitor->trace(m_tracker);
 }
 
 }  // namespace blink