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 17 matching lines...) Expand all Loading... |
28 { | 28 { |
29 ASSERT(!DOMDataStore::containsWrapperNonTemplate(this, isolate)); | 29 ASSERT(!DOMDataStore::containsWrapperNonTemplate(this, isolate)); |
30 | 30 |
31 const WrapperTypeInfo* wrapperType = wrapperTypeInfo(); | 31 const WrapperTypeInfo* wrapperType = wrapperTypeInfo(); |
32 | 32 |
33 v8::Handle<v8::Object> wrapper = V8DOMWrapper::createWrapper(creationContext
, wrapperType, toScriptWrappableBase(), isolate); | 33 v8::Handle<v8::Object> wrapper = V8DOMWrapper::createWrapper(creationContext
, wrapperType, toScriptWrappableBase(), isolate); |
34 if (UNLIKELY(wrapper.IsEmpty())) | 34 if (UNLIKELY(wrapper.IsEmpty())) |
35 return wrapper; | 35 return wrapper; |
36 | 36 |
37 wrapperType->installConditionallyEnabledProperties(wrapper, isolate); | 37 wrapperType->installConditionallyEnabledProperties(wrapper, isolate); |
| 38 return associateWithWrapper(wrapperType, wrapper, isolate); |
| 39 } |
| 40 |
| 41 v8::Handle<v8::Object> ScriptWrappable::associateWithWrapper(const WrapperTypeIn
fo* wrapperType, v8::Handle<v8::Object> wrapper, v8::Isolate* isolate) |
| 42 { |
38 wrapperType->refObject(toScriptWrappableBase()); | 43 wrapperType->refObject(toScriptWrappableBase()); |
39 V8DOMWrapper::associateObjectWithWrapperNonTemplate(this, wrapperType, wrapp
er, isolate); | 44 V8DOMWrapper::associateObjectWithWrapperNonTemplate(this, wrapperType, wrapp
er, isolate); |
40 return wrapper; | 45 return wrapper; |
41 } | 46 } |
42 | 47 |
43 } // namespace blink | 48 } // namespace blink |
OLD | NEW |