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 30 matching lines...) Expand all Loading... | |
| 41 namespace WebCore { | 41 namespace WebCore { |
| 42 | 42 |
| 43 static bool checkDocumentAndRenderer(Element* element) | 43 static bool checkDocumentAndRenderer(Element* element) |
| 44 { | 44 { |
| 45 if (!element->inActiveDocument()) | 45 if (!element->inActiveDocument()) |
| 46 return false; | 46 return false; |
| 47 element->document().updateStyleIfNeeded(); | 47 element->document().updateStyleIfNeeded(); |
| 48 return element->renderer(); | 48 return element->renderer(); |
| 49 } | 49 } |
| 50 | 50 |
| 51 PassRefPtrWillBeRawPtr<AnimationEffect> EffectInput::convert(Element* element, c onst Vector<Dictionary>& keyframeDictionaryVector, bool unsafe) | 51 PassRefPtrWillBeRawPtr<AnimationEffect> EffectInput::convert(Element* element, c onst Vector<Dictionary>& keyframeDictionaryVector, ExceptionState& exceptionSta te, bool unsafe) |
| 52 { | 52 { |
| 53 // FIXME: This test will not be neccessary once resolution of keyframe value s occurs at | 53 // FIXME: This test will not be neccessary once resolution of keyframe value s occurs at |
| 54 // animation application time. | 54 // animation application time. |
| 55 if (!unsafe && !checkDocumentAndRenderer(element)) | 55 if (!unsafe && !checkDocumentAndRenderer(element)) |
| 56 return nullptr; | 56 return nullptr; |
| 57 | 57 |
| 58 StyleSheetContents* styleSheetContents = element->document().elementSheet(). contents(); | 58 StyleSheetContents* styleSheetContents = element->document().elementSheet(). contents(); |
| 59 | 59 |
| 60 // FIXME: Move this code into KeyframeEffectModel, it will be used by the ID L constructor for that class. | 60 // FIXME: Move this code into KeyframeEffectModel, it will be used by the ID L constructor for that class. |
| 61 KeyframeEffectModel::KeyframeVector keyframes; | 61 KeyframeEffectModel::KeyframeVector keyframes; |
| (...skipping 37 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 99 if (id == CSSPropertyInvalid || !CSSAnimations::isAnimatableProperty (id)) | 99 if (id == CSSPropertyInvalid || !CSSAnimations::isAnimatableProperty (id)) |
| 100 continue; | 100 continue; |
| 101 | 101 |
| 102 String value; | 102 String value; |
| 103 keyframeDictionaryVector[i].get(property, value); | 103 keyframeDictionaryVector[i].get(property, value); |
| 104 propertySet->setProperty(id, value, false, styleSheetContents); | 104 propertySet->setProperty(id, value, false, styleSheetContents); |
| 105 } | 105 } |
| 106 } | 106 } |
| 107 | 107 |
| 108 // FIXME: Replace this with code that just parses, when that code is availab le. | 108 // FIXME: Replace this with code that just parses, when that code is availab le. |
| 109 return StyleResolver::createKeyframeEffectModel(*element, propertySetVector, keyframes); | 109 RefPtrWillBeRawPtr<KeyframeEffectModel> keyframeEffectModel = StyleResolver: :createKeyframeEffectModel(*element, propertySetVector, keyframes); |
| 110 if (!keyframeEffectModel->isReplaceOnly()) | |
| 111 exceptionState.throwDOMException(NotSupportedError, "Partial keyframes a re not supported."); | |
|
shans
2014/03/19 20:43:27
do you need to return null in this case too, or is
| |
| 112 | |
| 113 return keyframeEffectModel; | |
| 110 } | 114 } |
| 111 | 115 |
| 112 } // namespace WebCore | 116 } // namespace WebCore |
| OLD | NEW |