diff options
author | Nicolas Roard <nicolasroard@google.com> | 2012-05-15 10:16:54 -0700 |
---|---|---|
committer | Android (Google) Code Review <android-gerrit@google.com> | 2012-05-15 10:16:54 -0700 |
commit | eb4dd05cf87c2fcd52fa31fbfe0b110dea7e0cf0 (patch) | |
tree | d7df9df8e9bd076dea8c1cf39bcd6b8dab15943f /Source/WebCore/platform/graphics/android/layers/BaseLayerAndroid.h | |
parent | 8001929cfbff025063aab7bd129277b24cf3a9ff (diff) | |
parent | ca602195c97340b621ffe0c5a7fdf3732d439219 (diff) | |
download | external_webkit-eb4dd05cf87c2fcd52fa31fbfe0b110dea7e0cf0.zip external_webkit-eb4dd05cf87c2fcd52fa31fbfe0b110dea7e0cf0.tar.gz external_webkit-eb4dd05cf87c2fcd52fa31fbfe0b110dea7e0cf0.tar.bz2 |
Merge "Fix crash on arstechnica" into jb-dev
Diffstat (limited to 'Source/WebCore/platform/graphics/android/layers/BaseLayerAndroid.h')
-rw-r--r-- | Source/WebCore/platform/graphics/android/layers/BaseLayerAndroid.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/Source/WebCore/platform/graphics/android/layers/BaseLayerAndroid.h b/Source/WebCore/platform/graphics/android/layers/BaseLayerAndroid.h index afe1c35..9ce8a07 100644 --- a/Source/WebCore/platform/graphics/android/layers/BaseLayerAndroid.h +++ b/Source/WebCore/platform/graphics/android/layers/BaseLayerAndroid.h @@ -31,6 +31,7 @@ namespace WebCore { +class Image; class RenderLayerCompositor; class RenderStyle; @@ -68,6 +69,7 @@ public: virtual bool needsTexture() { return true; } virtual SubclassType subclassType() const { return LayerAndroid::FixedBackgroundImageLayer; } virtual bool drawGL(bool layerTilesDisabled); + static Image* GetCachedImage(PassRefPtr<RenderStyle> style); private: int m_width; |