Update charted to 0.4.8 and roll

packages/csslib/lib/src/property.dart

 // Copyright (c) 2012, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
 /** Representations of CSS styles. */
 
 part of csslib.parser;
 
 // TODO(terry): Prune down this file we do need some of the code in this file
 //              for darker, lighter, how to represent a Font, etc but alot of
@@ skipping 61 matching lines @@
    * RGB takes three values. The [red], [green], and [blue] parameters are
    * the intensity of those components where '0' is the least and '256' is the
    * greatest.
    *
    * If [alpha] is provided, it is the level of translucency which ranges from
    * '0' (completely transparent) to '1.0' (completely opaque).  It will
    * internally be mapped to an int between '0' and '255' like the other color
    * components.
    */
   Color.createRgba(int red, int green, int blue, [num alpha])
-      : this._argb = Color.convertToHexString(Color._clamp(red, 0, 255),
-          Color._clamp(green, 0, 255), Color._clamp(blue, 0, 255),
-          alpha != null ? Color._clamp(alpha, 0, 1) : alpha);
+      : this._argb = Color.convertToHexString(
+            Color._clamp(red, 0, 255),
+            Color._clamp(green, 0, 255),
+            Color._clamp(blue, 0, 255),
+            alpha != null ? Color._clamp(alpha, 0, 1) : alpha);
 
   /**
    * Creates a new color from a CSS color string. For more information, see
    * <https://developer.mozilla.org/en/CSS/color>.
    */
   Color.css(String color) : this._argb = Color._convertCssToArgb(color);
 
   // TODO(jmesserly): I found the use of percents a bit suprising.
   /**
    * HSL takes three values.  The [hueDegree] degree on the color wheel; '0' is
    * the least and '100' is the greatest.  The value '0' or '360' is red, '120'
    * is green, '240' is blue. Numbers in between reflect different shades.
    * The [saturationPercent] percentage; where'0' is the least and '100' is the
    * greatest (100 represents full color).  The [lightnessPercent] percentage;
    * where'0' is the least and '100' is the greatest.  The value 0 is dark or
    * black, 100 is light or white and 50 is a medium lightness.
    *
    * If [alpha] is provided, it is the level of translucency which ranges from
    * '0' (completely transparent foreground) to '1.0' (completely opaque
    * foreground).
    */
   Color.createHsla(num hueDegree, num saturationPercent, num lightnessPercent,
       [num alpha])
-      : this._argb = new Hsla(Color._clamp(hueDegree, 0, 360) / 360,
-          Color._clamp(saturationPercent, 0, 100) / 100,
-          Color._clamp(lightnessPercent, 0, 100) / 100,
-          alpha != null ? Color._clamp(alpha, 0, 1) : alpha).toHexArgbString();
+      : this._argb = new Hsla(
+                Color._clamp(hueDegree, 0, 360) / 360,
+                Color._clamp(saturationPercent, 0, 100) / 100,
+                Color._clamp(lightnessPercent, 0, 100) / 100,
+                alpha != null ? Color._clamp(alpha, 0, 1) : alpha)
+            .toHexArgbString();
 
   /**
    * The hslaRaw takes three values.  The [hue] degree on the color wheel; '0'
    * is the least and '1' is the greatest.  The value '0' or '1' is red, the
    * ratio of 120/360 is green, and the ratio of 240/360 is blue.  Numbers in
    * between reflect different shades.  The [saturation] is a percentage; '0'
    * is the least and '1' is the greatest.  The value of '1' is equivalent to
    * 100% (full colour).  The [lightness] is a percentage; '0' is the least and
    * '1' is the greatest.  The value of '0' is dark (black), the value of '1'
    * is light (white), and the value of '.50' is a medium lightness.
    *
    * The fourth optional parameter is:
    *   [alpha]      level of translucency range of values is 0..1, zero is a
    *                completely transparent foreground and 1 is a completely
    *                opaque foreground.
    */
   Color.hslaRaw(num hue, num saturation, num lightness, [num alpha])
