diff options
| author | Ben Murdoch <benm@google.com> | 2011-04-11 20:08:03 +0100 |
|---|---|---|
| committer | Ben Murdoch <benm@google.com> | 2011-04-11 20:35:41 +0100 |
| commit | 622d72beb96a024bb18591feb39d4b21d0a34bd7 (patch) | |
| tree | 9a8e5353390326dc19931af1079ebe466f97987f /WebCore/storage/StorageEventDispatcher.cpp | |
| parent | 68c221808cf7a4776ba8feae02611d3c78e9f857 (diff) | |
| download | external_webkit-622d72beb96a024bb18591feb39d4b21d0a34bd7.zip external_webkit-622d72beb96a024bb18591feb39d4b21d0a34bd7.tar.gz external_webkit-622d72beb96a024bb18591feb39d4b21d0a34bd7.tar.bz2 | |
Clear DOM storage when clearing other cached data. Do not merge.
Empty out DOM local and session storage in addition to HTML5
database and app cache when we get a request from java to
delete cached data.
Cherry pick of I5b6ee075d2a8fb44ee373ad4462a33623c9c2460
Bug: 4267038
Change-Id: Id2dece1963d443c3758710e9c3e871054991ae32
Diffstat (limited to 'WebCore/storage/StorageEventDispatcher.cpp')
| -rw-r--r-- | WebCore/storage/StorageEventDispatcher.cpp | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/WebCore/storage/StorageEventDispatcher.cpp b/WebCore/storage/StorageEventDispatcher.cpp index dc0295b..aa91924 100644 --- a/WebCore/storage/StorageEventDispatcher.cpp +++ b/WebCore/storage/StorageEventDispatcher.cpp @@ -40,6 +40,10 @@ namespace WebCore { void StorageEventDispatcher::dispatch(const String& key, const String& oldValue, const String& newValue, StorageType storageType, SecurityOrigin* securityOrigin, Frame* sourceFrame) { +#ifdef ANDROID + if (!sourceFrame) + return; +#endif Page* page = sourceFrame->page(); if (!page) return; |