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

Side by Side Diff: Source/core/platform/graphics/GraphicsLayer.h

Issue 23834010: Change WebLayer::addAnimation to transfer ownership of WebAnimation. (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Apply GraphicsLayerTest also Created 7 years, 2 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
« no previous file with comments | « no previous file | Source/core/platform/graphics/GraphicsLayer.cpp » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 /* 1 /*
2 * Copyright (C) 2009 Apple Inc. All rights reserved. 2 * Copyright (C) 2009 Apple Inc. All rights reserved.
3 * Copyright (C) 2013 Intel Corporation. All rights reserved. 3 * Copyright (C) 2013 Intel Corporation. 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 6 * modification, are permitted provided that the following conditions
7 * are met: 7 * are met:
8 * 1. Redistributions of source code must retain the above copyright 8 * 1. 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 * 2. Redistributions in binary form must reproduce the above copyright 10 * 2. Redistributions in binary form must reproduce the above copyright
(...skipping 207 matching lines...) Expand 10 before | Expand all | Expand 10 after
218 218
219 void setContentsNeedsDisplay(); 219 void setContentsNeedsDisplay();
220 220
221 // Set that the position/size of the contents (image or video). 221 // Set that the position/size of the contents (image or video).
222 IntRect contentsRect() const { return m_contentsRect; } 222 IntRect contentsRect() const { return m_contentsRect; }
223 void setContentsRect(const IntRect&); 223 void setContentsRect(const IntRect&);
224 224
225 // Return true if the animation is handled by the compositing system. If thi s returns 225 // Return true if the animation is handled by the compositing system. If thi s returns
226 // false, the animation will be run by AnimationController. 226 // false, the animation will be run by AnimationController.
227 // These methods handle both transitions and keyframe animations. 227 // These methods handle both transitions and keyframe animations.
228 bool addAnimation(WebKit::WebAnimation*); 228 bool addAnimation(PassOwnPtr<WebKit::WebAnimation>);
229 void pauseAnimation(int animationId, double /*timeOffset*/); 229 void pauseAnimation(int animationId, double /*timeOffset*/);
230 void removeAnimation(int animationId); 230 void removeAnimation(int animationId);
231 231
232 void suspendAnimations(double time); 232 void suspendAnimations(double time);
233 233
234 // Layer contents 234 // Layer contents
235 void setContentsToImage(Image*); 235 void setContentsToImage(Image*);
236 void setContentsToNinePatch(Image*, const IntRect& aperture); 236 void setContentsToNinePatch(Image*, const IntRect& aperture);
237 bool shouldDirectlyCompositeImage(Image*) const { return true; } 237 bool shouldDirectlyCompositeImage(Image*) const { return true; }
238 void setContentsToMedia(WebKit::WebLayer*); // video or plug-in 238 void setContentsToMedia(WebKit::WebLayer*); // video or plug-in
(...skipping 180 matching lines...) Expand 10 before | Expand all | Expand 10 after
419 419
420 420
421 } // namespace WebCore 421 } // namespace WebCore
422 422
423 #ifndef NDEBUG 423 #ifndef NDEBUG
424 // Outside the WebCore namespace for ease of invocation from gdb. 424 // Outside the WebCore namespace for ease of invocation from gdb.
425 void showGraphicsLayerTree(const WebCore::GraphicsLayer* layer); 425 void showGraphicsLayerTree(const WebCore::GraphicsLayer* layer);
426 #endif 426 #endif
427 427
428 #endif // GraphicsLayer_h 428 #endif // GraphicsLayer_h
OLDNEW
« no previous file with comments | « no previous file | Source/core/platform/graphics/GraphicsLayer.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698