diff options
author | Nicolas Roard <nicolas@android.com> | 2011-02-19 07:35:45 -0800 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2011-02-19 07:35:45 -0800 |
commit | d3b2919d307e4b0ea98b7b5c67991c853c99b562 (patch) | |
tree | 92adb1a4ed784d558fe7b934f14580d5a5b8fc2c /WebCore/platform/graphics/android/LayerAndroid.h | |
parent | d3f534955e1e80e5a9192c84db518f8f0eff5b00 (diff) | |
parent | 634f229e4f0075b052e110ba0a89554c46f6c510 (diff) | |
download | external_webkit-d3b2919d307e4b0ea98b7b5c67991c853c99b562.zip external_webkit-d3b2919d307e4b0ea98b7b5c67991c853c99b562.tar.gz external_webkit-d3b2919d307e4b0ea98b7b5c67991c853c99b562.tar.bz2 |
am 634f229e: Do not merge: Cherry-pick Fix ANR in the browser from master
* commit '634f229e4f0075b052e110ba0a89554c46f6c510':
Do not merge: Cherry-pick Fix ANR in the browser from master
Diffstat (limited to 'WebCore/platform/graphics/android/LayerAndroid.h')
-rw-r--r-- | WebCore/platform/graphics/android/LayerAndroid.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/WebCore/platform/graphics/android/LayerAndroid.h b/WebCore/platform/graphics/android/LayerAndroid.h index 53e513b..2cb56c1 100644 --- a/WebCore/platform/graphics/android/LayerAndroid.h +++ b/WebCore/platform/graphics/android/LayerAndroid.h @@ -94,7 +94,7 @@ public: virtual ~LayerAndroid(); // TextureOwner methods - virtual void removeTexture(BackedDoubleBufferedTexture* texture); + virtual bool removeTexture(BackedDoubleBufferedTexture* texture); LayerTexture* texture() { return m_reservedTexture; } virtual TiledPage* page() { return 0; } |