diff options
Diffstat (limited to 'WebCore/history/CachedFrame.cpp')
| -rw-r--r-- | WebCore/history/CachedFrame.cpp | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/WebCore/history/CachedFrame.cpp b/WebCore/history/CachedFrame.cpp index a868134..227c437 100644 --- a/WebCore/history/CachedFrame.cpp +++ b/WebCore/history/CachedFrame.cpp @@ -99,10 +99,13 @@ void CachedFrameBase::restore() for (unsigned i = 0; i < m_childFrames.size(); ++i) m_childFrames[i]->open(); +<<<<<<< HEAD:WebCore/history/CachedFrame.cpp #ifdef ANDROID_PAGE_CACHE_UNLOAD // matches pageshowEvent as in Document::implicitClose() m_document->dispatchWindowLoadEvent(); #endif +======= +>>>>>>> webkit.org at r51976:WebCore/history/CachedFrame.cpp m_document->dispatchWindowEvent(PageTransitionEvent::create(eventNames().pageshowEvent, true), m_document); } |