← Back to branch summary

~ubuntu-branches/ubuntu/lucid/webkit/lucid-updates

« back to all changes in this revision

Viewing changes to WebCore/page/animation/ImplicitAnimation.cpp

  • Committer: Bazaar Package Importer
  • Author(s): Gustavo Noronha Silva
  • Date: 2010-01-06 21:25:06 UTC
  • mfrom: (1.2.6 upstream) (4.3.7 sid)
  • Revision ID: james.westby@ubuntu.com-20100106212506-gd0czn4zrwf1j19l
http://bugs.debian.org/529271
http://bugs.debian.org/559420
* New upstream release
- adds basic Content-Encoding support, thanks to soup
  (Closes: #529271)
- fixes over-advertising content types as supported by
  the media player (Closes: #559420)
* debian/control:
- updated libsoup build requirement (>= 2.28.2)
* debian/libwebkit-1.0-2.symbols:
- updated with new symbols
* debian/copyright:
- updated information since 1.1.17
* Imported patch from https://bugs.webkit.org/show_bug.cgi?id=30623
- I am shipping this patch because I believe it is correct, it is the
  way to go, it fixes a race, and it needs testing.

Show diffs side-by-side

added added

removed removed

Lines of Context:
WebCore/page/animation/ImplicitAnimation.cpp
55
55
{
56
56
    // // Make sure to tell the renderer that we are ending. This will make sure any accelerated animations are removed.
57
57
    if (!postActive())
58
 
        endAnimation(true);
 
58
        endAnimation();
59
59
}
60
60
 
61
61
bool ImplicitAnimation::shouldSendEventForListener(Document::ListenerType inListenerType) const
106
106
    blendProperties(this, m_animatingProperty, animatedStyle.get(), m_fromStyle.get(), m_toStyle.get(), progress(1, 0, 0));
107
107
}
108
108
 
109
 
bool ImplicitAnimation::startAnimation(double beginTime)
 
109
bool ImplicitAnimation::startAnimation(double timeOffset)
110
110
{
111
111
#if USE(ACCELERATED_COMPOSITING)
112
112
    if (m_object && m_object->hasLayer()) {
113
113
        RenderLayer* layer = toRenderBoxModelObject(m_object)->layer();
114
114
        if (layer->isComposited())
115
 
            return layer->backing()->startTransition(beginTime, m_animatingProperty, m_fromStyle.get(), m_toStyle.get());
 
115
            return layer->backing()->startTransition(timeOffset, m_animatingProperty, m_fromStyle.get(), m_toStyle.get());
116
116
    }
117
117
#else
118
 
    UNUSED_PARAM(beginTime);
 
118
    UNUSED_PARAM(timeOffset);
119
119
#endif
120
120
    return false;
121
121
}
122
122
 
123
 
void ImplicitAnimation::endAnimation(bool /*reset*/)
 
123
void ImplicitAnimation::endAnimation()
124
124
{
125
125
#if USE(ACCELERATED_COMPOSITING)
126
126
    if (m_object && m_object->hasLayer()) {
143
143
        keyframeAnim->setUnanimatedStyle(m_toStyle);
144
144
    
145
145
    sendTransitionEvent(eventNames().webkitTransitionEndEvent, elapsedTime);
146
 
    endAnimation(true);
 
146
    endAnimation();
147
147
}
148
148
 
149
149
bool ImplicitAnimation::sendTransitionEvent(const AtomicString& eventType, double elapsedTime)
161
161
            if (m_object->node() && m_object->node()->isElementNode())
162
162
                element = static_cast<Element*>(m_object->node());
163
163
 
164
 
            ASSERT(!element || element->document() && !element->document()->inPageCache());
 
164
            ASSERT(!element || (element->document() && !element->document()->inPageCache()));
165
165
            if (!element)
166
166
                return false;
167
167