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

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 130 matching lines @@
     super._remove();
   }
 }
 
 class StyleNode extends ContentNode {
   final Style style;
 
   StyleNode(UINode content, this.style): super(content);
 }
 
-class ParentDataNode extends ContentNode {
-  final ParentData parentData;
-
-  ParentDataNode(UINode content, this.parentData): super(content);
-}
-
 /*
  * SkyNodeWrappers correspond to a desired state of a RenderCSS. They are fully
  * immutable, with one exception: A UINode which is a Component which lives within
  * an SkyElementWrapper's children list, may be replaced with the "old" instance if it
  * has become stateful.
  */
 abstract class SkyNodeWrapper extends UINode {
 
   static final Map<RenderCSS, SkyNodeWrapper> _nodeMap =
       new HashMap<RenderCSS, SkyNodeWrapper>();
@@ skipping 221 matching lines @@
     }
     return false;
   }
 
   void _syncNode(SkyNodeWrapper old) {
     SkyElementWrapper oldSkyElementWrapper = old as SkyElementWrapper;
 
     List<Style> styles = new List<Style>();
     if (style != null)
       styles.add(style);
-    ParentData parentData = null;
     UINode parent = _parent;
     while (parent != null && parent is! SkyNodeWrapper) {
       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(oldSkyElementWrapper);
   }
 
   void _syncChildren(SkyElementWrapper oldSkyElementWrapper) {
     if (_root is! RenderCSSContainer)
       return;
 
     var startIndex = 0;
@@ skipping 418 matching lines @@
   }
 
   void _buildIfDirty() {
     if (!_dirty || _defunct)
       return;
 
     _trace('$_key rebuilding...');
     _sync(null, _host, _root);
   }
 }