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

Side by Side Diff: Source/core/platform/graphics/chromium/GraphicsLayerChromium.cpp

Issue 14391005: Rename Animation -> PrimitiveAnimation (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Created 7 years, 8 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) 2010 Google Inc. All rights reserved. 2 * Copyright (C) 2010 Google Inc. All rights reserved.
3 * Copyright (C) 2009 Apple Inc. All rights reserved. 3 * Copyright (C) 2009 Apple Inc. All rights reserved.
4 * 4 *
5 * Redistribution and use in source and binary forms, with or without 5 * Redistribution and use in source and binary forms, with or without
6 * modification, are permitted provided that the following conditions are 6 * modification, are permitted provided that the following conditions are
7 * met: 7 * met:
8 * 8 *
9 * * Redistributions of source code must retain the above copyright 9 * * Redistributions of source code must retain the above copyright
10 * notice, this list of conditions and the following disclaimer. 10 * notice, this list of conditions and the following disclaimer.
(...skipping 596 matching lines...) Expand 10 before | Expand all | Expand 10 after
607 607
608 // The old contents layer will be removed via updateChildList. 608 // The old contents layer will be removed via updateChildList.
609 m_contentsLayer = 0; 609 m_contentsLayer = 0;
610 } 610 }
611 } 611 }
612 612
613 if (childrenChanged) 613 if (childrenChanged)
614 updateChildList(); 614 updateChildList();
615 } 615 }
616 616
617 bool GraphicsLayerChromium::addAnimation(const KeyframeValueList& values, const IntSize& boxSize, const Animation* animation, const String& animationName, doubl e timeOffset) 617 bool GraphicsLayerChromium::addAnimation(const KeyframeValueList& values, const IntSize& boxSize, const PrimitiveAnimation* animation, const String& animationNa me, double timeOffset)
618 { 618 {
619 platformLayer()->setAnimationDelegate(this); 619 platformLayer()->setAnimationDelegate(this);
620 620
621 int animationId = 0; 621 int animationId = 0;
622 622
623 if (m_animationIdMap.contains(animationName)) 623 if (m_animationIdMap.contains(animationName))
624 animationId = m_animationIdMap.get(animationName); 624 animationId = m_animationIdMap.get(animationName);
625 625
626 OwnPtr<WebAnimation> toAdd(createWebAnimation(values, animation, animationId , timeOffset, boxSize)); 626 OwnPtr<WebAnimation> toAdd(createWebAnimation(values, animation, animationId , timeOffset, boxSize));
627 627
(...skipping 274 matching lines...) Expand 10 before | Expand all | Expand 10 after
902 info.addMember(m_transformLayer, "transformLayer"); 902 info.addMember(m_transformLayer, "transformLayer");
903 info.addMember(m_imageLayer, "imageLayer"); 903 info.addMember(m_imageLayer, "imageLayer");
904 info.addMember(m_contentsLayer, "contentsLayer"); 904 info.addMember(m_contentsLayer, "contentsLayer");
905 info.addMember(m_linkHighlight, "linkHighlight"); 905 info.addMember(m_linkHighlight, "linkHighlight");
906 info.addMember(m_opaqueRectTrackingContentLayerDelegate, "opaqueRectTracking ContentLayerDelegate"); 906 info.addMember(m_opaqueRectTrackingContentLayerDelegate, "opaqueRectTracking ContentLayerDelegate");
907 info.addMember(m_animationIdMap, "animationIdMap"); 907 info.addMember(m_animationIdMap, "animationIdMap");
908 info.addMember(m_scrollableArea, "scrollableArea"); 908 info.addMember(m_scrollableArea, "scrollableArea");
909 } 909 }
910 910
911 } // namespace WebCore 911 } // namespace WebCore
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698