[Effen] Rationalise RenderNodeWrapper and OneChildListRenderNodeWrapper.

sky/framework/fn.dart

 // Copyright 2015 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 library fn;
 
 import 'dart:async';
 import 'dart:collection';
 import 'dart:sky' as sky;
 import 'reflect.dart' as reflect;
@@ skipping 269 matching lines @@
  * children list, may be replaced with the "old" instance if it has
  * become stateful.
  */
 abstract class RenderNodeWrapper extends UINode {
 
   static final Map<RenderCSS, RenderNodeWrapper> _nodeMap =
       new HashMap<RenderCSS, RenderNodeWrapper>();
 
   static RenderNodeWrapper _getMounted(RenderCSS node) => _nodeMap[node];
 
-  RenderNodeWrapper({ Object key }) : super(key: key);
+  RenderNodeWrapper({
+    Object key,
+    this.style,
+    this.inlineStyle
+  }) : super(key: key);
 
-  RenderNodeWrapper get _emptyNode;
+  final Style style;
+  final String inlineStyle;
 
   RenderCSS _createNode();
+  RenderNodeWrapper get _emptyNode;
 
   void _sync(UINode old, RenderCSSContainer host, RenderCSS insertBefore) {
     if (old == null) {
       _root = _createNode();
       assert(_root != null);
       host.add(_root, before: insertBefore);
       old = _emptyNode;
     } else {
       _root = old._root;
       assert(_root != null);
     }
 
     _nodeMap[_root] = this;
-    _syncNode(old);
+    _syncRenderNode(old);
   }
 
-  void _syncNode(RenderNodeWrapper old);
+  void _syncRenderNode(RenderNodeWrapper old) {
+    RenderNodeWrapper oldRenderNodeWrapper = old as RenderNodeWrapper;
+
+    List<Style> styles = new List<Style>();
+    if (style != null)
+      styles.add(style);
+    ParentData parentData = null;
+    UINode parent = _parent;
+    while (parent != null && parent is! RenderNodeWrapper) {
+      if (parent is StyleNode && parent.style != null)
+        styles.add(parent.style);
+      else
+      if (parent is ParentDataNode && parent.parentData != null) {
+        if (parentData != null)
+          parentData.merge(parent.parentData); // this will throw if the types aren't the same
+        else
+          parentData = parent.parentData;
+      }
+      parent = parent._parent;
+    }
+    _root.updateStyles(styles);
+    if (parentData != null) {
+      assert(_root.parentData != null);
+      _root.parentData.merge(parentData); // this will throw if the types aren't approriate
+      assert(parent != null);
+      assert(parent._root != null);
+      parent._root.markNeedsLayout();
+    }
+    _root.updateInlineStyle(inlineStyle);
+  }
 
   void _removeChild(UINode node) {
     assert(_root is RenderCSSContainer);
     _root.remove(node._root);
     super._removeChild(node);
   }
 
   void _remove() {
     assert(_root != null);
     _nodeMap.remove(_root);
     super._remove();
   }
 }
 
 final List<UINode> _emptyList = new List<UINode>();
 
 abstract class OneChildListRenderNodeWrapper extends RenderNodeWrapper {
 
   final List<UINode> children;
-  final Style style;
-  final String inlineStyle;
 
   OneChildListRenderNodeWrapper({
     Object key,
     List<UINode> children,
-    this.style,
-    this.inlineStyle
+    Style style,
+    String inlineStyle
   }) : this.children = children == null ? _emptyList : children,
-       super(key: key) {
-
+  super(
+    key: key,
+    style: style,
+    inlineStyle: inlineStyle
+  ) {
     assert(!_debugHasDuplicateIds());
   }
 
   void _remove() {
     assert(children != null);
     for (var child in children) {
       assert(child != null);
       _removeChild(child);
     }
     super._remove();
   }
 
   bool _debugHasDuplicateIds() {
     var idSet = new HashSet<String>();
     for (var child in children) {
       assert(child != null);
       if (child.interchangeable)
         continue; // when these nodes are reordered, we just reassign the data
 
       if (!idSet.add(child._key)) {
         throw '''If multiple non-interchangeable nodes of the same type exist as children
                 of another node, they must have unique keys.
                 Duplicate: "${child._key}"''';
       }
     }
     return false;
   }
 
-  void _syncNode(RenderNodeWrapper old) {
-    OneChildListRenderNodeWrapper oldOneChildListRenderNodeWrapper = old as OneChildListRenderNodeWrapper;
+  void _syncRenderNode(OneChildListRenderNodeWrapper old) {
+    super._syncRenderNode(old);
 
-    List<Style> styles = new List<Style>();
-    if (style != null)
-      styles.add(style);
-    ParentData parentData = null;
-    UINode parent = _parent;
-    while (parent != null && parent is! RenderNodeWrapper) {
-      if (parent is StyleNode && parent.style != null)
-        styles.add(parent.style);
-      else
-      if (parent is ParentDataNode && parent.parentData != null) {
-        if (parentData != null)
-          parentData.merge(parent.parentData); // this will throw if the types aren't the same
-        else
-          parentData = parent.parentData;
-      }
-      parent = parent._parent;
-    }
-    _root.updateStyles(styles);
-    if (parentData != null) {
-      assert(_root.parentData != null);
-      _root.parentData.merge(parentData); // this will throw if the types aren't approriate
-      assert(parent != null);
-      assert(parent._root != null);
-      parent._root.markNeedsLayout();
-    }
-    _root.updateInlineStyle(inlineStyle);
-
-    _syncChildren(oldOneChildListRenderNodeWrapper);
-  }
-
-  void _syncChildren(OneChildListRenderNodeWrapper oldOneChildListRenderNodeWrapper) {
     if (_root is! RenderCSSContainer)
       return;
 
     var startIndex = 0;
     var endIndex = children.length;
 
-    var oldChildren = oldOneChildListRenderNodeWrapper.children;
+    var oldChildren = old.children;
     var oldStartIndex = 0;
     var oldEndIndex = oldChildren.length;
 
     RenderCSS nextSibling = null;
     UINode currentNode = null;
     UINode oldNode = null;
 
     void sync(int atIndex) {
       children[atIndex] = _syncChild(currentNode, oldNode, _root, nextSibling);
       assert(children[atIndex] != null);
@@ skipping 47 matching lines @@
         return false; // never re-order these nodes
 
       ensureOldIdMap();
       oldNode = oldNodeIdMap[currentNode._key];
       if (oldNode == null)
         return false;
 
       oldNodeIdMap[currentNode._key] = null; // mark it reordered
       assert(_root is RenderCSSContainer);
       assert(oldNode._root is RenderCSSContainer);
-      oldOneChildListRenderNodeWrapper._root.remove(oldNode._root);
+      old._root.remove(oldNode._root);
       _root.add(oldNode._root, before: nextSibling);
       return true;
     }
 
     // Scan forwards, this time we may re-order;
     nextSibling = _root.firstChild;
     while (startIndex < endIndex && oldStartIndex < oldEndIndex) {
       currentNode = children[startIndex];
       oldNode = oldChildren[oldStartIndex];
 
@@ skipping 92 matching lines @@
     Style style,
     String inlineStyle,
     this.direction: FlexDirection.Row
   }) : super(
     key: key,
     children: children,
     style: style,
     inlineStyle: inlineStyle
   );
 
-  void _syncNode(UINode old) {
-    super._syncNode(old);
+  void _syncRenderNode(UINode old) {
+    super._syncRenderNode(old);
     _root.direction = direction;
   }
 }
 
 class FillStackContainer extends OneChildListRenderNodeWrapper {
 
   RenderCSSStack _root;
   RenderCSSStack _createNode() => new RenderCSSStack(this);
 
   static final FillStackContainer _emptyContainer = new FillStackContainer();
@@ skipping 20 matching lines @@
 
   static List<UINode> _positionNodesToFill(List<UINode> input) {
     if (input == null)
       return null;
     return input.map((node) {
       return new ParentDataNode(node, _fillParentData);
     }).toList();
   }
 }
 
-class TextFragment extends OneChildListRenderNodeWrapper {
+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,
     Style style,
     String inlineStyle
   }) : super(
     key: key,
     style: style,
     inlineStyle: inlineStyle
   );
 
-  void _syncNode(UINode old) {
-    super._syncNode(old);
+  void _syncRenderNode(UINode old) {
+    super._syncRenderNode(old);
     _root.data = data;
   }
 }
 
-class Image extends OneChildListRenderNodeWrapper {
+class Image extends RenderNodeWrapper {
 
   RenderCSSImage _root;
   RenderCSSImage _createNode() => new RenderCSSImage(this, this.src, this.width, this.height);
 
   static final Image _emptyImage = new Image();
 
   RenderNodeWrapper get _emptyNode => _emptyImage;
 
   final String src;
   final int width;
   final int height;
 
   Image({
     Object key,
     Style style,
     String inlineStyle,
     this.width,
     this.height,
     this.src
   }) : super(
     key: key,
     style: style,
     inlineStyle: inlineStyle
   );
 
-  void _syncNode(UINode old) {
-    super._syncNode(old);
+  void _syncRenderNode(UINode old) {
+    super._syncRenderNode(old);
     _root.configure(this.src, this.width, this.height);
   }
 }
 
 
 Set<Component> _mountedComponents = new HashSet<Component>();
 Set<Component> _unmountedComponents = new HashSet<Component>();
 
 void _enqueueDidMount(Component c) {
   assert(!_notifingMountStatus);
@@ skipping 218 matching lines @@
     _sync(null, _host, _root);
   }
 }
 
 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)]);
 }