First step at getting rid of anonymous blocks and continuations.

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 23 matching lines @@
 #include "core/dom/Element.h"
 #include "core/dom/NodeRenderStyle.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 bool requiresOnlyBlockChildren(RenderStyle* parentStyle)
+{
+    switch (parentStyle->display()) {
+    case PARAGRAPH:
+    case INLINE:
+        return false;
+
+    case BLOCK:
+    case FLEX:
+    case INLINE_FLEX:
+    case INLINE_BLOCK:
+        return true;
+
+    case NONE:
+        ASSERT_NOT_REACHED();
+        return false;
+    }
+}
+
+static EDisplay equivalentInlineDisplay(EDisplay display)
+{
+    switch (display) {
+    // TODO(ojan): Do we need an INLINE_PARAGRAPH display?
+    case PARAGRAPH:
+        return INLINE;
+
+    case BLOCK:
+        return INLINE_BLOCK;
+
+    case FLEX:
+        return INLINE_FLEX;
+
+    case INLINE:
+    case INLINE_FLEX:
+    case INLINE_BLOCK:
+        return display;
+
+    case NONE:
+        ASSERT_NOT_REACHED();
+        return NONE;
+    }
+}
+
 static EDisplay equivalentBlockDisplay(EDisplay display)
 {
     switch (display) {
+    case PARAGRAPH:
     case BLOCK:
     case FLEX:
         return display;
+
     case INLINE_FLEX:
         return FLEX;
 
     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();
 }
 
@@ skipping 34 matching lines @@
 
 void StyleAdjuster::adjustRenderStyle(RenderStyle* style, RenderStyle* parentStyle, Element& element)
 {
     ASSERT(parentStyle);
 
     if (style->display() != NONE) {
         // Absolute/fixed positioned elements, floating elements and the document element need block-like outside display.
         if (style->hasOutOfFlowPosition() || element.document().documentElement() == element)
             style->setDisplay(equivalentBlockDisplay(style->display()));
 
-        adjustStyleForDisplay(style, parentStyle);
+        if (requiresOnlyBlockChildren(parentStyle))
+            style->setDisplay(equivalentBlockDisplay(style->display()));
+        else
+            style->setDisplay(equivalentInlineDisplay(style->display()));
     }
 
     // Make sure our z-index value is only applied if the object is positioned.
     if (style->position() == StaticPosition && !parentStyleForcesZIndexToCreateStackingContext(parentStyle))
         style->setHasAutoZIndex();
 
     // Auto z-index becomes 0 for the root element and transparent objects. This prevents
     // cases where objects that should be blended as a single unit end up with a non-transparent
     // object wedged in between them. Auto z-index also becomes 0 for objects that specify transforms/masks/reflections.
     if (style->hasAutoZIndex() && ((element.document().documentElement() == element)
@@ skipping 99 matching lines @@
     if (style->overflowX() == OVISIBLE && style->overflowY() != OVISIBLE) {
         // FIXME: Once we implement pagination controls, overflow-x should default to hidden
         // 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 (parentStyle->isDisplayFlexibleBox()) {
-        style->setDisplay(equivalentBlockDisplay(style->display()));
-    }
-}
-
 }