diff options
| author | Nicolas Roard <nicolasroard@google.com> | 2011-05-09 18:11:19 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2011-05-09 18:11:19 -0700 |
| commit | 53cd6a873bfb9f6d301aa5e1f62a2be622d5ddfb (patch) | |
| tree | 7a597c6aa4e96ad3a5f56d4fba80510029d9ed18 /WebCore/platform/graphics/android/LayerAndroid.h | |
| parent | 23652748ca27723b6da70f90460064d542f62130 (diff) | |
| parent | aecd2790ab5d8d358eb7a7ee0181a52ca18bc179 (diff) | |
| download | external_webkit-53cd6a873bfb9f6d301aa5e1f62a2be622d5ddfb.zip external_webkit-53cd6a873bfb9f6d301aa5e1f62a2be622d5ddfb.tar.gz external_webkit-53cd6a873bfb9f6d301aa5e1f62a2be622d5ddfb.tar.bz2 | |
am aecd2790: am c3da3ea3: DO NOT MERGE
* commit 'aecd2790ab5d8d358eb7a7ee0181a52ca18bc179':
DO NOT MERGE
Diffstat (limited to 'WebCore/platform/graphics/android/LayerAndroid.h')
| -rw-r--r-- | WebCore/platform/graphics/android/LayerAndroid.h | 3 |
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; |