Index: Source/bindings/v8/V8WindowShell.cpp |
diff --git a/Source/bindings/v8/V8WindowShell.cpp b/Source/bindings/v8/V8WindowShell.cpp |
index f5013a38d5aaebc4a30d2bb42f2323716c532727..7b97d398bc13218a1794e87259216f4cb36343d6 100644 |
--- a/Source/bindings/v8/V8WindowShell.cpp |
+++ b/Source/bindings/v8/V8WindowShell.cpp |
@@ -52,6 +52,7 @@ |
#include "core/loader/FrameLoaderClient.h" |
#include "core/frame/LocalFrame.h" |
#include "core/frame/csp/ContentSecurityPolicy.h" |
+#include "heap/Handle.h" |
#include "platform/TraceEvent.h" |
#include "platform/weborigin/SecurityOrigin.h" |
#include "public/platform/Platform.h" |
@@ -303,7 +304,7 @@ bool V8WindowShell::installDOMWindow() |
V8Window::installPerContextEnabledProperties(windowWrapper, window, m_isolate); |
- V8DOMWrapper::setNativeInfo(v8::Handle<v8::Object>::Cast(windowWrapper->GetPrototype()), &V8Window::wrapperTypeInfo, window); |
+ V8DOMWrapper::setNativeInfoGarbageCollected(v8::Handle<v8::Object>::Cast(windowWrapper->GetPrototype()), &V8Window::wrapperTypeInfo, window); |
// Install the windowWrapper as the prototype of the innerGlobalObject. |
// The full structure of the global object is as follows: |
@@ -319,9 +320,9 @@ bool V8WindowShell::installDOMWindow() |
// JavaScript object. |
// |
v8::Handle<v8::Object> innerGlobalObject = toInnerGlobalObject(m_perContextData->context()); |
- V8DOMWrapper::setNativeInfo(innerGlobalObject, &V8Window::wrapperTypeInfo, window); |
+ V8DOMWrapper::setNativeInfoGarbageCollected(innerGlobalObject, &V8Window::wrapperTypeInfo, window); |
innerGlobalObject->SetPrototype(windowWrapper); |
- V8DOMWrapper::associateObjectWithWrapper<V8Window>(PassRefPtr<DOMWindow>(window), &V8Window::wrapperTypeInfo, windowWrapper, m_isolate, WrapperConfiguration::Dependent); |
+ V8DOMWrapper::associateObjectWithWrapper<V8Window>(PassRefPtrWillBeRawPtr<DOMWindow>(window), &V8Window::wrapperTypeInfo, windowWrapper, m_isolate, WrapperConfiguration::Dependent); |
return true; |
} |