Index: third_party/WebKit/Source/bindings/core/v8/RemoteWindowProxy.cpp |
diff --git a/third_party/WebKit/Source/bindings/core/v8/RemoteWindowProxy.cpp b/third_party/WebKit/Source/bindings/core/v8/RemoteWindowProxy.cpp |
index 3625ce5db95ed23e659b893f380d4dc397bd85bd..d10f735e58e719c01aefb66719f1ec6fb22612fa 100644 |
--- a/third_party/WebKit/Source/bindings/core/v8/RemoteWindowProxy.cpp |
+++ b/third_party/WebKit/Source/bindings/core/v8/RemoteWindowProxy.cpp |
@@ -125,9 +125,8 @@ void RemoteWindowProxy::SetupWindowPrototypeChain() { |
// The global proxy object. Note this is not the global object. |
v8::Local<v8::Object> global_proxy = global_proxy_.NewLocal(GetIsolate()); |
- v8::Local<v8::Object> associated_wrapper = |
- AssociateWithWrapper(window, wrapper_type_info, global_proxy); |
- DCHECK(associated_wrapper == global_proxy); |
+ V8DOMWrapper::SetNativeInfo(GetIsolate(), global_proxy, wrapper_type_info, |
+ window); |
// Mark the handle to be traced by Oilpan, since the global proxy has a |
// reference to the DOMWindow. |
global_proxy_.Get().SetWrapperClassId(wrapper_type_info->wrapper_class_id); |
@@ -135,8 +134,9 @@ void RemoteWindowProxy::SetupWindowPrototypeChain() { |
// The global object, aka window wrapper object. |
v8::Local<v8::Object> window_wrapper = |
global_proxy->GetPrototype().As<v8::Object>(); |
- V8DOMWrapper::SetNativeInfo(GetIsolate(), window_wrapper, wrapper_type_info, |
- window); |
+ v8::Local<v8::Object> associated_wrapper = |
+ AssociateWithWrapper(window, wrapper_type_info, window_wrapper); |
+ DCHECK(associated_wrapper == window_wrapper); |
} |
} // namespace blink |