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

Side by Side Diff: Source/WebCore/platform/graphics/chromium/LayerChromium.h

Issue 10310152: Merge 116786 - [chromium] Ensure that animations continue to run when transform-style is changed (Closed) Base URL: http://svn.webkit.org/repository/webkit/branches/chromium/1132/
Patch Set: Created 8 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) 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 222 matching lines...) Expand 10 before | Expand all | Expand 10 after
233 233
234 bool addAnimation(const KeyframeValueList&, const IntSize& boxSize, const An imation*, int animationId, int groupId, double timeOffset); 234 bool addAnimation(const KeyframeValueList&, const IntSize& boxSize, const An imation*, int animationId, int groupId, double timeOffset);
235 void pauseAnimation(int animationId, double timeOffset); 235 void pauseAnimation(int animationId, double timeOffset);
236 void removeAnimation(int animationId); 236 void removeAnimation(int animationId);
237 237
238 void suspendAnimations(double monotonicTime); 238 void suspendAnimations(double monotonicTime);
239 void resumeAnimations(double monotonicTime); 239 void resumeAnimations(double monotonicTime);
240 240
241 CCLayerAnimationController* layerAnimationController() { return m_layerAnima tionController.get(); } 241 CCLayerAnimationController* layerAnimationController() { return m_layerAnima tionController.get(); }
242 void setLayerAnimationController(PassOwnPtr<CCLayerAnimationController>); 242 void setLayerAnimationController(PassOwnPtr<CCLayerAnimationController>);
243 PassOwnPtr<CCLayerAnimationController> releaseLayerAnimationController();
243 244
244 void setLayerAnimationDelegate(CCLayerAnimationDelegate* layerAnimationDeleg ate) { m_layerAnimationDelegate = layerAnimationDelegate; } 245 void setLayerAnimationDelegate(CCLayerAnimationDelegate* layerAnimationDeleg ate) { m_layerAnimationDelegate = layerAnimationDelegate; }
245 246
246 bool hasActiveAnimation() const; 247 bool hasActiveAnimation() const;
247 248
248 virtual void notifyAnimationStarted(const CCAnimationEvent&, double wallCloc kTime); 249 virtual void notifyAnimationStarted(const CCAnimationEvent&, double wallCloc kTime);
249 virtual void notifyAnimationFinished(double wallClockTime); 250 virtual void notifyAnimationFinished(double wallClockTime);
250 251
251 virtual Region visibleContentOpaqueRegion() const; 252 virtual Region visibleContentOpaqueRegion() const;
252 253
(...skipping 97 matching lines...) Expand 10 before | Expand all | Expand 10 after
350 351
351 CCLayerAnimationDelegate* m_layerAnimationDelegate; 352 CCLayerAnimationDelegate* m_layerAnimationDelegate;
352 }; 353 };
353 354
354 void sortLayers(Vector<RefPtr<LayerChromium> >::iterator, Vector<RefPtr<LayerChr omium> >::iterator, void*); 355 void sortLayers(Vector<RefPtr<LayerChromium> >::iterator, Vector<RefPtr<LayerChr omium> >::iterator, void*);
355 356
356 } 357 }
357 #endif // USE(ACCELERATED_COMPOSITING) 358 #endif // USE(ACCELERATED_COMPOSITING)
358 359
359 #endif 360 #endif
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698