| 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 236 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 247 PropertyHandleSet properties = keyframeEffect.properties(); | 247 PropertyHandleSet properties = keyframeEffect.properties(); |
| 248 if (properties.isEmpty()) | 248 if (properties.isEmpty()) |
| 249 return false; | 249 return false; |
| 250 | 250 |
| 251 unsigned transformPropertyCount = 0; | 251 unsigned transformPropertyCount = 0; |
| 252 for (const auto& property : properties) { | 252 for (const auto& property : properties) { |
| 253 if (!property.isCSSProperty()) | 253 if (!property.isCSSProperty()) |
| 254 return false; | 254 return false; |
| 255 | 255 |
| 256 if (isTransformRelatedCSSProperty(property)) { | 256 if (isTransformRelatedCSSProperty(property)) { |
| 257 if (targetElement.layoutObject() && targetElement.layoutObject()->is
Inline()) { | 257 if (targetElement.layoutObject() && targetElement.layoutObject()->is
Inline() && !targetElement.layoutObject()->isInlineBlockOrInlineTable()) { |
| 258 return false; | 258 return false; |
| 259 } | 259 } |
| 260 transformPropertyCount++; | 260 transformPropertyCount++; |
| 261 } | 261 } |
| 262 | 262 |
| 263 const PropertySpecificKeyframeVector& keyframes = keyframeEffect.getProp
ertySpecificKeyframes(property); | 263 const PropertySpecificKeyframeVector& keyframes = keyframeEffect.getProp
ertySpecificKeyframes(property); |
| 264 ASSERT(keyframes.size() >= 2); | 264 ASSERT(keyframes.size() >= 2); |
| 265 for (const auto& keyframe : keyframes) { | 265 for (const auto& keyframe : keyframes) { |
| 266 // FIXME: Determine candidacy based on the CSSValue instead of a sna
pshot AnimatableValue. | 266 // FIXME: Determine candidacy based on the CSSValue instead of a sna
pshot AnimatableValue. |
| 267 bool isNeutralKeyframe = keyframe->isCSSPropertySpecificKeyframe() &
& !toCSSPropertySpecificKeyframe(keyframe.get())->value() && keyframe->composite
() == EffectModel::CompositeAdd; | 267 bool isNeutralKeyframe = keyframe->isCSSPropertySpecificKeyframe() &
& !toCSSPropertySpecificKeyframe(keyframe.get())->value() && keyframe->composite
() == EffectModel::CompositeAdd; |
| (...skipping 468 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 736 break; | 736 break; |
| 737 default: | 737 default: |
| 738 ASSERT_NOT_REACHED(); | 738 ASSERT_NOT_REACHED(); |
| 739 } | 739 } |
| 740 animations.append(animation.release()); | 740 animations.append(animation.release()); |
| 741 } | 741 } |
| 742 ASSERT(!animations.isEmpty()); | 742 ASSERT(!animations.isEmpty()); |
| 743 } | 743 } |
| 744 | 744 |
| 745 } // namespace blink | 745 } // namespace blink |
| OLD | NEW |