OLD | NEW |
1 /* | 1 /* |
2 * Copyright (C) 2009 Google Inc. All rights reserved. | 2 * Copyright (C) 2009 Google Inc. All rights reserved. |
3 * | 3 * |
4 * Redistribution and use in source and binary forms, with or without | 4 * Redistribution and use in source and binary forms, with or without |
5 * modification, are permitted provided that the following conditions are | 5 * modification, are permitted provided that the following conditions are |
6 * met: | 6 * met: |
7 * | 7 * |
8 * * Redistributions of source code must retain the above copyright | 8 * * Redistributions of source code must retain the above copyright |
9 * notice, this list of conditions and the following disclaimer. | 9 * notice, this list of conditions and the following disclaimer. |
10 * * Redistributions in binary form must reproduce the above | 10 * * Redistributions in binary form must reproduce the above |
(...skipping 19 matching lines...) Expand all Loading... |
30 | 30 |
31 #include "config.h" | 31 #include "config.h" |
32 #include "bindings/v8/DOMDataStore.h" | 32 #include "bindings/v8/DOMDataStore.h" |
33 | 33 |
34 #include "bindings/v8/DOMWrapperMap.h" | 34 #include "bindings/v8/DOMWrapperMap.h" |
35 #include "bindings/v8/V8Binding.h" | 35 #include "bindings/v8/V8Binding.h" |
36 #include "wtf/MainThread.h" | 36 #include "wtf/MainThread.h" |
37 | 37 |
38 namespace WebCore { | 38 namespace WebCore { |
39 | 39 |
40 DOMDataStore::DOMDataStore(WrapperWorldType type) | 40 DOMDataStore::DOMDataStore(bool isMainWorld) |
41 : m_type(type) | 41 : m_isMainWorld(isMainWorld) |
42 , m_wrapperMap(v8::Isolate::GetCurrent()) // FIXME Don't call GetCurrent twi
ce. | 42 , m_wrapperMap(v8::Isolate::GetCurrent()) // FIXME Don't call GetCurrent twi
ce. |
43 { | 43 { |
44 V8PerIsolateData::current()->registerDOMDataStore(this); | 44 V8PerIsolateData::current()->registerDOMDataStore(this); |
45 } | 45 } |
46 | 46 |
47 DOMDataStore::~DOMDataStore() | 47 DOMDataStore::~DOMDataStore() |
48 { | 48 { |
49 ASSERT(m_type != MainWorld); // We never actually destruct the main world's
DOMDataStore. | 49 ASSERT(!m_isMainWorld); // We never actually destruct the main world's DOMDa
taStore. |
50 V8PerIsolateData::current()->unregisterDOMDataStore(this); | 50 V8PerIsolateData::current()->unregisterDOMDataStore(this); |
51 m_wrapperMap.clear(); | 51 m_wrapperMap.clear(); |
52 } | 52 } |
53 | 53 |
54 DOMDataStore& DOMDataStore::current(v8::Isolate* isolate) | 54 DOMDataStore& DOMDataStore::current(v8::Isolate* isolate) |
55 { | 55 { |
56 return DOMWrapperWorld::world(isolate->GetCurrentContext())->domDataStore(); | 56 return DOMWrapperWorld::world(isolate->GetCurrentContext())->domDataStore(); |
57 } | 57 } |
58 | 58 |
59 } // namespace WebCore | 59 } // namespace WebCore |
OLD | NEW |