diff options
author | Nicolas Roard <nicolasroard@google.com> | 2011-03-16 23:51:33 -0700 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2011-03-16 23:51:33 -0700 |
commit | 788e19b58382869e807c5da22f5052fdb0ce5ab5 (patch) | |
tree | b1d3eb92be0b354b8f662f50653da96c4d3cbdc8 /WebCore/platform/graphics/android/LayerAndroid.h | |
parent | 2de6de7eb47a85f2ef82229692d2b975d07494f5 (diff) | |
parent | 9f5143f9ae49a8e5fdb7ea626c4efad66096b020 (diff) | |
download | external_webkit-788e19b58382869e807c5da22f5052fdb0ce5ab5.zip external_webkit-788e19b58382869e807c5da22f5052fdb0ce5ab5.tar.gz external_webkit-788e19b58382869e807c5da22f5052fdb0ce5ab5.tar.bz2 |
am 9f5143f9: Implement partial screen invalidations
* commit '9f5143f9ae49a8e5fdb7ea626c4efad66096b020':
Implement partial screen invalidations
Diffstat (limited to 'WebCore/platform/graphics/android/LayerAndroid.h')
-rw-r--r-- | WebCore/platform/graphics/android/LayerAndroid.h | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/WebCore/platform/graphics/android/LayerAndroid.h b/WebCore/platform/graphics/android/LayerAndroid.h index 3e00bfa..98a0a15 100644 --- a/WebCore/platform/graphics/android/LayerAndroid.h +++ b/WebCore/platform/graphics/android/LayerAndroid.h @@ -128,8 +128,8 @@ public: void setScale(float scale); float getScale() { return m_scale; } - virtual bool drawGL(SkMatrix&); - bool drawChildrenGL(SkMatrix&); + virtual bool drawGL(GLWebViewState*, SkMatrix&); + bool drawChildrenGL(GLWebViewState*, SkMatrix&); virtual void paintBitmapGL(); void updateGLPositions(const TransformationMatrix& parentMatrix, const FloatRect& clip, float opacity); @@ -182,9 +182,10 @@ public: void addAnimation(PassRefPtr<AndroidAnimation> anim); void removeAnimationsForProperty(AnimatedPropertyID property); void removeAnimationsForKeyframes(const String& name); - bool evaluateAnimations() const; - bool evaluateAnimations(double time) const; + bool evaluateAnimations(); + bool evaluateAnimations(double time); bool hasAnimations() const; + void addDirtyArea(GLWebViewState*); SkPicture* picture() const { return m_recordingPicture; } @@ -325,6 +326,9 @@ private: bool m_dirty; unsigned int m_pictureUsed; + // used to signal the framework we need a repaint + bool m_hasRunningAnimations; + // painting request sent bool m_requestSent; |