Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(767)

Unified Diff: sky/engine/core/animation/EffectInput.cpp

Issue 922893002: Merge the Sky Engine changes from the SkyDart branch (Closed) Base URL: git@github.com:domokit/mojo.git@master
Patch Set: Created 5 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « sky/engine/core/animation/AnimationTimeline.h ('k') | sky/engine/core/animation/EffectInputTest.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: sky/engine/core/animation/EffectInput.cpp
diff --git a/sky/engine/core/animation/EffectInput.cpp b/sky/engine/core/animation/EffectInput.cpp
deleted file mode 100644
index 3615e8f28824ab07049d250e54813566df617b9d..0000000000000000000000000000000000000000
--- a/sky/engine/core/animation/EffectInput.cpp
+++ /dev/null
@@ -1,122 +0,0 @@
-/*
- * Copyright (C) 2013 Google Inc. All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are
- * met:
- *
- * * Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * * Redistributions in binary form must reproduce the above
- * copyright notice, this list of conditions and the following disclaimer
- * in the documentation and/or other materials provided with the
- * distribution.
- * * Neither the name of Google Inc. nor the names of its
- * contributors may be used to endorse or promote products derived from
- * this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#include "sky/engine/config.h"
-#include "sky/engine/core/animation/EffectInput.h"
-
-#include "sky/engine/bindings/core/v8/Dictionary.h"
-#include "sky/engine/core/animation/AnimationHelpers.h"
-#include "sky/engine/core/animation/KeyframeEffectModel.h"
-#include "sky/engine/core/animation/StringKeyframe.h"
-#include "sky/engine/core/css/parser/BisonCSSParser.h"
-#include "sky/engine/core/css/resolver/CSSToStyleMap.h"
-#include "sky/engine/core/css/resolver/StyleResolver.h"
-#include "sky/engine/core/dom/Document.h"
-#include "sky/engine/core/dom/Element.h"
-#include "sky/engine/wtf/NonCopyingSort.h"
-
-namespace blink {
-
-PassRefPtr<AnimationEffect> EffectInput::convert(Element* element, const Vector<Dictionary>& keyframeDictionaryVector, ExceptionState& exceptionState)
-{
- // FIXME: Remove the dependency on element.
- if (!element)
- return nullptr;
-
- StyleSheetContents* styleSheetContents = element->document().elementSheet().contents();
- StringKeyframeVector keyframes;
- double lastOffset = 0;
-
- for (size_t i = 0; i < keyframeDictionaryVector.size(); ++i) {
- RefPtr<StringKeyframe> keyframe = StringKeyframe::create();
-
- ScriptValue scriptValue;
- bool frameHasOffset = DictionaryHelper::get(keyframeDictionaryVector[i], "offset", scriptValue) && !scriptValue.isNull();
-
- if (frameHasOffset) {
- double offset;
- DictionaryHelper::get(keyframeDictionaryVector[i], "offset", offset);
-
- // Keyframes with offsets outside the range [0.0, 1.0] are an error.
- if (std::isnan(offset)) {
- exceptionState.throwDOMException(InvalidModificationError, "Non numeric offset provided");
- }
-
- if (offset < 0 || offset > 1) {
- exceptionState.throwDOMException(InvalidModificationError, "Offsets provided outside the range [0, 1]");
- return nullptr;
- }
-
- if (offset < lastOffset) {
- exceptionState.throwDOMException(InvalidModificationError, "Keyframes with specified offsets are not sorted");
- return nullptr;
- }
-
- lastOffset = offset;
-
- keyframe->setOffset(offset);
- }
- keyframes.append(keyframe);
-
- String compositeString;
- DictionaryHelper::get(keyframeDictionaryVector[i], "composite", compositeString);
- if (compositeString == "add")
- keyframe->setComposite(AnimationEffect::CompositeAdd);
-
- String timingFunctionString;
- if (DictionaryHelper::get(keyframeDictionaryVector[i], "easing", timingFunctionString)) {
- if (RefPtr<CSSValue> timingFunctionValue = BisonCSSParser::parseAnimationTimingFunctionValue(timingFunctionString))
- keyframe->setEasing(CSSToStyleMap::mapAnimationTimingFunction(timingFunctionValue.get(), true));
- }
-
- Vector<String> keyframeProperties;
- keyframeDictionaryVector[i].getOwnPropertyNames(keyframeProperties);
- for (size_t j = 0; j < keyframeProperties.size(); ++j) {
- String property = keyframeProperties[j];
- CSSPropertyID id = camelCaseCSSPropertyNameToID(property);
- if (id == CSSPropertyInvalid)
- continue;
- String value;
- DictionaryHelper::get(keyframeDictionaryVector[i], property, value);
- keyframe->setPropertyValue(id, value, styleSheetContents);
- }
- }
-
- RefPtr<StringKeyframeEffectModel> keyframeEffectModel = StringKeyframeEffectModel::create(keyframes);
- if (!keyframeEffectModel->isReplaceOnly()) {
- exceptionState.throwDOMException(NotSupportedError, "Partial keyframes are not supported.");
- return nullptr;
- }
- keyframeEffectModel->forceConversionsToAnimatableValues(element);
-
- return keyframeEffectModel;
-}
-
-} // namespace blink
« no previous file with comments | « sky/engine/core/animation/AnimationTimeline.h ('k') | sky/engine/core/animation/EffectInputTest.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698