Pass RenderStyle / RenderObject by reference in more places

Source/core/frame/animation/AnimationController.cpp

 /*
  * Copyright (C) 2007, 2008, 2009 Apple 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:
  *
  * 1.  Redistributions of source code must retain the above copyright
  *     notice, this list of conditions and the following disclaimer.
  * 2.  Redistributions in binary form must reproduce the above copyright
@@ skipping 44 matching lines @@
     , m_animationsWaitingForStyle()
     , m_animationsWaitingForStartTimeResponse()
     , m_animationsWaitingForAsyncStartNotification()
 {
 }
 
 AnimationControllerPrivate::~AnimationControllerPrivate()
 {
 }
 
-PassRefPtr<CompositeAnimation> AnimationControllerPrivate::accessCompositeAnimation(RenderObject* renderer)
+PassRefPtr<CompositeAnimation> AnimationControllerPrivate::accessCompositeAnimation(RenderObject& renderer)
 {
-    RefPtr<CompositeAnimation> animation = m_compositeAnimations.get(renderer);
+    RefPtr<CompositeAnimation> animation = m_compositeAnimations.get(&renderer);
     if (!animation) {
         animation = CompositeAnimation::create(this);
-        m_compositeAnimations.set(renderer, animation);
+        m_compositeAnimations.set(&renderer, animation);
     }
     return animation;
 }
 
 bool AnimationControllerPrivate::clear(RenderObject* renderer)
 {
     // Return false if we didn't do anything.
     PassRefPtr<CompositeAnimation> animation = m_compositeAnimations.take(renderer);
     if (!animation)
         return false;
@@ skipping 30 matching lines @@
         }
     }
 
     if (updateStyleNeeded)
         m_frame->document()->updateStyleIfNeeded();
 
     timeToNextService = minTimeToNextService;
     timeToNextEvent = minTimeToNextEvent;
 }
 
-void AnimationControllerPrivate::scheduleServiceForRenderer(RenderObject* renderer)
+void AnimationControllerPrivate::scheduleServiceForRenderer(RenderObject& renderer)
 {
     double timeToNextService = -1;
     double timeToNextEvent = -1;
 
-    RefPtr<CompositeAnimation> compAnim = m_compositeAnimations.get(renderer);
+    RefPtr<CompositeAnimation> compAnim = m_compositeAnimations.get(&renderer);
     if (compAnim->hasAnimations()) {
         timeToNextService = compAnim->timeToNextService();
         timeToNextEvent = compAnim->timeToNextEvent();
     }
 
     if (timeToNextService >= 0)
         scheduleService(timeToNextService, timeToNextEvent);
 }
 
 void AnimationControllerPrivate::scheduleService()
@@ skipping 299 matching lines @@
 {
     if (!m_data->hasAnimations())
         return;
 
     if (m_data->clear(renderer)) {
         if (Node* node = renderer->node())
             node->setNeedsStyleRecalc(LocalStyleChange, StyleChangeFromRenderer);
     }
 }
 
-PassRefPtr<RenderStyle> AnimationController::updateAnimations(RenderObject* renderer, RenderStyle* newStyle)
+PassRefPtr<RenderStyle> AnimationController::updateAnimations(RenderObject& renderer, RenderStyle& newStyle)
 {
-    RenderStyle* oldStyle = renderer->style();
+    RenderStyle* oldStyle = renderer.style();
 
-    if ((!oldStyle || (!oldStyle->animations() && !oldStyle->transitions())) && (!newStyle->animations() && !newStyle->transitions()))
-        return newStyle;
+    if ((!oldStyle || (!oldStyle->animations() && !oldStyle->transitions())) && (!newStyle.animations() && !newStyle.transitions()))
+        return PassRefPtr<RenderStyle>(newStyle);
 
     // Don't run transitions when printing.
-    if (renderer->view()->document().printing())
-        return newStyle;
+    if (renderer.view()->document().printing())
+        return PassRefPtr<RenderStyle>(newStyle);
 
     // Fetch our current set of implicit animations from a hashtable.  We then compare them
     // against the animations in the style and make sure we're in sync.  If destination values
     // have changed, we reset the animation.  We then do a blend to get new values and we return
     // a new style.
 
     // We don't support anonymous pseudo elements like :first-line or :first-letter.
-    ASSERT(renderer->node());
+    ASSERT(renderer.node());
 
     RefPtr<CompositeAnimation> rendererAnimations = m_data->accessCompositeAnimation(renderer);
     RefPtr<RenderStyle> blendedStyle = rendererAnimations->animate(renderer, oldStyle, newStyle);
 
-    if (renderer->parent() || newStyle->animations() || (oldStyle && oldStyle->animations())) {
+    if (renderer.parent() || newStyle.animations() || (oldStyle && oldStyle->animations())) {
         m_data->scheduleServiceForRenderer(renderer);
     }
 
-    if (blendedStyle != newStyle) {
+    if (blendedStyle != &newStyle) {
         // If the animations/transitions change opacity or transform, we need to update
         // the style to impose the stacking rules. Note that this is also
         // done in StyleResolver::adjustRenderStyle().
         if (blendedStyle->hasAutoZIndex() && (blendedStyle->opacity() < 1.0f || blendedStyle->hasTransform()))
             blendedStyle->setZIndex(0);
     }
     return blendedStyle.release();
 }
 
 PassRefPtr<RenderStyle> AnimationController::getAnimatedStyleForRenderer(RenderObject* renderer)
@@ skipping 50 matching lines @@
     if (!m_beginAnimationUpdateCount)
         m_data->endAnimationUpdate();
 }
 
 bool AnimationController::supportsAcceleratedAnimationOfProperty(CSSPropertyID property)
 {
     return CSSPropertyAnimation::animationOfPropertyIsAccelerated(property);
 }
 
 } // namespace WebCore