Material light and dark themes for Sky widgets

sky/sdk/lib/painting/text_style.dart

Index: sky/sdk/lib/painting/text_style.dart
diff --git a/sky/sdk/lib/painting/text_style.dart b/sky/sdk/lib/painting/text_style.dart
index 19d3c547e0447c9560d92de91ce36220cb91490f..943aab71054f0da3c0465320dd96525b54045d41 100644
--- a/sky/sdk/lib/painting/text_style.dart
+++ b/sky/sdk/lib/painting/text_style.dart
@@ -74,10 +74,11 @@ class TextStyle {
 
   TextStyle copyWith({
     Color color,
+    String fontFamily,
     double fontSize,
     FontWeight fontWeight,
     TextAlign textAlign,
-    TextDecoration decoration,
+    List<TextDecoration> decoration,
     Color decorationColor,
     TextDecorationStyle decorationStyle
   }) {
@@ -97,6 +98,19 @@ class TextStyle {
     return 'rgba(${color.red}, ${color.green}, ${color.blue}, ${color.alpha / 255.0})';
   }
 
+  TextStyle merge(TextStyle other) {
+    return copyWith(
+      color: other.color,
+      fontFamily: other.fontFamily,
+      fontSize: other.fontSize,
+      fontWeight: other.fontWeight,
+      textAlign: other.textAlign,
+      decoration: other.decoration,
+      decorationColor: other.decorationColor,
+      decorationStyle: other.decorationStyle
+    );
+  }
+
   static String _fontFamilyToCSSString(String fontFamily) {
     // TODO(hansmuller): escape the fontFamily string.
     return fontFamily;