| 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 53 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 64 namespace blink { | 64 namespace blink { |
| 65 | 65 |
| 66 static PassRefPtr<AnimatableValue> createFromLengthWithZoom(const Length& length
, float zoom) | 66 static PassRefPtr<AnimatableValue> createFromLengthWithZoom(const Length& length
, float zoom) |
| 67 { | 67 { |
| 68 switch (length.type()) { | 68 switch (length.type()) { |
| 69 case Fixed: | 69 case Fixed: |
| 70 case Percent: | 70 case Percent: |
| 71 case Calculated: | 71 case Calculated: |
| 72 return AnimatableLength::create(length, zoom); | 72 return AnimatableLength::create(length, zoom); |
| 73 case Auto: | 73 case Auto: |
| 74 case Intrinsic: | |
| 75 case MinIntrinsic: | |
| 76 case MinContent: | 74 case MinContent: |
| 77 case MaxContent: | 75 case MaxContent: |
| 78 case FillAvailable: | 76 case FillAvailable: |
| 79 case FitContent: | 77 case FitContent: |
| 80 return AnimatableUnknown::create(CSSPrimitiveValue::create(length, 1)); | 78 return AnimatableUnknown::create(CSSPrimitiveValue::create(length, 1)); |
| 81 case MaxSizeNone: | 79 case MaxSizeNone: |
| 82 return AnimatableUnknown::create(CSSValueNone); | 80 return AnimatableUnknown::create(CSSValueNone); |
| 83 case ExtendToZoom: // Does not apply to elements. | 81 case ExtendToZoom: // Does not apply to elements. |
| 84 case DeviceWidth: | 82 case DeviceWidth: |
| 85 case DeviceHeight: | 83 case DeviceHeight: |
| (...skipping 507 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 593 if (style.hasAutoZIndex()) | 591 if (style.hasAutoZIndex()) |
| 594 return AnimatableUnknown::create(CSSValueAuto); | 592 return AnimatableUnknown::create(CSSValueAuto); |
| 595 return createFromDouble(style.zIndex()); | 593 return createFromDouble(style.zIndex()); |
| 596 default: | 594 default: |
| 597 ASSERT_NOT_REACHED(); | 595 ASSERT_NOT_REACHED(); |
| 598 return nullptr; | 596 return nullptr; |
| 599 } | 597 } |
| 600 } | 598 } |
| 601 | 599 |
| 602 } // namespace blink | 600 } // namespace blink |
| OLD | NEW |