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

Side by Side Diff: Source/core/rendering/RenderBoxModelObject.cpp

Issue 14391005: Rename Animation -> PrimitiveAnimation (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Update to long paths Created 7 years, 7 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 unified diff | Download patch
OLDNEW
1 /* 1 /*
2 * Copyright (C) 1999 Lars Knoll (knoll@kde.org) 2 * Copyright (C) 1999 Lars Knoll (knoll@kde.org)
3 * (C) 1999 Antti Koivisto (koivisto@kde.org) 3 * (C) 1999 Antti Koivisto (koivisto@kde.org)
4 * (C) 2005 Allan Sandfeld Jensen (kde@carewolf.com) 4 * (C) 2005 Allan Sandfeld Jensen (kde@carewolf.com)
5 * (C) 2005, 2006 Samuel Weinig (sam.weinig@gmail.com) 5 * (C) 2005, 2006 Samuel Weinig (sam.weinig@gmail.com)
6 * Copyright (C) 2005, 2006, 2007, 2008, 2009 Apple Inc. All rights reserved. 6 * Copyright (C) 2005, 2006, 2007, 2008, 2009 Apple Inc. All rights reserved.
7 * Copyright (C) 2010 Google Inc. All rights reserved. 7 * Copyright (C) 2010 Google Inc. All rights reserved.
8 * 8 *
9 * This library is free software; you can redistribute it and/or 9 * This library is free software; you can redistribute it and/or
10 * modify it under the terms of the GNU Library General Public 10 * modify it under the terms of the GNU Library General Public
(...skipping 100 matching lines...) Expand 10 before | Expand all | Expand 10 after
111 layer()->backing()->transitionPaused(timeOffset, propertyId); 111 layer()->backing()->transitionPaused(timeOffset, propertyId);
112 } 112 }
113 113
114 void RenderBoxModelObject::transitionFinished(CSSPropertyID propertyId) 114 void RenderBoxModelObject::transitionFinished(CSSPropertyID propertyId)
115 { 115 {
116 ASSERT(hasLayer()); 116 ASSERT(hasLayer());
117 ASSERT(isComposited()); 117 ASSERT(isComposited());
118 layer()->backing()->transitionFinished(propertyId); 118 layer()->backing()->transitionFinished(propertyId);
119 } 119 }
120 120
121 bool RenderBoxModelObject::startAnimation(double timeOffset, const Animation* an imation, const KeyframeList& keyframes) 121 bool RenderBoxModelObject::startAnimation(double timeOffset, const CSSAnimationD ata* animation, const KeyframeList& keyframes)
122 { 122 {
123 ASSERT(hasLayer()); 123 ASSERT(hasLayer());
124 ASSERT(isComposited()); 124 ASSERT(isComposited());
125 return layer()->backing()->startAnimation(timeOffset, animation, keyframes); 125 return layer()->backing()->startAnimation(timeOffset, animation, keyframes);
126 } 126 }
127 127
128 void RenderBoxModelObject::animationPaused(double timeOffset, const String& name ) 128 void RenderBoxModelObject::animationPaused(double timeOffset, const String& name )
129 { 129 {
130 ASSERT(hasLayer()); 130 ASSERT(hasLayer());
131 ASSERT(isComposited()); 131 ASSERT(isComposited());
(...skipping 2524 matching lines...) Expand 10 before | Expand all | Expand 10 after
2656 ASSERT(!beforeChild || toBoxModelObject == beforeChild->parent()); 2656 ASSERT(!beforeChild || toBoxModelObject == beforeChild->parent());
2657 for (RenderObject* child = startChild; child && child != endChild; ) { 2657 for (RenderObject* child = startChild; child && child != endChild; ) {
2658 // Save our next sibling as moveChildTo will clear it. 2658 // Save our next sibling as moveChildTo will clear it.
2659 RenderObject* nextSibling = child->nextSibling(); 2659 RenderObject* nextSibling = child->nextSibling();
2660 moveChildTo(toBoxModelObject, child, beforeChild, fullRemoveInsert); 2660 moveChildTo(toBoxModelObject, child, beforeChild, fullRemoveInsert);
2661 child = nextSibling; 2661 child = nextSibling;
2662 } 2662 }
2663 } 2663 }
2664 2664
2665 } // namespace WebCore 2665 } // namespace WebCore
OLDNEW
« no previous file with comments | « Source/core/rendering/RenderBoxModelObject.h ('k') | Source/core/rendering/RenderLayerBacking.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698