Remove CSS Grid Layout and grid media queries.

sky/engine/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/)
  * Copyright (c) 2011, Code Aurora Forum. All rights reserved.
  * Copyright (C) Research In Motion Limited 2011. All rights reserved.
@@ skipping 15 matching lines @@
  * Boston, MA 02110-1301, USA.
  */
 
 #include "config.h"
 #include "core/css/resolver/StyleAdjuster.h"
 
 #include "core/dom/ContainerNode.h"
 #include "core/dom/Document.h"
 #include "core/dom/Element.h"
 #include "core/dom/NodeRenderStyle.h"
-#include "core/rendering/style/GridPosition.h"
 #include "core/rendering/style/RenderStyle.h"
 #include "core/rendering/style/RenderStyleConstants.h"
 #include "platform/Length.h"
 #include "platform/transforms/TransformOperations.h"
 #include "wtf/Assertions.h"
 
 namespace blink {
 
 static EDisplay equivalentBlockDisplay(EDisplay display)
 {
     switch (display) {
     case BLOCK:
     case FLEX:
-    case GRID:
         return display;
     case INLINE_FLEX:
         return FLEX;
-    case INLINE_GRID:
-        return GRID;
 
     case INLINE:
     case INLINE_BLOCK:
         return BLOCK;
     case NONE:
         ASSERT_NOT_REACHED();
         return NONE;
     }
     ASSERT_NOT_REACHED();
     return BLOCK;
 }
 
 // CSS requires text-decoration to be reset at each DOM element for tables,
 // inline blocks, inline tables, shadow DOM crossings, floating elements,
 // and absolute or relatively positioned elements.
 static bool doesNotInheritTextDecoration(const RenderStyle* style, const Element& e)
 {
     return style->display() == INLINE_BLOCK || isAtShadowBoundary(&e) || style->hasOutOfFlowPosition();
 }
 
 static bool parentStyleForcesZIndexToCreateStackingContext(const RenderStyle* parentStyle)
 {
-    return parentStyle->isDisplayFlexibleOrGridBox();
+    return parentStyle->isDisplayFlexibleBox();
 }
 
 static bool hasWillChangeThatCreatesStackingContext(const RenderStyle* style)
 {
     for (size_t i = 0; i < style->willChangeProperties().size(); ++i) {
         switch (style->willChangeProperties()[i]) {
         case CSSPropertyOpacity:
         case CSSPropertyTransform:
         case CSSPropertyWebkitTransform:
         case CSSPropertyTransformStyle:
@@ skipping 79 matching lines @@
     if (style->preserves3D() && (style->overflowX() != OVISIBLE
         || style->overflowY() != OVISIBLE
         || style->hasFilter()))
         style->setTransformStyle3D(TransformStyle3DFlat);
 
     adjustStyleForAlignment(*style, *parentStyle);
 }
 
 void StyleAdjuster::adjustStyleForAlignment(RenderStyle& style, const RenderStyle& parentStyle)
 {
-    bool isFlexOrGrid = style.isDisplayFlexibleOrGridBox();
+    bool isFlex = style.isDisplayFlexibleBox();
     bool absolutePositioned = style.position() == AbsolutePosition;
 
     // If the inherited value of justify-items includes the legacy keyword, 'auto'
     // computes to the the inherited value.
     // Otherwise, auto computes to:
-    //  - 'stretch' for flex containers and grid containers.
+    //  - 'stretch' for flex containers.
     //  - 'start' for everything else.
     if (style.justifyItems() == ItemPositionAuto) {
         if (parentStyle.justifyItemsPositionType() == LegacyPosition) {
             style.setJustifyItems(parentStyle.justifyItems());
             style.setJustifyItemsPositionType(parentStyle.justifyItemsPositionType());
-        } else if (isFlexOrGrid) {
+        } else if (isFlex) {
             style.setJustifyItems(ItemPositionStretch);
         }
     }
 
     // The 'auto' keyword computes to 'stretch' on absolutely-positioned elements,
     // and to the computed value of justify-items on the parent (minus
     // any legacy keywords) on all other boxes.
     if (style.justifySelf() == ItemPositionAuto) {
         if (absolutePositioned) {
             style.setJustifySelf(ItemPositionStretch);
         } else {
             style.setJustifySelf(parentStyle.justifyItems());
             style.setJustifySelfOverflowAlignment(parentStyle.justifyItemsOverflowAlignment());
         }
     }
 
     // The 'auto' keyword computes to:
-    //  - 'stretch' for flex containers and grid containers,
+    //  - 'stretch' for flex containers,
     //  - 'start' for everything else.
     if (style.alignItems() == ItemPositionAuto) {
-        if (isFlexOrGrid)
+        if (isFlex)
             style.setAlignItems(ItemPositionStretch);
     }
 
     // The 'auto' keyword computes to 'stretch' on absolutely-positioned elements,
     // and to the computed value of align-items on the parent (minus
     // any 'legacy' keywords) on all other boxes.
     if (style.alignSelf() == ItemPositionAuto) {
         if (absolutePositioned) {
             style.setAlignSelf(ItemPositionStretch);
         } else {
@@ skipping 13 matching lines @@
         // if overflow-y is set to -webkit-paged-x or -webkit-page-y. For now, we'll let it
         // default to auto so we can at least scroll through the pages.
         style->setOverflowX(OAUTO);
     } else if (style->overflowY() == OVISIBLE && style->overflowX() != OVISIBLE) {
         style->setOverflowY(OAUTO);
     }
 }
 
 void StyleAdjuster::adjustStyleForDisplay(RenderStyle* style, RenderStyle* parentStyle)
 {
-    if (style->display() == BLOCK)
-        return;
-
-    if (parentStyle->isDisplayFlexibleOrGridBox()) {
+    if (parentStyle->isDisplayFlexibleBox()) {
         style->setDisplay(equivalentBlockDisplay(style->display()));
     }
 }
 
 }