diff options
| author | Derek Sollenberger <djsollen@google.com> | 2010-10-19 10:56:10 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2010-10-19 10:56:10 -0700 |
| commit | 2f97e3f816a2d372a9dbcdde4207990938fbfbd8 (patch) | |
| tree | fa0b4f2922eec72cf0f11dcc2c1a2a1c7c5a819c /WebCore | |
| parent | 443003a60e3ef626b9600b66c6212d8843151841 (diff) | |
| parent | f0de54d27693cb9b5dd671641f5b6f0adfda5372 (diff) | |
| download | external_webkit-2f97e3f816a2d372a9dbcdde4207990938fbfbd8.zip external_webkit-2f97e3f816a2d372a9dbcdde4207990938fbfbd8.tar.gz external_webkit-2f97e3f816a2d372a9dbcdde4207990938fbfbd8.tar.bz2 | |
Merge "Fix crash in hardware accelerated webviews."
Diffstat (limited to 'WebCore')
| -rw-r--r-- | WebCore/platform/graphics/android/TiledPage.cpp | 4 | ||||
| -rw-r--r-- | WebCore/platform/graphics/android/TiledPage.h | 1 |
2 files changed, 5 insertions, 0 deletions
diff --git a/WebCore/platform/graphics/android/TiledPage.cpp b/WebCore/platform/graphics/android/TiledPage.cpp index f42105e..7bdea98 100644 --- a/WebCore/platform/graphics/android/TiledPage.cpp +++ b/WebCore/platform/graphics/android/TiledPage.cpp @@ -59,6 +59,10 @@ TiledPage::TiledPage(int id, GLWebViewState* state) { } +TiledPage::~TiledPage() { + deleteAllValues(m_baseTiles); +} + BaseTile* TiledPage::getBaseTile(int x, int y) { // if (x,y) is (0,0) the HashMap will treat the key as a null value and will diff --git a/WebCore/platform/graphics/android/TiledPage.h b/WebCore/platform/graphics/android/TiledPage.h index 917ba4b..94306bf 100644 --- a/WebCore/platform/graphics/android/TiledPage.h +++ b/WebCore/platform/graphics/android/TiledPage.h @@ -52,6 +52,7 @@ typedef HashMap<TileKey, BaseTile*> TileMap; class TiledPage { public: TiledPage(int id, GLWebViewState* state); + ~TiledPage(); // returns the other TiledPage who shares the same GLWebViewState TiledPage* sibling(); |