diff options
| author | Nicolas Roard <nicolasroard@google.com> | 2011-09-28 19:08:00 -0700 |
|---|---|---|
| committer | Nicolas Roard <nicolasroard@google.com> | 2011-09-29 13:13:17 -0700 |
| commit | 74523e723bc5677780989d6a5834adc5c72c3683 (patch) | |
| tree | f88f6888f48a88348ca4e49c47eda904c944d581 /Source/WebCore/platform/graphics/android/LayerAndroid.h | |
| parent | 852641461c4dedc4682153d1299b2a9b6fde6ea2 (diff) | |
| download | external_webkit-74523e723bc5677780989d6a5834adc5c72c3683.zip external_webkit-74523e723bc5677780989d6a5834adc5c72c3683.tar.gz external_webkit-74523e723bc5677780989d6a5834adc5c72c3683.tar.bz2 | |
Fix a memory leak with LayerAndroid
(we had a cycle between LayerAndroid and PaintedSurface)
bug:5366807
Change-Id: I1b7341984b3cc6fd998b9ab54205bb963eb9223d
Diffstat (limited to 'Source/WebCore/platform/graphics/android/LayerAndroid.h')
| -rw-r--r-- | Source/WebCore/platform/graphics/android/LayerAndroid.h | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/Source/WebCore/platform/graphics/android/LayerAndroid.h b/Source/WebCore/platform/graphics/android/LayerAndroid.h index 6c17bba..d6bb497 100644 --- a/Source/WebCore/platform/graphics/android/LayerAndroid.h +++ b/Source/WebCore/platform/graphics/android/LayerAndroid.h @@ -106,7 +106,7 @@ public: virtual ~LayerAndroid(); virtual TiledPage* page() { return 0; } - virtual GLWebViewState* state() { return 0; } + virtual GLWebViewState* state() { return m_state; } void setBackfaceVisibility(bool value) { m_backfaceVisibility = value; } void setTransform(const TransformationMatrix& matrix) { m_transform = matrix; } @@ -120,6 +120,7 @@ public: bool outsideViewport(); virtual bool needsTexture(); + void removeTexture(PaintedSurface*); // Debug helper methods int nbLayers(); @@ -377,6 +378,8 @@ private: RenderLayer* m_owningLayer; + GLWebViewState* m_state; + typedef Layer INHERITED; }; |