summaryrefslogtreecommitdiffstats
path: root/WebCore/history/CachedFrame.cpp
diff options
context:
space:
mode:
authorGrace Kloba <klobag@google.com>2009-12-03 16:43:14 -0800
committerAndroid Git Automerger <android-git-automerger@android.com>2009-12-03 16:43:14 -0800
commit460d4fa19ac597fe27cc530c2a1ce0ca459cef35 (patch)
tree580cad7a82834870ded5f822f992464b2dcd9d24 /WebCore/history/CachedFrame.cpp
parent90fe16cecd2e606eaa6cf5a72fe3336e6ca69b12 (diff)
parent472affe311f3854aaac7cca73d398d36a9eefaf3 (diff)
downloadexternal_webkit-460d4fa19ac597fe27cc530c2a1ce0ca459cef35.zip
external_webkit-460d4fa19ac597fe27cc530c2a1ce0ca459cef35.tar.gz
external_webkit-460d4fa19ac597fe27cc530c2a1ce0ca459cef35.tar.bz2
am 472affe3: Merge change Iceb63592 into eclair-mr2
Merge commit '472affe311f3854aaac7cca73d398d36a9eefaf3' into eclair-mr2-plus-aosp * commit '472affe311f3854aaac7cca73d398d36a9eefaf3': Experimental change. Cache pages with unload event
Diffstat (limited to 'WebCore/history/CachedFrame.cpp')
-rw-r--r--WebCore/history/CachedFrame.cpp4
1 files changed, 4 insertions, 0 deletions
diff --git a/WebCore/history/CachedFrame.cpp b/WebCore/history/CachedFrame.cpp
index 16c7087..fe6c31f 100644
--- a/WebCore/history/CachedFrame.cpp
+++ b/WebCore/history/CachedFrame.cpp
@@ -99,6 +99,10 @@ void CachedFrameBase::restore()
for (unsigned i = 0; i < m_childFrames.size(); ++i)
m_childFrames[i]->open();
+#ifdef ANDROID_PAGE_CACHE_UNLOAD
+ // matches pageshowEvent as in Document::implicitClose()
+ m_document->dispatchWindowLoadEvent();
+#endif
m_document->dispatchWindowEvent(PageTransitionEvent::create(EventNames().pageshowEvent, true), m_document);
}