| OLD | NEW |
| 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 185 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 196 | 196 |
| 197 // Set that the position/size of the contents (image or video). | 197 // Set that the position/size of the contents (image or video). |
| 198 void setContentsRect(const IntRect&); | 198 void setContentsRect(const IntRect&); |
| 199 | 199 |
| 200 // Return true if the animation is handled by the compositing system. If thi
s returns | 200 // Return true if the animation is handled by the compositing system. If thi
s returns |
| 201 // false, the animation will be run by AnimationController. | 201 // false, the animation will be run by AnimationController. |
| 202 // These methods handle both transitions and keyframe animations. | 202 // These methods handle both transitions and keyframe animations. |
| 203 bool addAnimation(PassOwnPtr<WebCompositorAnimation>); | 203 bool addAnimation(PassOwnPtr<WebCompositorAnimation>); |
| 204 void pauseAnimation(int animationId, double /*timeOffset*/); | 204 void pauseAnimation(int animationId, double /*timeOffset*/); |
| 205 void removeAnimation(int animationId); | 205 void removeAnimation(int animationId); |
| 206 void abortAnimation(int animationId); | |
| 207 | 206 |
| 208 // Layer contents | 207 // Layer contents |
| 209 void setContentsToImage(Image*, RespectImageOrientationEnum = DoNotRespectIm
ageOrientation); | 208 void setContentsToImage(Image*, RespectImageOrientationEnum = DoNotRespectIm
ageOrientation); |
| 210 void setContentsToPlatformLayer(WebLayer* layer) { setContentsTo(layer); } | 209 void setContentsToPlatformLayer(WebLayer* layer) { setContentsTo(layer); } |
| 211 bool hasContentsLayer() const { return m_contentsLayer; } | 210 bool hasContentsLayer() const { return m_contentsLayer; } |
| 212 | 211 |
| 213 // For hosting this GraphicsLayer in a native layer hierarchy. | 212 // For hosting this GraphicsLayer in a native layer hierarchy. |
| 214 WebLayer* platformLayer() const; | 213 WebLayer* platformLayer() const; |
| 215 | 214 |
| 216 typedef HashMap<int, int> RenderingContextMap; | 215 typedef HashMap<int, int> RenderingContextMap; |
| (...skipping 169 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 386 }; | 385 }; |
| 387 | 386 |
| 388 } // namespace blink | 387 } // namespace blink |
| 389 | 388 |
| 390 #ifndef NDEBUG | 389 #ifndef NDEBUG |
| 391 // Outside the blink namespace for ease of invocation from gdb. | 390 // Outside the blink namespace for ease of invocation from gdb. |
| 392 void PLATFORM_EXPORT showGraphicsLayerTree(const blink::GraphicsLayer*); | 391 void PLATFORM_EXPORT showGraphicsLayerTree(const blink::GraphicsLayer*); |
| 393 #endif | 392 #endif |
| 394 | 393 |
| 395 #endif // GraphicsLayer_h | 394 #endif // GraphicsLayer_h |
| OLD | NEW |