Add parsing support for display: contents, and minimum behavior similar to display: none

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 67 matching lines @@
     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 EDisplay::None;
+      return display;
   }
   ASSERT_NOT_REACHED();
   return EDisplay::Block;
 }
 
 static bool isOutermostSVGElement(const Element* element) {
   return element && element->isSVGElement() &&
          toSVGElement(*element).isOutermostSVGSVGElement();
 }
 
@@ skipping 262 matching lines @@
       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,
                                         Element* element) {
-  if (style.display() != EDisplay::None) {
+  if (style.display() != EDisplay::None &&
+      style.display() != EDisplay::Contents) {
     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
@@ skipping 72 matching lines @@
       style.setDisplay(EDisplay::Block);
 
     // Columns don't apply to svg text elements.
     if (isSVGTextElement(*element))
       style.clearMultiCol();
   }
   adjustStyleForAlignment(style, parentStyle);
 }
 
 }  // namespace blink