Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(563)

Unified Diff: sky/engine/core/css/resolver/StyleAdjuster.cpp

Issue 839153002: Fix crash in continuations. (Closed) Base URL: git@github.com:domokit/mojo.git@master
Patch Set: Created 5 years, 11 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: sky/engine/core/css/resolver/StyleAdjuster.cpp
diff --git a/sky/engine/core/css/resolver/StyleAdjuster.cpp b/sky/engine/core/css/resolver/StyleAdjuster.cpp
index f465d6b06a268ef2a85f3d075050b515a8075b0b..cddfc6d82dd8db6656a9be5dee2d60d8f56e3d01 100644
--- a/sky/engine/core/css/resolver/StyleAdjuster.cpp
+++ b/sky/engine/core/css/resolver/StyleAdjuster.cpp
@@ -41,28 +41,6 @@
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;
- }
-
- ASSERT_NOT_REACHED();
- return false;
-}
-
static EDisplay equivalentInlineDisplay(EDisplay display)
{
switch (display) {
@@ -161,7 +139,7 @@ void StyleAdjuster::adjustRenderStyle(RenderStyle* style, RenderStyle* parentSty
if (style->hasOutOfFlowPosition() || element.document().documentElement() == element)
style->setDisplay(equivalentBlockDisplay(style->display()));
- if (requiresOnlyBlockChildren(parentStyle))
+ if (RenderStyle::requiresOnlyBlockChildren(parentStyle))
esprehn 2015/01/09 00:56:57 parentStyle->requiresOnlyBlockChildren()
style->setDisplay(equivalentBlockDisplay(style->display()));
else
style->setDisplay(equivalentInlineDisplay(style->display()));

Powered by Google App Engine
This is Rietveld 408576698