-      : this._argb = new Hsla(Color._clamp(hue, 0, 1),
-          Color._clamp(saturation, 0, 1), Color._clamp(lightness, 0, 1),
-          alpha != null ? Color._clamp(alpha, 0, 1) : alpha).toHexArgbString();
+      : this._argb = new Hsla(
+                Color._clamp(hue, 0, 1),
+                Color._clamp(saturation, 0, 1),
+                Color._clamp(lightness, 0, 1),
+                alpha != null ? Color._clamp(alpha, 0, 1) : alpha)
+            .toHexArgbString();
 
   /**
    * Generate a real constant for pre-defined colors (no leading #).
    */
   const Color.hex(this._argb);
 
   // TODO(jmesserly): this is needed by the example so leave it exposed for now.
   String toString() => cssExpression;
 
   // TODO(terry): Regardless of how color is set (rgb, num, css or hsl) we'll
@@ skipping 380 matching lines @@
         this.g = Color._clamp(green, 0, 255),
         this.b = Color._clamp(blue, 0, 255),
         this.a = (alpha != null) ? Color._clamp(alpha, 0, 1) : alpha;
 
   factory Rgba.fromString(String hexValue) =>
       new Color.css("#${Color._convertCssToArgb(hexValue)}").rgba;
 
   factory Rgba.fromColor(Color color) => color.rgba;
 
   factory Rgba.fromArgbValue(num value) {
-    return new Rgba(((value.toInt() & 0xff000000) >> 0x18), /* a */
-        ((value.toInt() & 0xff0000) >> 0x10), /* r */
-        ((value.toInt() & 0xff00) >> 8), /* g */
-        ((value.toInt() & 0xff))); /* b */
+    return new Rgba(
+        ((value.toInt() & 0xff000000) >> 0x18), // a
+        ((value.toInt() & 0xff0000) >> 0x10), // r
+        ((value.toInt() & 0xff00) >> 8), // g
+        ((value.toInt() & 0xff))); // b
   }
 
   factory Rgba.fromHsla(Hsla hsla) {
     // Convert to Rgba.
     // See site <http://easyrgb.com/index.php?X=MATH> for good documentation
     // and color conversion routines.
 
     num h = hsla.hue;
     num s = hsla.saturation;
     num l = hsla.lightness;
@@ skipping 476 matching lines @@
   // Where width to display the text is also important in computing the line
   // height.  Classic typography suggest the ratio be 1.5.  See
   // <http://www.pearsonified.com/2011/12/golden-ratio-typography.php> and
   // <http://meyerweb.com/eric/thoughts/2008/05/06/line-height-abnormal/>.
   /**
    * Create a font using [size] of font in pixels, [family] name of font(s)
    * using [FontFamily], [style] of the font using [FontStyle], [variant] using
    * [FontVariant], and [lineHeight] extra space (leading) around the font in
    * pixels, if not specified it's 1.2 the font size.
    */
-  const Font({this.size, this.family, this.weight, this.style, this.variant,
+  const Font(
+      {this.size,
+      this.family,
+      this.weight,
+      this.style,
+      this.variant,
       this.lineHeight});
 
   /**
    * Merge the two fonts and return the result. See [Style.merge] for
    * more information.
    */
   factory Font.merge(Font a, Font b) {
     if (a == null) return b;
     if (b == null) return a;
     return new Font._merge(a, b);
@@ skipping 182 matching lines @@
    */
   num get width => (left != null ? left : 0) + (right != null ? right : 0);
 
   /**
    * The total size of the vertical edges. Equal to [top] + [bottom], where
    * null is interpreted as 0px.
    */
   num get height => (top != null ? top : 0) + (bottom != null ? bottom : 0);
 }
 
-_mergeVal(x, y) => y != null ? y : x;
+/*=T*/ _mergeVal/*<T>*/(/*=T*/ x, /*=T*/ y) => y != null ? y : x;