Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(716)

Unified Diff: sky/engine/bindings/core/v8/SerializedScriptValue.cpp

Issue 776143003: Remove Isolated Worlds from Sky (Closed) Base URL: git@github.com:domokit/mojo.git@master
Patch Set: Created 6 years ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « sky/engine/bindings/core/v8/ScriptController.cpp ('k') | sky/engine/bindings/core/v8/V8Binding.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: sky/engine/bindings/core/v8/SerializedScriptValue.cpp
diff --git a/sky/engine/bindings/core/v8/SerializedScriptValue.cpp b/sky/engine/bindings/core/v8/SerializedScriptValue.cpp
index c010ae472df6f946c416ef328a6dfb7d5037fa88..a4f52bf45372e0c2f4ec9cde350e66fffadec9f2 100644
--- a/sky/engine/bindings/core/v8/SerializedScriptValue.cpp
+++ b/sky/engine/bindings/core/v8/SerializedScriptValue.cpp
@@ -2033,22 +2033,10 @@ SerializedScriptValue::SerializedScriptValue()
static void neuterArrayBufferInAllWorlds(ArrayBuffer* object)
{
v8::Isolate* isolate = v8::Isolate::GetCurrent();
- if (isMainThread()) {
- Vector<RefPtr<DOMWrapperWorld> > worlds;
- DOMWrapperWorld::allWorldsInMainThread(worlds);
- for (size_t i = 0; i < worlds.size(); i++) {
- v8::Handle<v8::Object> wrapper = worlds[i]->domDataStore().get<V8ArrayBuffer>(object, isolate);
- if (!wrapper.IsEmpty()) {
- ASSERT(wrapper->IsArrayBuffer());
- v8::Handle<v8::ArrayBuffer>::Cast(wrapper)->Neuter();
- }
- }
- } else {
- v8::Handle<v8::Object> wrapper = DOMWrapperWorld::current(isolate).domDataStore().get<V8ArrayBuffer>(object, isolate);
- if (!wrapper.IsEmpty()) {
- ASSERT(wrapper->IsArrayBuffer());
- v8::Handle<v8::ArrayBuffer>::Cast(wrapper)->Neuter();
- }
+ v8::Handle<v8::Object> wrapper = DOMWrapperWorld::current(isolate).domDataStore().get<V8ArrayBuffer>(object, isolate);
+ if (!wrapper.IsEmpty()) {
+ ASSERT(wrapper->IsArrayBuffer());
+ v8::Handle<v8::ArrayBuffer>::Cast(wrapper)->Neuter();
}
}
« no previous file with comments | « sky/engine/bindings/core/v8/ScriptController.cpp ('k') | sky/engine/bindings/core/v8/V8Binding.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698