| 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 37 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 48 // object gets associated with the wrapper. | 48 // object gets associated with the wrapper. |
| 49 ScriptWrappableProtector protect(this, wrapperTypeInfo); | 49 ScriptWrappableProtector protect(this, wrapperTypeInfo); |
| 50 | 50 |
| 51 ASSERT(!DOMDataStore::containsWrapper(this, isolate)); | 51 ASSERT(!DOMDataStore::containsWrapper(this, isolate)); |
| 52 | 52 |
| 53 v8::Handle<v8::Object> wrapper = V8DOMWrapper::createWrapper(isolate, creati
onContext, wrapperTypeInfo, this); | 53 v8::Handle<v8::Object> wrapper = V8DOMWrapper::createWrapper(isolate, creati
onContext, wrapperTypeInfo, this); |
| 54 if (UNLIKELY(wrapper.IsEmpty())) | 54 if (UNLIKELY(wrapper.IsEmpty())) |
| 55 return wrapper; | 55 return wrapper; |
| 56 | 56 |
| 57 wrapperTypeInfo->installConditionallyEnabledProperties(wrapper, isolate); | 57 wrapperTypeInfo->installConditionallyEnabledProperties(wrapper, isolate); |
| 58 return associateWithWrapper(wrapperTypeInfo, wrapper, isolate); | 58 return associateWithWrapper(isolate, wrapperTypeInfo, wrapper); |
| 59 } | 59 } |
| 60 | 60 |
| 61 v8::Handle<v8::Object> ScriptWrappable::associateWithWrapper(const WrapperTypeIn
fo* wrapperTypeInfo, v8::Handle<v8::Object> wrapper, v8::Isolate* isolate) | 61 v8::Handle<v8::Object> ScriptWrappable::associateWithWrapper(v8::Isolate* isolat
e, const WrapperTypeInfo* wrapperTypeInfo, v8::Handle<v8::Object> wrapper) |
| 62 { | 62 { |
| 63 return V8DOMWrapper::associateObjectWithWrapper(isolate, this, wrapperTypeIn
fo, wrapper); | 63 return V8DOMWrapper::associateObjectWithWrapper(isolate, this, wrapperTypeIn
fo, wrapper); |
| 64 } | 64 } |
| 65 | 65 |
| 66 } // namespace blink | 66 } // namespace blink |
| OLD | NEW |