Merge WebKit at r84325: Initial merge by git.

[android-x86/external-webkit.git] / Source / WebCore / bindings / js / ScriptCachedFrameData.cpp

diff --git a/Source/WebCore/bindings/js/ScriptCachedFrameData.cpp b/Source/WebCore/bindings/js/ScriptCachedFrameData.cpp
index 16f18d3..1f0953b 100644 (file)
--- a/Source/WebCore/bindings/js/ScriptCachedFrameData.cpp
+++ b/Source/WebCore/bindings/js/ScriptCachedFrameData.cpp
@@ -54,7 +54,7 @@ ScriptCachedFrameData::ScriptCachedFrameData(Frame* frame)
     ScriptController::ShellMap::iterator windowShellsEnd = windowShells.end();
     for (ScriptController::ShellMap::iterator iter = windowShells.begin(); iter != windowShellsEnd; ++iter) {
         JSDOMWindow* window = iter->second->window();
-        m_windows.add(iter->first.get(), window);
+        m_windows.add(iter->first.get(), Strong<JSDOMWindow>(window->globalData(), window));
         m_domWindow = window->impl();
     }
 
@@ -83,8 +83,8 @@ void ScriptCachedFrameData::restore(Frame* frame)
         DOMWrapperWorld* world = iter->first.get();
         JSDOMWindowShell* windowShell = iter->second.get();
 
-        if (JSDOMWindow* window = m_windows.get(world))
-            windowShell->setWindow(window);
+        if (JSDOMWindow* window = m_windows.get(world).get())
+            windowShell->setWindow(window->globalData(), window);
         else {
             windowShell->setWindow(frame->domWindow());