From 68513a70bcd92384395513322f1b801e7bf9c729 Mon Sep 17 00:00:00 2001 From: Steve Block Date: Wed, 29 Sep 2010 17:32:26 +0100 Subject: Merge WebKit at r67908: Initial merge by Git Change-Id: I43a553e7b3299b28cb6ee8aa035ed70fe342b972 --- WebCore/history/CachedFrame.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'WebCore/history/CachedFrame.cpp') diff --git a/WebCore/history/CachedFrame.cpp b/WebCore/history/CachedFrame.cpp index f0a4fed..470e03f 100644 --- a/WebCore/history/CachedFrame.cpp +++ b/WebCore/history/CachedFrame.cpp @@ -128,7 +128,7 @@ CachedFrame::CachedFrame(Frame* frame) ASSERT(m_view); // Active DOM objects must be suspended before we cached the frame script data - m_document->suspendActiveDOMObjects(); + m_document->suspendActiveDOMObjects(ActiveDOMObject::DocumentWillBecomeInactive); m_cachedFrameScriptData = adoptPtr(new ScriptCachedFrameData(frame)); // Custom scrollbar renderers will get reattached when the document comes out of the page cache -- cgit v1.1