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

Unified Diff: sky/engine/core/css/resolver/SharedStyleFinder.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/SharedStyleFinder.cpp
diff --git a/sky/engine/core/css/resolver/SharedStyleFinder.cpp b/sky/engine/core/css/resolver/SharedStyleFinder.cpp
index 2a8be59c2fd3a0846a095c375250aaf0f5dbe1a6..ac19aeb1740fd54fbaed0a3ae8bc00856cd6432d 100644
--- a/sky/engine/core/css/resolver/SharedStyleFinder.cpp
+++ b/sky/engine/core/css/resolver/SharedStyleFinder.cpp
@@ -123,6 +123,11 @@ bool SharedStyleFinder::canShareStyleWithElement(Element& candidate) const
RenderStyle* parentStyle = parent->renderStyle();
if (!parentStyle)
return false;
+ // The StyleAdjuster will change the display of the renderer depending
+ // on it's parent's display.
+ if (RenderStyle::requiresOnlyBlockChildren(parentStyle) !=
+ RenderStyle::requiresOnlyBlockChildren(m_renderingParent->renderStyle()))
+ return false;
if (m_renderingParent->renderStyle()->inheritedNotEqual(parentStyle))
return false;
if (!sharingCandidateHasIdenticalStyleAffectingAttributes(candidate))
« no previous file with comments | « no previous file | sky/engine/core/css/resolver/StyleAdjuster.cpp » ('j') | sky/engine/core/css/resolver/StyleAdjuster.cpp » ('J')

Powered by Google App Engine
This is Rietveld 408576698