From 85817b24a05bbef07e7dbee30740fab7e6226126 Mon Sep 17 00:00:00 2001 From: Ojan Vafai Date: Mon, 17 Nov 2014 18:39:52 -0800 Subject: [PATCH] First step at getting rid of anonymous blocks and continuations. -Add RenderParagraph and display:paragraph. This is the only render type that's allowed to contain inlines or text. -If you put text nodes directly in a non-paragraph, wrap them in an anonymous paragraph. This may not be the place we want to end up, but it's a good stopgap to make it so we don't crash in this case. -Make StyleAdjuster force that non-paragraph blocks only contain RenderBlock subclasses and that paragraphs and inlines only contain inlines. -Considerably simplify addChildIgnoringAnonymousColumnBlocks now that we only create anonymous blocks for the case of text nodes in non-paragraphs. Also get rid of the behavior where we try to group multiple nodes into a single anonymous block. R=esprehn@chromium.org Review URL: https://codereview.chromium.org/729693003 --- examples/city-list/city-list.sky | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/examples/city-list/city-list.sky b/examples/city-list/city-list.sky index 92b3aa5759..c1ecc67aa8 100644 --- a/examples/city-list/city-list.sky +++ b/examples/city-list/city-list.sky @@ -14,6 +14,7 @@ color: #FFF; background-color: #333; padding: 4px 4px 4px 12px; + display: paragraph; }
{{ state }}
@@ -35,6 +36,7 @@ SkyElement({ font-weight: bold; padding: 2px 4px 4px 12px; background-color: #DDD; + display: paragraph; }
{{ letter }}
@@ -60,6 +62,10 @@ SkyElement({ overflow: hidden; } + div { + display: paragraph; + } + span { display: inline; }