| 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 33 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 44 const WrapperTypeInfo* wrapperTypeInfo = this->wrapperTypeInfo(); | 44 const WrapperTypeInfo* wrapperTypeInfo = this->wrapperTypeInfo(); |
| 45 | 45 |
| 46 // It's possible that no one except for the new wrapper owns this object at | 46 // It's possible that no one except for the new wrapper owns this object at |
| 47 // this moment, so we have to prevent GC to collect this object until the | 47 // this moment, so we have to prevent GC to collect this object until the |
| 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::Local<v8::Object> wrapper = V8DOMWrapper::createWrapper(isolate, creatio
nContext, wrapperTypeInfo, this); | 53 v8::Local<v8::Object> wrapper = V8DOMWrapper::createWrapper(isolate, creatio
nContext, wrapperTypeInfo, this); |
| 54 // V8DOMWrapper::createWrapper may run an arbitrary script and it may result |
| 55 // in creating a new wrapper and associating it with |this|. If so, the |
| 56 // wrapper already created and associated must be used. |
| 57 v8::Local<v8::Object> associatedWrapper = DOMDataStore::getWrapper(this, iso
late); |
| 58 if (UNLIKELY(!associatedWrapper.IsEmpty())) |
| 59 return associatedWrapper; |
| 54 if (UNLIKELY(wrapper.IsEmpty())) | 60 if (UNLIKELY(wrapper.IsEmpty())) |
| 55 return wrapper; | 61 return wrapper; |
| 56 | 62 |
| 57 wrapperTypeInfo->installConditionallyEnabledProperties(wrapper, isolate); | 63 wrapperTypeInfo->installConditionallyEnabledProperties(wrapper, isolate); |
| 58 return associateWithWrapper(isolate, wrapperTypeInfo, wrapper); | 64 return associateWithWrapper(isolate, wrapperTypeInfo, wrapper); |
| 59 } | 65 } |
| 60 | 66 |
| 61 v8::Local<v8::Object> ScriptWrappable::associateWithWrapper(v8::Isolate* isolate
, const WrapperTypeInfo* wrapperTypeInfo, v8::Local<v8::Object> wrapper) | 67 v8::Local<v8::Object> ScriptWrappable::associateWithWrapper(v8::Isolate* isolate
, const WrapperTypeInfo* wrapperTypeInfo, v8::Local<v8::Object> wrapper) |
| 62 { | 68 { |
| 63 return V8DOMWrapper::associateObjectWithWrapper(isolate, this, wrapperTypeIn
fo, wrapper); | 69 return V8DOMWrapper::associateObjectWithWrapper(isolate, this, wrapperTypeIn
fo, wrapper); |
| 64 } | 70 } |
| 65 | 71 |
| 66 } // namespace blink | 72 } // namespace blink |
| OLD | NEW |