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

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

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 * 3 *
4 * Redistribution and use in source and binary forms, with or without 4 * Redistribution and use in source and binary forms, with or without
5 * modification, are permitted provided that the following conditions are 5 * modification, are permitted provided that the following conditions are
6 * met: 6 * met:
7 * 7 *
8 * * Redistributions of source code must retain the above copyright 8 * * Redistributions of source code must retain the above copyright
9 * notice, this list of conditions and the following disclaimer. 9 * notice, this list of conditions and the following disclaimer.
10 * * Redistributions in binary form must reproduce the above 10 * * Redistributions in binary form must reproduce the above
(...skipping 103 matching lines...) Expand 10 before | Expand all | Expand 10 after
114 114
115 static void registerContentsLayer(WebKit::WebLayer*); 115 static void registerContentsLayer(WebKit::WebLayer*);
116 static void unregisterContentsLayer(WebKit::WebLayer*); 116 static void unregisterContentsLayer(WebKit::WebLayer*);
117 117
118 virtual void setContentsToImage(Image*) OVERRIDE; 118 virtual void setContentsToImage(Image*) OVERRIDE;
119 virtual void setContentsToMedia(PlatformLayer*) OVERRIDE; 119 virtual void setContentsToMedia(PlatformLayer*) OVERRIDE;
120 virtual void setContentsToCanvas(PlatformLayer*) OVERRIDE; 120 virtual void setContentsToCanvas(PlatformLayer*) OVERRIDE;
121 virtual void setContentsToSolidColor(const Color&) OVERRIDE; 121 virtual void setContentsToSolidColor(const Color&) OVERRIDE;
122 virtual bool hasContentsLayer() const { return m_contentsLayer; } 122 virtual bool hasContentsLayer() const { return m_contentsLayer; }
123 123
124 virtual bool addAnimation(const KeyframeValueList&, const IntSize& boxSize, const Animation*, const String&, double timeOffset); 124 virtual bool addAnimation(const KeyframeValueList&, const IntSize& boxSize, const PrimitiveAnimation*, const String&, double timeOffset);
125 virtual void pauseAnimation(const String& animationName, double timeOffset); 125 virtual void pauseAnimation(const String& animationName, double timeOffset);
126 virtual void removeAnimation(const String& animationName); 126 virtual void removeAnimation(const String& animationName);
127 virtual void suspendAnimations(double wallClockTime); 127 virtual void suspendAnimations(double wallClockTime);
128 virtual void resumeAnimations(); 128 virtual void resumeAnimations();
129 129
130 void setLinkHighlight(LinkHighlightClient*); 130 void setLinkHighlight(LinkHighlightClient*);
131 // Next function for testing purposes. 131 // Next function for testing purposes.
132 LinkHighlightClient* linkHighlight() { return m_linkHighlight; } 132 LinkHighlightClient* linkHighlight() { return m_linkHighlight; }
133 133
134 virtual WebKit::WebLayer* platformLayer() const; 134 virtual WebKit::WebLayer* platformLayer() const;
(...skipping 74 matching lines...) Expand 10 before | Expand all | Expand 10 after
209 209
210 typedef HashMap<String, int> AnimationIdMap; 210 typedef HashMap<String, int> AnimationIdMap;
211 AnimationIdMap m_animationIdMap; 211 AnimationIdMap m_animationIdMap;
212 212
213 ScrollableArea* m_scrollableArea; 213 ScrollableArea* m_scrollableArea;
214 }; 214 };
215 215
216 } // namespace WebCore 216 } // namespace WebCore
217 217
218 #endif 218 #endif
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698