diff options
| author | Ben Murdoch <benm@google.com> | 2011-03-09 13:36:38 -0800 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2011-03-09 13:36:38 -0800 |
| commit | bc3bf9d0c1bcbb18a881f2be8a9b57b522b1fbde (patch) | |
| tree | 25a67c6fb9c1f8caacd302e0eb1b1c8cd6be4611 /WebCore/page/DOMWindow.cpp | |
| parent | 992fbcb2e10456f2fd90fc015ad49cf19c9c7911 (diff) | |
| parent | 05bdccdbcfd40b731c68ddc249d43bf9cfa08f3d (diff) | |
| download | external_webkit-bc3bf9d0c1bcbb18a881f2be8a9b57b522b1fbde.zip external_webkit-bc3bf9d0c1bcbb18a881f2be8a9b57b522b1fbde.tar.gz external_webkit-bc3bf9d0c1bcbb18a881f2be8a9b57b522b1fbde.tar.bz2 | |
am 05bdccdb: Merge "Clear DOM storage when clearing other cached data." into honeycomb-mr1
* commit '05bdccdbcfd40b731c68ddc249d43bf9cfa08f3d':
Clear DOM storage when clearing other cached data.
Diffstat (limited to 'WebCore/page/DOMWindow.cpp')
| -rw-r--r-- | WebCore/page/DOMWindow.cpp | 13 |
1 files changed, 13 insertions, 0 deletions
diff --git a/WebCore/page/DOMWindow.cpp b/WebCore/page/DOMWindow.cpp index 17b4c3d..7ea69b5 100644 --- a/WebCore/page/DOMWindow.cpp +++ b/WebCore/page/DOMWindow.cpp @@ -1644,4 +1644,17 @@ void DOMWindow::revokeObjectURL(const String& blobURLString) } #endif +#if ENABLE(DOM_STORAGE) && defined(ANDROID) +void DOMWindow::clearDOMStorage() +{ + if (m_sessionStorage) + m_sessionStorage->disconnectFrame(); + m_sessionStorage = 0; + + if (m_localStorage) + m_localStorage->disconnectFrame(); + m_localStorage = 0; +} +#endif + } // namespace WebCore |