| 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 160 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 171 inline static PassRefPtrWillBeRawPtr<AnimatableValue> createFromLengthSize(const
LengthSize& lengthSize, const ComputedStyle& style) | 171 inline static PassRefPtrWillBeRawPtr<AnimatableValue> createFromLengthSize(const
LengthSize& lengthSize, const ComputedStyle& style) |
| 172 { | 172 { |
| 173 return AnimatableLengthSize::create( | 173 return AnimatableLengthSize::create( |
| 174 createFromLength(lengthSize.width(), style), | 174 createFromLength(lengthSize.width(), style), |
| 175 createFromLength(lengthSize.height(), style)); | 175 createFromLength(lengthSize.height(), style)); |
| 176 } | 176 } |
| 177 | 177 |
| 178 inline static PassRefPtrWillBeRawPtr<AnimatableValue> createFromStyleImage(Style
Image* image) | 178 inline static PassRefPtrWillBeRawPtr<AnimatableValue> createFromStyleImage(Style
Image* image) |
| 179 { | 179 { |
| 180 if (image) { | 180 if (image) { |
| 181 if (RefPtrWillBeRawPtr<CSSValue> cssValue = image->cssValue()) | 181 if (NullableCSSValue cssValue = image->cssValue()) |
| 182 return AnimatableImage::create(cssValue.release()); | 182 return AnimatableImage::create(*cssValue); |
| 183 } | 183 } |
| 184 return AnimatableUnknown::create(CSSValueNone); | 184 return AnimatableUnknown::create(CSSValueNone); |
| 185 } | 185 } |
| 186 | 186 |
| 187 inline static PassRefPtrWillBeRawPtr<AnimatableValue> createFromFillSize(const F
illSize& fillSize, const ComputedStyle& style) | 187 inline static PassRefPtrWillBeRawPtr<AnimatableValue> createFromFillSize(const F
illSize& fillSize, const ComputedStyle& style) |
| 188 { | 188 { |
| 189 switch (fillSize.type) { | 189 switch (fillSize.type) { |
| 190 case SizeLength: | 190 case SizeLength: |
| 191 return createFromLengthSize(fillSize.size, style); | 191 return createFromLengthSize(fillSize.size, style); |
| 192 case Contain: | 192 case Contain: |
| (...skipping 376 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 569 if (style.hasAutoZIndex()) | 569 if (style.hasAutoZIndex()) |
| 570 return AnimatableUnknown::create(CSSValueAuto); | 570 return AnimatableUnknown::create(CSSValueAuto); |
| 571 return createFromDouble(style.zIndex()); | 571 return createFromDouble(style.zIndex()); |
| 572 default: | 572 default: |
| 573 ASSERT_NOT_REACHED(); | 573 ASSERT_NOT_REACHED(); |
| 574 return nullptr; | 574 return nullptr; |
| 575 } | 575 } |
| 576 } | 576 } |
| 577 | 577 |
| 578 } // namespace blink | 578 } // namespace blink |
| OLD | NEW |