summaryrefslogtreecommitdiffstats
path: root/WebCore/platform/graphics/android/LayerAndroid.h
diff options
context:
space:
mode:
authorNicolas Roard <nicolasroard@google.com>2011-03-24 09:52:26 -0700
committerNicolas Roard <nicolas@android.com>2011-04-12 17:38:55 -0700
commit8755df31f6fd87d890d58d86eb8a4ec0088285cb (patch)
tree195aa1343ae4602da4aad3a9825909d22b7bcc0a /WebCore/platform/graphics/android/LayerAndroid.h
parenta3bad5bfd2087f48ef5a7320bde1585b9ec83a49 (diff)
downloadexternal_webkit-8755df31f6fd87d890d58d86eb8a4ec0088285cb.zip
external_webkit-8755df31f6fd87d890d58d86eb8a4ec0088285cb.tar.gz
external_webkit-8755df31f6fd87d890d58d86eb8a4ec0088285cb.tar.bz2
Fix for maps
- Fix a repaint scheduling bug preventing layers containing only and image to update - Use an SkBitmap instead of SkBitmapRef and do a deep copy instead to prevent synchronization issues with the webkit thread. bug:4173057 Change-Id: I221fd0062e03ab4633b83d558956db48a408a194
Diffstat (limited to 'WebCore/platform/graphics/android/LayerAndroid.h')
-rw-r--r--WebCore/platform/graphics/android/LayerAndroid.h3
1 files changed, 2 insertions, 1 deletions
diff --git a/WebCore/platform/graphics/android/LayerAndroid.h b/WebCore/platform/graphics/android/LayerAndroid.h
index 0846930..e01a9a7 100644
--- a/WebCore/platform/graphics/android/LayerAndroid.h
+++ b/WebCore/platform/graphics/android/LayerAndroid.h
@@ -234,6 +234,7 @@ public:
*/
void setContentsImage(SkBitmapRef* img);
bool hasContentsImage() { return m_contentsImage; }
+ void copyBitmap(SkBitmap*);
void bounds(SkRect*) const;
@@ -304,7 +305,7 @@ private:
// it is a much faster method than using m_recordingPicture.
SkPicture* m_recordingPicture;
- SkBitmapRef* m_contentsImage;
+ SkBitmap* m_contentsImage;
typedef HashMap<pair<String, int>, RefPtr<AndroidAnimation> > KeyframesMap;
KeyframesMap m_animations;