Merge from Chromium at DEPS revision 251904
This commit was generated by merge_to_master.py.
Change-Id: I8ca36eee41eba7e9a56d6728a9d19e5883d7058c
diff --git a/Source/bindings/v8/DOMDataStore.cpp b/Source/bindings/v8/DOMDataStore.cpp
index fcfb12f..aa739a6 100644
--- a/Source/bindings/v8/DOMDataStore.cpp
+++ b/Source/bindings/v8/DOMDataStore.cpp
@@ -51,26 +51,9 @@
m_wrapperMap.clear();
}
-DOMDataStore& DOMDataStore::mainWorldStore()
-{
- DEFINE_STATIC_LOCAL(DOMDataStore, mainWorldDOMDataStore, (MainWorld));
- ASSERT(isMainThread());
- return mainWorldDOMDataStore;
-}
-
DOMDataStore& DOMDataStore::current(v8::Isolate* isolate)
{
- V8PerIsolateData* data = isolate ? V8PerIsolateData::from(isolate) : V8PerIsolateData::current();
- if (UNLIKELY(!!data->workerDOMDataStore()))
- return *data->workerDOMDataStore();
-
- if (DOMWrapperWorld::isolatedWorldsExist()) {
- DOMWrapperWorld* isolatedWorld = DOMWrapperWorld::isolatedWorld(isolate->GetEnteredContext());
- if (UNLIKELY(!!isolatedWorld))
- return isolatedWorld->isolatedWorldDOMDataStore();
- }
-
- return mainWorldStore();
+ return DOMWrapperWorld::world(isolate->GetCurrentContext())->domDataStore();
}
} // namespace WebCore