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

third_party/WebKit/Source/core/css/resolver/StyleAdjuster.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 55 matching lines @@
       return display;
     case EDisplay::InlineTable:
       return EDisplay::Table;
     case EDisplay::WebkitInlineBox:
       return EDisplay::WebkitBox;
     case EDisplay::InlineFlex:
       return EDisplay::Flex;
     case EDisplay::InlineGrid:
       return EDisplay::Grid;
 
+    case EDisplay::Contents:
     case EDisplay::Inline:
     case EDisplay::InlineBlock:
     case EDisplay::TableRowGroup:
     case EDisplay::TableHeaderGroup:
     case EDisplay::TableFooterGroup:
     case EDisplay::TableRow:
     case EDisplay::TableColumnGroup:
     case EDisplay::TableColumn:
     case EDisplay::TableCell:
     case EDisplay::TableCaption:
       return EDisplay::Block;
     case EDisplay::None:
-    case EDisplay::Contents:
       ASSERT_NOT_REACHED();
       return display;
   }
   ASSERT_NOT_REACHED();
   return EDisplay::Block;
 }
 
 static bool isOutermostSVGElement(const Element* element) {
   return element && element->isSVGElement() &&
          toSVGElement(*element).isOutermostSVGSVGElement();
@@ skipping 23 matching lines @@
          (isHTMLFontElement(element) || isHTMLAnchorElement(element));
 }
 
 // FIXME: This helper is only needed because pseudoStyleForElement passes a null
 // element to adjustComputedStyle, so we can't just use element->isInTopLayer().
 static bool isInTopLayer(const Element* element, const ComputedStyle& style) {
   return (element && element->isInTopLayer()) ||
          style.styleType() == PseudoIdBackdrop;
 }
 
-static bool parentStyleForcesZIndexToCreateStackingContext(
-    const ComputedStyle& parentStyle) {
-  return parentStyle.isDisplayFlexibleOrGridBox();
+static bool layoutParentStyleForcesZIndexToCreateStackingContext(
+    const ComputedStyle& layoutParentStyle) {
+  return layoutParentStyle.isDisplayFlexibleOrGridBox();
 }
 
 void StyleAdjuster::adjustStyleForEditing(ComputedStyle& style) {
   if (style.userModify() != READ_WRITE_PLAINTEXT_ONLY)
     return;
   // Collapsing whitespace is harmful in plain-text editing.
   if (style.whiteSpace() == EWhiteSpace::kNormal)
     style.setWhiteSpace(EWhiteSpace::kPreWrap);
   else if (style.whiteSpace() == EWhiteSpace::kNowrap)
     style.setWhiteSpace(EWhiteSpace::kPre);
@@ skipping 164 matching lines @@
   }
 
   // Menulists should have visible overflow
   if (style.appearance() == MenulistPart) {
     style.setOverflowX(EOverflow::Visible);
     style.setOverflowY(EOverflow::Visible);
   }
 }
 
 static void adjustStyleForDisplay(ComputedStyle& style,
-                                  const ComputedStyle& parentStyle,
+                                  const ComputedStyle& layoutParentStyle,
                                   Document* document) {
   if (style.display() == EDisplay::Block && !style.isFloating())
     return;
 
+  if (style.display() == EDisplay::Contents)
+    return;
+
   // FIXME: Don't support this mutation for pseudo styles like first-letter or
   // first-line, since it's not completely clear how that should work.
   if (style.display() == EDisplay::Inline &&
       style.styleType() == PseudoIdNone &&
-      style.getWritingMode() != parentStyle.getWritingMode())
+      style.getWritingMode() != layoutParentStyle.getWritingMode())
     style.setDisplay(EDisplay::InlineBlock);
 
   // After performing the display mutation, check table rows. We do not honor
   // position: relative table rows. This has been established for position:
   // relative in CSS2.1 (and caused a crash in containingBlock() on some sites).
   if ((style.display() == EDisplay::TableHeaderGroup ||
        style.display() == EDisplay::TableRowGroup ||
        style.display() == EDisplay::TableFooterGroup ||
        style.display() == EDisplay::TableRow) &&
       style.position() == RelativePosition)
@@ skipping 11 matching lines @@
   // rows, and table columns.
   // FIXME: Table cells should be allowed to be perpendicular or flipped with
   // respect to the table, though.
   if (style.display() == EDisplay::TableColumn ||
       style.display() == EDisplay::TableColumnGroup ||
       style.display() == EDisplay::TableFooterGroup ||
       style.display() == EDisplay::TableHeaderGroup ||
       style.display() == EDisplay::TableRow ||
       style.display() == EDisplay::TableRowGroup ||
       style.display() == EDisplay::TableCell)
