| OLD | NEW |
| 1 /* | 1 /* |
| 2 * Copyright (C) 2013 Google Inc. All rights reserved. | 2 * Copyright (C) 2013 Google Inc. All rights reserved. |
| 3 * | 3 * |
| 4 * Redistribution and use in source and binary forms, with or without | 4 * Redistribution and use in source and binary forms, with or without |
| 5 * modification, are permitted provided that the following conditions are | 5 * modification, are permitted provided that the following conditions are |
| 6 * met: | 6 * met: |
| 7 * | 7 * |
| 8 * * Redistributions of source code must retain the above copyright | 8 * * Redistributions of source code must retain the above copyright |
| 9 * notice, this list of conditions and the following disclaimer. | 9 * notice, this list of conditions and the following disclaimer. |
| 10 * * Redistributions in binary form must reproduce the above | 10 * * Redistributions in binary form must reproduce the above |
| (...skipping 206 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 217 { | 217 { |
| 218 Color color = style.colorIncludingFallback(property, false); | 218 Color color = style.colorIncludingFallback(property, false); |
| 219 Color visitedLinkColor = style.colorIncludingFallback(property, true); | 219 Color visitedLinkColor = style.colorIncludingFallback(property, true); |
| 220 return AnimatableColor::create(color, visitedLinkColor); | 220 return AnimatableColor::create(color, visitedLinkColor); |
| 221 } | 221 } |
| 222 | 222 |
| 223 inline static PassRefPtrWillBeRawPtr<AnimatableValue> createFromShapeValue(Shape
Value* value) | 223 inline static PassRefPtrWillBeRawPtr<AnimatableValue> createFromShapeValue(Shape
Value* value) |
| 224 { | 224 { |
| 225 if (value) | 225 if (value) |
| 226 return AnimatableShapeValue::create(value); | 226 return AnimatableShapeValue::create(value); |
| 227 return AnimatableUnknown::create(CSSValueAuto); | 227 return AnimatableUnknown::create(CSSValueNone); |
| 228 } | 228 } |
| 229 | 229 |
| 230 static double fontWeightToDouble(FontWeight fontWeight) | 230 static double fontWeightToDouble(FontWeight fontWeight) |
| 231 { | 231 { |
| 232 switch (fontWeight) { | 232 switch (fontWeight) { |
| 233 case FontWeight100: | 233 case FontWeight100: |
| 234 return 100; | 234 return 100; |
| 235 case FontWeight200: | 235 case FontWeight200: |
| 236 return 200; | 236 return 200; |
| 237 case FontWeight300: | 237 case FontWeight300: |
| (...skipping 275 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 513 case CSSPropertyZoom: | 513 case CSSPropertyZoom: |
| 514 return createFromDouble(style.zoom()); | 514 return createFromDouble(style.zoom()); |
| 515 default: | 515 default: |
| 516 ASSERT_NOT_REACHED(); | 516 ASSERT_NOT_REACHED(); |
| 517 // This return value is to avoid a release crash if possible. | 517 // This return value is to avoid a release crash if possible. |
| 518 return AnimatableUnknown::create(nullptr); | 518 return AnimatableUnknown::create(nullptr); |
| 519 } | 519 } |
| 520 } | 520 } |
| 521 | 521 |
| 522 } // namespace WebCore | 522 } // namespace WebCore |
| OLD | NEW |