OLD | NEW |
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 571 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
582 | 582 |
583 // The old contents layer will be removed via updateChildList. | 583 // The old contents layer will be removed via updateChildList. |
584 m_contentsLayer = 0; | 584 m_contentsLayer = 0; |
585 } | 585 } |
586 } | 586 } |
587 | 587 |
588 if (childrenChanged) | 588 if (childrenChanged) |
589 updateChildList(); | 589 updateChildList(); |
590 } | 590 } |
591 | 591 |
592 bool GraphicsLayerChromium::addAnimation(const KeyframeValueList& values, const
IntSize& boxSize, const Animation* animation, const String& animationName, doubl
e timeOffset) | 592 bool GraphicsLayerChromium::addAnimation(const KeyframeValueList& values, const
IntSize& boxSize, const CSSAnimationData* animation, const String& animationName
, double timeOffset) |
593 { | 593 { |
594 platformLayer()->setAnimationDelegate(this); | 594 platformLayer()->setAnimationDelegate(this); |
595 | 595 |
596 int animationId = 0; | 596 int animationId = 0; |
597 | 597 |
598 if (m_animationIdMap.contains(animationName)) | 598 if (m_animationIdMap.contains(animationName)) |
599 animationId = m_animationIdMap.get(animationName); | 599 animationId = m_animationIdMap.get(animationName); |
600 | 600 |
601 OwnPtr<WebAnimation> toAdd(createWebAnimation(values, animation, animationId
, timeOffset, boxSize)); | 601 OwnPtr<WebAnimation> toAdd(createWebAnimation(values, animation, animationId
, timeOffset, boxSize)); |
602 | 602 |
(...skipping 274 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
877 info.addMember(m_transformLayer, "transformLayer"); | 877 info.addMember(m_transformLayer, "transformLayer"); |
878 info.addMember(m_imageLayer, "imageLayer"); | 878 info.addMember(m_imageLayer, "imageLayer"); |
879 info.addMember(m_contentsLayer, "contentsLayer"); | 879 info.addMember(m_contentsLayer, "contentsLayer"); |
880 info.addMember(m_linkHighlight, "linkHighlight"); | 880 info.addMember(m_linkHighlight, "linkHighlight"); |
881 info.addMember(m_opaqueRectTrackingContentLayerDelegate, "opaqueRectTracking
ContentLayerDelegate"); | 881 info.addMember(m_opaqueRectTrackingContentLayerDelegate, "opaqueRectTracking
ContentLayerDelegate"); |
882 info.addMember(m_animationIdMap, "animationIdMap"); | 882 info.addMember(m_animationIdMap, "animationIdMap"); |
883 info.addMember(m_scrollableArea, "scrollableArea"); | 883 info.addMember(m_scrollableArea, "scrollableArea"); |
884 } | 884 } |
885 | 885 |
886 } // namespace WebCore | 886 } // namespace WebCore |
OLD | NEW |