Revert "[Effen] Move 'flex' out of CSS also."

sky/framework/layout.dart

 library layout;
 
 import 'node.dart';
 import 'dart:sky' as sky;
 import 'dart:collection';
 
 // UTILS
 
 // Bridge to legacy CSS-like style specification
 // Eventually we'll replace this with something else
@@ skipping 35 matching lines @@
 }
 
 
 // ABSTRACT LAYOUT
 
 class ParentData {
   void detach() {
     detachSiblings();
   }
   void detachSiblings() { } // workaround for lack of inter-class mixins in Dart
-  void merge(ParentData other) {
-    // override this in subclasses to merge in data from other into this
-    assert(other.runtimeType == this.runtimeType);
-  }
 }
 
 abstract class RenderNode extends Node {
 
   // LAYOUT
 
   // parentData is only for use by the RenderNode that actually lays this
   // node out, and any other nodes who happen to know exactly what
   // kind of node that is.
   ParentData parentData;
@@ skipping 188 matching lines @@
   sky.Element createSkyElement();
 
   void updateStyles(List<Style> styles) {
     _skyElement.setAttribute('class', stylesToClasses(styles));
   }
 
   String stylesToClasses(List<Style> styles) {
     return styles.map((s) => s._className).join(' ');
   }
 
-  String _inlineStyles = '';
-  String _additionalStylesFromParent = ''; // used internally to propagate parentData settings to the child
-
   void updateInlineStyle(String newStyle) {
-    _inlineStyles = newStyle;
-    _updateInlineStyleAttribute();
-  }
-
-  void _updateInlineStyleAttribute() {
-    _skyElement.setAttribute('style', "$_inlineStyles;$_additionalStylesFromParent");
+    _skyElement.setAttribute('style', newStyle);
   }
 
   double get width {
     sky.ClientRect rect = _skyElement.getBoundingClientRect();
     return rect.width;
   }
 
   double get height {
     sky.ClientRect rect = _skyElement.getBoundingClientRect();
     return rect.height;
@@ skipping 37 matching lines @@
       _skyElement.appendChild(child._skyElement);
     }    
   }
   void remove(RenderCSS child) {
     child._skyElement.remove();
     super.remove(child);
   }
 
 }
 
-class FlexBoxParentData extends CSSParentData {
-  int flex;
-  void merge(FlexBoxParentData other) {
-    if (other.flex != null)
-      flex = other.flex;
-    super.merge(other);
-  }
-}
+class FlexBoxParentData extends CSSParentData { }
 
 enum FlexDirection { Row }
 
 class RenderCSSFlex extends RenderCSSContainer {
 
   RenderCSSFlex(debug, FlexDirection direction) : _direction = direction, super(debug);
 
   FlexDirection _direction;
   FlexDirection get direction => _direction;
   void set direction (FlexDirection value) {
@@ skipping 10 matching lines @@
   static final Style _displayFlexRow = new Style('flex-direction:row');
 
   String stylesToClasses(List<Style> styles) {
     var settings = _displayFlex._className;
     switch (_direction) {
       case FlexDirection.Row: settings += ' ' + _displayFlexRow._className;
     }
     return super.stylesToClasses(styles) + ' ' + settings;
   }
 
-  void markNeedsLayout() {
-    super.markNeedsLayout();
-
-    // pretend we did the layout:
-    RenderCSS child = _firstChild;
-    while (child != null) {
-      assert(child.parentData is FlexBoxParentData);
-      if (child.parentData.flex != null) {
-        child._additionalStylesFromParent = 'flex:${child.parentData.flex};';
-        child._updateInlineStyleAttribute();
-      }
-      child = child.parentData.nextSibling;
-    }
-  }
-
 }
 
 class RenderCSSText extends RenderCSS {
 
   RenderCSSText(debug, String newData) : super(debug) {
     data = newData;
   }
 
   static final Style _displayParagraph = new Style('display:paragraph');
 
@@ skipping 70 matching lines @@
   print(prefix + node.toString() + _attributes(node));
   var children = node.getChildNodes();
   prefix = prefix + '  ';
   for (var child in children)
     _serialiseDOM(child, prefix);
 }
 
 void dumpState() {
   _serialiseDOM(sky.document);
 }