Bindings: Manage multiple DOMWrapperWorlds for worklets (2)

third_party/WebKit/Source/bindings/core/v8/SerializedScriptValue.cpp

Index: third_party/WebKit/Source/bindings/core/v8/SerializedScriptValue.cpp
diff --git a/third_party/WebKit/Source/bindings/core/v8/SerializedScriptValue.cpp b/third_party/WebKit/Source/bindings/core/v8/SerializedScriptValue.cpp
index d9d92bc33daabb6ea1bc86a20eb8bcd5a5367da3..e4c694b695671bc17aef6e361694404ef8839f94 100644
--- a/third_party/WebKit/Source/bindings/core/v8/SerializedScriptValue.cpp
+++ b/third_party/WebKit/Source/bindings/core/v8/SerializedScriptValue.cpp
@@ -175,18 +175,11 @@ static void accumulateArrayBuffersForAllWorlds(
     v8::Isolate* isolate,
     DOMArrayBuffer* object,
     Vector<v8::Local<v8::ArrayBuffer>, 4>& buffers) {
-  if (isMainThread()) {
-    Vector<RefPtr<DOMWrapperWorld>> worlds;
-    DOMWrapperWorld::allWorldsInMainThread(worlds);
-    for (size_t i = 0; i < worlds.size(); i++) {
-      v8::Local<v8::Object> wrapper =
-          worlds[i]->domDataStore().get(object, isolate);
-      if (!wrapper.IsEmpty())
-        buffers.push_back(v8::Local<v8::ArrayBuffer>::Cast(wrapper));
-    }
-  } else {
+  Vector<RefPtr<DOMWrapperWorld>> worlds;
+  DOMWrapperWorld::allWorldsInCurrentThread(worlds);
+  for (size_t i = 0; i < worlds.size(); i++) {

[jbroman, 2017/03/15 14:09:34]

super-nit: you could use a range-based loop here:

for (const auto& world : worlds) {
  v8::Local<v8::Object> wrapper = world->domDataStore().get(object, isolate);
  // ...
}

[nhiroki, 2017/03/15 14:47:42]

Done.

     v8::Local<v8::Object> wrapper =
-        DOMWrapperWorld::current(isolate).domDataStore().get(object, isolate);
+        worlds[i]->domDataStore().get(object, isolate);
     if (!wrapper.IsEmpty())
       buffers.push_back(v8::Local<v8::ArrayBuffer>::Cast(wrapper));
   }