Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-11-24 21:31:04 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 1311257 - Move AnimationPropertySegment in a separate header and expose it in FFI. r=heycam

Browse Source 
This will be used for animation value composition in Rust.

MozReview-Commit-ID: Lg4dZrQW1WC

--HG--
extra : rebase_source : e03b19aa7907c122f773b2b06df96aee4fe32ae2
This commit is contained in:
Hiroyuki Ikezoe 2017-04-06 10:34:50 +09:00
parent 80d32932a1
commit 472261864f
3 changed files with 65 additions and 44 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

63
dom/animation/AnimationPropertySegment.h Normal file
View File

@ -0,0 +1,63 @@
/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
/* vim: set ts=8 sts=2 et sw=2 tw=80: */
/* This Source Code Form is subject to the terms of the Mozilla Public
* License, v. 2.0. If a copy of the MPL was not distributed with this file,
* You can obtain one at http://mozilla.org/MPL/2.0/. */
#ifndef mozilla_dom_AnimationPropertySegment_h
#define mozilla_dom_AnimationPropertySegment_h
#include "mozilla/ComputedTimingFunction.h"
#include "mozilla/Maybe.h"
#include "mozilla/StyleAnimationValue.h" // For AnimationValue
#include "mozilla/dom/BaseKeyframeTypesBinding.h" // For CompositeOperation
namespace mozilla {
struct AnimationPropertySegment
{
float mFromKey, mToKey;
// NOTE: In the case that no keyframe for 0 or 1 offset is specified
// the unit of mFromValue or mToValue is eUnit_Null.
AnimationValue mFromValue, mToValue;
Maybe<ComputedTimingFunction> mTimingFunction;
dom::CompositeOperation mFromComposite = dom::CompositeOperation::Replace;
dom::CompositeOperation mToComposite = dom::CompositeOperation::Replace;
bool HasReplaceableValues() const
{
return HasReplaceableFromValue() && HasReplaceableToValue();
}
bool HasReplaceableFromValue() const
{
return !mFromValue.IsNull() &&
mFromComposite == dom::CompositeOperation::Replace;
}
bool HasReplaceableToValue() const
{
return !mToValue.IsNull() &&
mToComposite == dom::CompositeOperation::Replace;
}
bool operator==(const AnimationPropertySegment& aOther) const
{
return mFromKey == aOther.mFromKey &&
mToKey == aOther.mToKey &&
mFromValue == aOther.mFromValue &&
mToValue == aOther.mToValue &&
mTimingFunction == aOther.mTimingFunction &&
mFromComposite == aOther.mFromComposite &&
mToComposite == aOther.mToComposite;
}
bool operator!=(const AnimationPropertySegment& aOther) const
{
return !(*this == aOther);
}
};
}
#endif // mozilla_dom_AnimationPropertySegment_h

45
dom/animation/KeyframeEffectReadOnly.h
View File

@ -16,6 +16,7 @@
#include "nsTArray.h"
#include "nsWrapperCache.h"
#include "mozilla/AnimationPerformanceWarning.h"
#include "mozilla/AnimationPropertySegment.h"
#include "mozilla/AnimationTarget.h"
#include "mozilla/Attributes.h"
#include "mozilla/ComputedTimingFunction.h"
@ -55,50 +56,6 @@ enum class CompositeOperation : uint8_t;
struct AnimationPropertyDetails;
}
struct AnimationPropertySegment
{
float mFromKey, mToKey;
// NOTE: In the case that no keyframe for 0 or 1 offset is specified
// the unit of mFromValue or mToValue is eUnit_Null.
AnimationValue mFromValue, mToValue;
Maybe<ComputedTimingFunction> mTimingFunction;
dom::CompositeOperation mFromComposite = dom::CompositeOperation::Replace;
dom::CompositeOperation mToComposite = dom::CompositeOperation::Replace;
bool HasReplaceableValues() const
{
return HasReplaceableFromValue() && HasReplaceableToValue();
}
bool HasReplaceableFromValue() const
{
return !mFromValue.IsNull() &&
mFromComposite == dom::CompositeOperation::Replace;
}
bool HasReplaceableToValue() const
{
return !mToValue.IsNull() &&
mToComposite == dom::CompositeOperation::Replace;
}
bool operator==(const AnimationPropertySegment& aOther) const
{
return mFromKey == aOther.mFromKey &&
mToKey == aOther.mToKey &&
mFromValue == aOther.mFromValue &&
mToValue == aOther.mToValue &&
mTimingFunction == aOther.mTimingFunction &&
mFromComposite == aOther.mFromComposite &&
mToComposite == aOther.mToComposite;
}
bool operator!=(const AnimationPropertySegment& aOther) const
{
return !(*this == aOther);
}
};
struct AnimationProperty
{
nsCSSPropertyID mProperty = eCSSProperty_UNKNOWN;

1
dom/animation/moz.build
View File

@ -25,6 +25,7 @@ EXPORTS.mozilla.dom += [
EXPORTS.mozilla += [
'AnimationComparator.h',
'AnimationPerformanceWarning.h',
'AnimationPropertySegment.h',
'AnimationTarget.h',
'AnimationUtils.h',
'AnimValuesStyleRule.h',