Index: sky/sdk/lib/framework/fn2.dart |
diff --git a/sky/sdk/lib/framework/fn2.dart b/sky/sdk/lib/framework/fn2.dart |
index 962c9efd6ac899427f752314e84b801690b8c110..b1e95bdb3147b709556235cd0c3bbea0739fc9d6 100644 |
--- a/sky/sdk/lib/framework/fn2.dart |
+++ b/sky/sdk/lib/framework/fn2.dart |
@@ -543,10 +543,11 @@ class Container extends OneChildListRenderNodeWrapper { |
); |
} |
-class Paragraph extends OneChildListRenderNodeWrapper { |
+class Paragraph extends RenderNodeWrapper { |
- RenderCSSParagraph root; |
- RenderCSSParagraph createNode() => new RenderCSSParagraph(this); |
+ RenderParagraph root; |
+ RenderParagraph createNode() => new RenderParagraph(text); |
+ String text; |
static final Paragraph _emptyContainer = new Paragraph(); |
@@ -554,11 +555,15 @@ class Paragraph extends OneChildListRenderNodeWrapper { |
Paragraph({ |
Object key, |
- List<UINode> children |
+ this.text |
}) : super( |
- key: key, |
- children: children |
+ key: key |
); |
+ |
+ void syncRenderNode(UINode old) { |
+ super.syncRenderNode(old); |
+ root.text = text; |
+ } |
} |
class FlexContainer extends OneChildListRenderNodeWrapper { |
@@ -646,29 +651,6 @@ abstract class OneChildRenderNodeWrapper extends RenderNodeWrapper { |
} |
} |
-class TextFragment extends RenderNodeWrapper { |
- |
- RenderCSSInline root; |
- RenderCSSInline createNode() => new RenderCSSInline(this, this.data); |
- |
- static final TextFragment _emptyText = new TextFragment(''); |
- |
- RenderNodeWrapper get emptyNode => _emptyText; |
- |
- final String data; |
- |
- TextFragment(this.data, { |
- Object key |
- }) : super( |
- key: key |
- ); |
- |
- void syncRenderNode(UINode old) { |
- super.syncRenderNode(old); |
- root.data = data; |
- } |
-} |
- |
class Image extends RenderNodeWrapper { |
RenderCSSImage root; |
@@ -936,7 +918,7 @@ class Text extends Component { |
Text(this.data) : super(key: '*text*'); |
final String data; |
bool get interchangeable => true; |
- UINode build() => new Paragraph(children: [new TextFragment(data)]); |
+ UINode build() => new Paragraph(text: data); |
} |