OLD | NEW |
1 // Copyright 2013 The Chromium Authors. All rights reserved. | 1 // Copyright 2013 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 "gin/context_holder.h" | 5 #include "gin/context_holder.h" |
6 | 6 |
7 #include <assert.h> | 7 #include "base/logging.h" |
8 #include "gin/per_context_data.h" | 8 #include "gin/per_context_data.h" |
9 | 9 |
10 namespace gin { | 10 namespace gin { |
11 | 11 |
12 ContextHolder::ContextHolder(v8::Isolate* isolate) | 12 ContextHolder::ContextHolder(v8::Isolate* isolate) |
13 : isolate_(isolate) { | 13 : isolate_(isolate) { |
14 } | 14 } |
15 | 15 |
16 ContextHolder::~ContextHolder() { | 16 ContextHolder::~ContextHolder() { |
17 v8::HandleScope handle_scope(isolate()); | 17 v8::HandleScope handle_scope(isolate()); |
18 v8::Handle<v8::Context> context = this->context(); | 18 v8::Handle<v8::Context> context = this->context(); |
19 | 19 |
20 PerContextData* data = PerContextData::From(context); | 20 data_->Detach(context); |
21 data->Detach(context); | 21 data_.reset(); |
22 delete data; | |
23 | 22 |
24 // TODO(abarth): Figure out how to set kResetInDestructor to true. | 23 // TODO(abarth): Figure out how to set kResetInDestructor to true. |
25 context_.Reset(); | 24 context_.Reset(); |
26 } | 25 } |
27 | 26 |
28 void ContextHolder::SetContext(v8::Handle<v8::Context> context) { | 27 void ContextHolder::SetContext(v8::Handle<v8::Context> context) { |
29 assert(context_.IsEmpty()); | 28 DCHECK(context_.IsEmpty()); |
30 context_.Reset(isolate_, context); | 29 context_.Reset(isolate_, context); |
31 new PerContextData(context); // Deleted in ~ContextHolder. | 30 data_.reset(new PerContextData(context)); |
32 } | 31 } |
33 | 32 |
34 } // namespace gin | 33 } // namespace gin |
OLD | NEW |