summaryrefslogtreecommitdiffstats
path: root/Source/WebCore/platform/graphics/android/LayerAndroid.h
diff options
context:
space:
mode:
authorChris Craik <ccraik@google.com>2011-11-29 13:39:24 -0800
committerChris Craik <ccraik@google.com>2011-11-29 16:04:54 -0800
commitaeca53d3fee2e94ce013c1dc12648f0335284fbb (patch)
tree1266a41af9814431faff681061f573987afda7ac /Source/WebCore/platform/graphics/android/LayerAndroid.h
parent9c0e7d80ade0cc9bbe087838232cd0877fa01a98 (diff)
downloadexternal_webkit-aeca53d3fee2e94ce013c1dc12648f0335284fbb.zip
external_webkit-aeca53d3fee2e94ce013c1dc12648f0335284fbb.tar.gz
external_webkit-aeca53d3fee2e94ce013c1dc12648f0335284fbb.tar.bz2
synchronize animation starts with webkit
bug:5239801 this better supports animations not synchronous with webkit Relies on the frameworks/base CL: https://android-git.corp.google.com/g/#/c/152533/ Change-Id: Ia79a475065b3891db8fc4014559062ab1ac95ebe
Diffstat (limited to 'Source/WebCore/platform/graphics/android/LayerAndroid.h')
-rw-r--r--Source/WebCore/platform/graphics/android/LayerAndroid.h3
1 files changed, 2 insertions, 1 deletions
diff --git a/Source/WebCore/platform/graphics/android/LayerAndroid.h b/Source/WebCore/platform/graphics/android/LayerAndroid.h
index ae9dc88..8b82b27 100644
--- a/Source/WebCore/platform/graphics/android/LayerAndroid.h
+++ b/Source/WebCore/platform/graphics/android/LayerAndroid.h
@@ -290,7 +290,7 @@ public:
friend void android::cleanupImageRefs(LayerAndroid* layer);
PaintedSurface* texture() { return m_texture; }
- void obtainTextureForPainting(LayerAndroid* drawingTree);
+ void obtainTextureForPainting(LayerAndroid* drawingLayer);
// Update layers using another tree. Only works for basic properties
// such as the position, the transform. Return true if anything more
@@ -323,6 +323,7 @@ private:
friend class CachedLayer::Debug; // debugging access only
#endif
+ void copyAnimationStartTimes(LayerAndroid* oldLayer);
void findInner(FindState&) const;
bool prepareContext(bool force = false);
void clipInner(SkTDArray<SkRect>* region, const SkRect& local) const;