← Back to branch summary

~oif-team/ubuntu/natty/qt4-x11/xi2.1

« back to all changes in this revision

Viewing changes to src/3rdparty/webkit/WebCore/platform/animation/Animation.cpp

  • Committer: Bazaar Package Importer
  • Author(s): Alessandro Ghersi
  • Date: 2009-11-02 18:30:08 UTC
  • mfrom: (1.2.2 upstream)
  • mto: (15.2.5 experimental)
  • mto: This revision was merged to the branch mainline in revision 88.
  • Revision ID: james.westby@ubuntu.com-20091102183008-b6a4gcs128mvfb3m
Tags: upstream-4.6.0~beta1
Import upstream version 4.6.0~beta1

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/3rdparty/webkit/WebCore/platform/animation/Animation.cpp
25
25
namespace WebCore {
26
26
 
27
27
Animation::Animation()
28
 
    : m_delay(initialAnimationDelay())
29
 
    , m_direction(initialAnimationDirection())
 
28
    : m_name(initialAnimationName())
 
29
    , m_property(initialAnimationProperty())
 
30
    , m_iterationCount(initialAnimationIterationCount())
 
31
    , m_delay(initialAnimationDelay())
30
32
    , m_duration(initialAnimationDuration())
31
 
    , m_iterationCount(initialAnimationIterationCount())
32
 
    , m_name(initialAnimationName())
33
 
    , m_property(initialAnimationProperty())
34
33
    , m_timingFunction(initialAnimationTimingFunction())
 
34
    , m_direction(initialAnimationDirection())
35
35
    , m_playState(initialAnimationPlayState())
36
36
    , m_delaySet(false)
37
37
    , m_directionSet(false)
47
47
 
48
48
Animation::Animation(const Animation& o)
49
49
    : RefCounted<Animation>()
 
50
    , m_name(o.m_name)
 
51
    , m_property(o.m_property)
 
52
    , m_iterationCount(o.m_iterationCount)
50
53
    , m_delay(o.m_delay)
51
 
    , m_direction(o.m_direction)
52
54
    , m_duration(o.m_duration)
53
 
    , m_iterationCount(o.m_iterationCount)
54
 
    , m_name(o.m_name)
55
 
    , m_property(o.m_property)
56
55
    , m_timingFunction(o.m_timingFunction)
 
56
    , m_direction(o.m_direction)
57
57
    , m_playState(o.m_playState)
58
58
    , m_delaySet(o.m_delaySet)
59
59
    , m_directionSet(o.m_directionSet)
69
69
 
70
70
Animation& Animation::operator=(const Animation& o)
71
71
{
 
72
    m_name = o.m_name;
 
73
    m_property = o.m_property;
 
74
    m_iterationCount = o.m_iterationCount;
72
75
    m_delay = o.m_delay;
 
76
    m_duration = o.m_duration;
 
77
    m_timingFunction = o.m_timingFunction;
73
78
    m_direction = o.m_direction;
74
 
    m_duration = o.m_duration;
75
 
    m_iterationCount = o.m_iterationCount;
76
 
    m_name = o.m_name;
77
79
    m_playState = o.m_playState;
78
 
    m_property = o.m_property;
79
 
    m_timingFunction = o.m_timingFunction;
80
80
 
81
81
    m_delaySet = o.m_delaySet;
82
82
    m_directionSet = o.m_directionSet;
86
86
    m_playStateSet = o.m_playStateSet;
87
87
    m_propertySet = o.m_propertySet;
88
88
    m_timingFunctionSet = o.m_timingFunctionSet;
89
 
 
90
89
    m_isNone = o.m_isNone;
91
90
 
92
91
    return *this;
101
100
    if (!o)
102
101
        return false;
103
102
    
104
 
    bool result = m_delay == o->m_delay &&
105
 
                  m_direction == o->m_direction &&
 
103
    bool result = m_name == o->m_name &&
 
104
                  m_property == o->m_property && 
 
105
                  m_iterationCount == o->m_iterationCount &&
 
106
                  m_delay == o->m_delay &&
106
107
                  m_duration == o->m_duration &&
107
 
                  m_iterationCount == o->m_iterationCount &&
108
 
                  m_name == o->m_name &&
109
 
                  m_property == o->m_property && 
110
108
                  m_timingFunction == o->m_timingFunction &&
 
109
                  m_direction == o->m_direction &&
111
110
                  m_delaySet == o->m_delaySet &&
112
111
                  m_directionSet == o->m_directionSet &&
113
112
                  m_durationSet == o->m_durationSet &&