summaryrefslogtreecommitdiffstats
path: root/WebCore/history/CachedFrame.cpp
diff options
context:
space:
mode:
authorGrace Kloba <klobag@google.com>2009-12-04 04:29:05 -0800
committerAndroid Git Automerger <android-git-automerger@android.com>2009-12-04 04:29:05 -0800
commitba96ef8c08d3ad087bacac0e78349d988efac667 (patch)
treea12e830dbef628aba34d4b731a0aff31c6716586 /WebCore/history/CachedFrame.cpp
parent9e881a4ed91921665fc9137fc408ca19eb5d0d0e (diff)
parent460d4fa19ac597fe27cc530c2a1ce0ca459cef35 (diff)
downloadexternal_webkit-ba96ef8c08d3ad087bacac0e78349d988efac667.zip
external_webkit-ba96ef8c08d3ad087bacac0e78349d988efac667.tar.gz
external_webkit-ba96ef8c08d3ad087bacac0e78349d988efac667.tar.bz2
am 460d4fa1: am 472affe3: Merge change Iceb63592 into eclair-mr2
Merge commit '460d4fa19ac597fe27cc530c2a1ce0ca459cef35' * commit '460d4fa19ac597fe27cc530c2a1ce0ca459cef35': 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);
}