From c3da3ea3d67930a5593b455cdc697171a9115cae Mon Sep 17 00:00:00 2001 From: Nicolas Roard Date: Thu, 24 Mar 2011 09:52:26 -0700 Subject: DO NOT MERGE Cherry pick from Master 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: Iace8e21b776df7b357654f66d40d159a1701b86d --- WebCore/platform/graphics/android/LayerAndroid.h | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'WebCore/platform/graphics/android/LayerAndroid.h') 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, RefPtr > KeyframesMap; KeyframesMap m_animations; -- cgit v1.1