diff options
author | John Reck <jreck@google.com> | 2011-10-04 16:04:01 -0700 |
---|---|---|
committer | John Reck <jreck@google.com> | 2011-10-04 16:04:01 -0700 |
commit | 2c1def4fa6e745a5f5e8d1cafd7b7f49ec571e1d (patch) | |
tree | bc68f616455c0289b626bacb644464de717e4c05 /Source/WebCore/platform/graphics/android/LayerAndroid.h | |
parent | 834546469c79df0516956f90f5e0a9100ba1fcd5 (diff) | |
download | external_webkit-2c1def4fa6e745a5f5e8d1cafd7b7f49ec571e1d.zip external_webkit-2c1def4fa6e745a5f5e8d1cafd7b7f49ec571e1d.tar.gz external_webkit-2c1def4fa6e745a5f5e8d1cafd7b7f49ec571e1d.tar.bz2 |
Remove m_contentsImage usage
Bug: 5410522
Change-Id: Id8457715665dbd51761900011beba57b7f634fff
Diffstat (limited to 'Source/WebCore/platform/graphics/android/LayerAndroid.h')
-rw-r--r-- | Source/WebCore/platform/graphics/android/LayerAndroid.h | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/Source/WebCore/platform/graphics/android/LayerAndroid.h b/Source/WebCore/platform/graphics/android/LayerAndroid.h index 4ae8bd3..90f4e86 100644 --- a/Source/WebCore/platform/graphics/android/LayerAndroid.h +++ b/Source/WebCore/platform/graphics/android/LayerAndroid.h @@ -57,6 +57,7 @@ namespace android { class DrawExtra; void serializeLayer(WebCore::LayerAndroid* layer, SkWStream* stream); WebCore::LayerAndroid* deserializeLayer(SkStream* stream); +void cleanupImageRefs(WebCore::LayerAndroid* layer); } using namespace android; @@ -266,8 +267,10 @@ public: void setIsIframe(bool isIframe) { m_isIframe = isIframe; } float zValue() const { return m_zValue; } + // ViewStateSerializer friends friend void android::serializeLayer(LayerAndroid* layer, SkWStream* stream); friend LayerAndroid* android::deserializeLayer(SkStream* stream); + friend void android::cleanupImageRefs(LayerAndroid* layer); PaintedSurface* texture() { return m_texture; } void assignTextureTo(LayerAndroid* newTree); @@ -324,16 +327,14 @@ private: float m_anchorPointZ; float m_drawOpacity; - // Note that m_recordingPicture and m_contentsImage are mutually exclusive; + // Note that m_recordingPicture and m_imageRef are mutually exclusive; // m_recordingPicture is used when WebKit is asked to paint the layer's - // content, while m_contentsImage contains an image that we directly + // content, while m_imageRef contains an image that we directly // composite, using the layer's dimensions as a destination rect. // We do this as if the layer only contains an image, directly compositing // it is a much faster method than using m_recordingPicture. SkPicture* m_recordingPicture; - SkBitmap* m_contentsImage; - typedef HashMap<pair<String, int>, RefPtr<AndroidAnimation> > KeyframesMap; KeyframesMap m_animations; |