-    style.setWritingMode(parentStyle.getWritingMode());
+    style.setWritingMode(layoutParentStyle.getWritingMode());
 
   // FIXME: Since we don't support block-flow on flexible boxes yet, disallow
   // setting of block-flow to anything other than TopToBottomWritingMode.
   // https://bugs.webkit.org/show_bug.cgi?id=46418 - Flexible box support.
   if (style.getWritingMode() != WritingMode::kHorizontalTb &&
       (style.display() == EDisplay::WebkitBox ||
        style.display() == EDisplay::WebkitInlineBox))
     style.setWritingMode(WritingMode::kHorizontalTb);
 
-  if (parentStyle.isDisplayFlexibleOrGridBox()) {
+  if (layoutParentStyle.isDisplayFlexibleOrGridBox()) {
     style.setFloating(EFloat::kNone);
     style.setDisplay(equivalentBlockDisplay(style.display()));
 
     // We want to count vertical percentage paddings/margins on flex items
     // because our current behavior is different from the spec and we want to
     // gather compatibility data.
     if (style.paddingBefore().isPercentOrCalc() ||
         style.paddingAfter().isPercentOrCalc())
       UseCounter::count(document, UseCounter::FlexboxPercentagePaddingVertical);
     if (style.marginBefore().isPercentOrCalc() ||
         style.marginAfter().isPercentOrCalc())
       UseCounter::count(document, UseCounter::FlexboxPercentageMarginVertical);
   }
 }
 
 void StyleAdjuster::adjustComputedStyle(ComputedStyle& style,
                                         const ComputedStyle& parentStyle,
+                                        const ComputedStyle& layoutParentStyle,
                                         Element* element) {
-  if (style.display() != EDisplay::None &&
-      style.display() != EDisplay::Contents) {
+  if (style.display() != EDisplay::None) {
     if (element && element->isHTMLElement())
       adjustStyleForHTMLElement(style, toHTMLElement(*element));
 
     // Per the spec, position 'static' and 'relative' in the top layer compute
     // to 'absolute'.
     if (isInTopLayer(element, style) && (style.position() == StaticPosition ||
                                          style.position() == RelativePosition))
       style.setPosition(AbsolutePosition);
 
     // Absolute/fixed positioned elements, floating elements and the document
     // element need block-like outside display.
-    if (style.hasOutOfFlowPosition() || style.isFloating() ||
-        (element && element->document().documentElement() == element))
+    if (style.display() != EDisplay::Contents &&
+        (style.hasOutOfFlowPosition() || style.isFloating()))
+      style.setDisplay(equivalentBlockDisplay(style.display()));
+
+    if (element && element->document().documentElement() == element)
       style.setDisplay(equivalentBlockDisplay(style.display()));
 
     // We don't adjust the first letter style earlier because we may change the
     // display setting in adjustStyeForTagName() above.
     adjustStyleForFirstLetter(style);
 
-    adjustStyleForDisplay(style, parentStyle,
+    adjustStyleForDisplay(style, layoutParentStyle,
                           element ? &element->document() : 0);
 
     // Paint containment forces a block formatting context, so we must coerce
     // from inline.  https://drafts.csswg.org/css-containment/#containment-paint
     if (style.containsPaint() && style.display() == EDisplay::Inline)
       style.setDisplay(EDisplay::Block);
   } else {
     adjustStyleForFirstLetter(style);
   }
 
   if (element && element->hasCompositorProxy())
     style.setHasCompositorProxy(true);
 
   // Make sure our z-index value is only applied if the object is positioned.
   if (style.position() == StaticPosition &&
-      !parentStyleForcesZIndexToCreateStackingContext(parentStyle)) {
+      !layoutParentStyleForcesZIndexToCreateStackingContext(
+          layoutParentStyle)) {
     style.setIsStackingContext(false);
     // TODO(alancutter): Avoid altering z-index here.
     if (!style.hasAutoZIndex())
       style.setZIndex(0);
   } else if (!style.hasAutoZIndex()) {
     style.setIsStackingContext(true);
   }
 
   if (style.overflowX() != EOverflow::Visible ||
       style.overflowY() != EOverflow::Visible)
@@ skipping 38 matching lines @@
       style.setDisplay(EDisplay::Block);
 
     // Columns don't apply to svg text elements.
     if (isSVGTextElement(*element))
       style.clearMultiCol();
   }
   adjustStyleForAlignment(style, parentStyle);
 }
 
 }  // namespace blink