OLD | NEW |
1 // Copyright 2014 The Chromium Authors. All rights reserved. | 1 // Copyright 2014 The Chromium Authors. All rights reserved. |
2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
4 | 4 |
5 #include "config.h" | 5 #include "config.h" |
6 #include "bindings/core/v8/ScriptWrappable.h" | 6 #include "bindings/core/v8/ScriptWrappable.h" |
7 | 7 |
8 #include "bindings/core/v8/DOMDataStore.h" | 8 #include "bindings/core/v8/DOMDataStore.h" |
9 #include "bindings/core/v8/V8DOMWrapper.h" | 9 #include "bindings/core/v8/V8DOMWrapper.h" |
10 | 10 |
(...skipping 49 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
60 v8::Handle<v8::Object> wrapper = V8DOMWrapper::createWrapper(creationContext
, wrapperTypeInfo, toScriptWrappableBase(), isolate); | 60 v8::Handle<v8::Object> wrapper = V8DOMWrapper::createWrapper(creationContext
, wrapperTypeInfo, toScriptWrappableBase(), isolate); |
61 if (UNLIKELY(wrapper.IsEmpty())) | 61 if (UNLIKELY(wrapper.IsEmpty())) |
62 return wrapper; | 62 return wrapper; |
63 | 63 |
64 wrapperTypeInfo->installConditionallyEnabledProperties(wrapper, isolate); | 64 wrapperTypeInfo->installConditionallyEnabledProperties(wrapper, isolate); |
65 return associateWithWrapper(wrapperTypeInfo, wrapper, isolate); | 65 return associateWithWrapper(wrapperTypeInfo, wrapper, isolate); |
66 } | 66 } |
67 | 67 |
68 v8::Handle<v8::Object> ScriptWrappable::associateWithWrapper(const WrapperTypeIn
fo* wrapperTypeInfo, v8::Handle<v8::Object> wrapper, v8::Isolate* isolate) | 68 v8::Handle<v8::Object> ScriptWrappable::associateWithWrapper(const WrapperTypeIn
fo* wrapperTypeInfo, v8::Handle<v8::Object> wrapper, v8::Isolate* isolate) |
69 { | 69 { |
70 return V8DOMWrapper::associateObjectWithWrapperNonTemplate(this, wrapperType
Info, wrapper, isolate); | 70 return V8DOMWrapper::associateObjectWithWrapperNonTemplate(isolate, this, wr
apperTypeInfo, wrapper); |
71 } | 71 } |
72 | 72 |
73 } // namespace blink | 73 } // namespace blink |
OLD | NEW |