Chromium Code Reviews| 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 226 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 237 | 237 |
| 238 unsigned transformPropertyCount = 0; | 238 unsigned transformPropertyCount = 0; |
| 239 for (const auto& property : properties) { | 239 for (const auto& property : properties) { |
| 240 if (!property.isCSSProperty()) | 240 if (!property.isCSSProperty()) |
| 241 return false; | 241 return false; |
| 242 | 242 |
| 243 if (isTransformRelatedCSSProperty(property)) { | 243 if (isTransformRelatedCSSProperty(property)) { |
| 244 if (targetElement.layoutObject() && targetElement.layoutObject()->is Inline() && !targetElement.layoutObject()->isInlineBlockOrInlineTable()) { | 244 if (targetElement.layoutObject() && targetElement.layoutObject()->is Inline() && !targetElement.layoutObject()->isInlineBlockOrInlineTable()) { |
| 245 return false; | 245 return false; |
| 246 } | 246 } |
| 247 for (LayoutObject* layoutObject = targetElement.layoutObject(); layo utObject; layoutObject = layoutObject->parent()) { | |
| 248 if (layoutObject->styleRef().filter().hasReferenceFilter()) { | |
|
chrishtr
2016/08/11 01:23:59
All reference filters need css-specified geometry?
Stephen White
2016/08/11 15:17:12
Yes. All reference filters include the "filter reg
| |
| 249 return false; | |
| 250 } | |
| 251 } | |
| 247 transformPropertyCount++; | 252 transformPropertyCount++; |
| 248 } | 253 } |
| 249 | 254 |
| 250 const PropertySpecificKeyframeVector& keyframes = keyframeEffect.getProp ertySpecificKeyframes(property); | 255 const PropertySpecificKeyframeVector& keyframes = keyframeEffect.getProp ertySpecificKeyframes(property); |
| 251 ASSERT(keyframes.size() >= 2); | 256 ASSERT(keyframes.size() >= 2); |
| 252 for (const auto& keyframe : keyframes) { | 257 for (const auto& keyframe : keyframes) { |
| 253 // FIXME: Determine candidacy based on the CSSValue instead of a sna pshot AnimatableValue. | 258 // FIXME: Determine candidacy based on the CSSValue instead of a sna pshot AnimatableValue. |
| 254 bool isNeutralKeyframe = keyframe->isCSSPropertySpecificKeyframe() & & !toCSSPropertySpecificKeyframe(keyframe.get())->value() && keyframe->composite () == EffectModel::CompositeAdd; | 259 bool isNeutralKeyframe = keyframe->isCSSPropertySpecificKeyframe() & & !toCSSPropertySpecificKeyframe(keyframe.get())->value() && keyframe->composite () == EffectModel::CompositeAdd; |
| 255 if ((keyframe->composite() != EffectModel::CompositeReplace && !isNe utralKeyframe) || !keyframe->getAnimatableValue()) | 260 if ((keyframe->composite() != EffectModel::CompositeReplace && !isNe utralKeyframe) || !keyframe->getAnimatableValue()) |
| 256 return false; | 261 return false; |
| (...skipping 386 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 643 break; | 648 break; |
| 644 default: | 649 default: |
| 645 NOTREACHED(); | 650 NOTREACHED(); |
| 646 } | 651 } |
| 647 animations.append(std::move(animation)); | 652 animations.append(std::move(animation)); |
| 648 } | 653 } |
| 649 ASSERT(!animations.isEmpty()); | 654 ASSERT(!animations.isEmpty()); |
| 650 } | 655 } |
| 651 | 656 |
| 652 } // namespace blink | 657 } // namespace blink |
| OLD | NEW |