Bindings: Manage multiple DOMWrapperWorlds for worklets (2)

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

 /*
  * Copyright (C) 2010 Google Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are
  * met:
  *
  *     * Redistributions of source code must retain the above copyright
  * notice, this list of conditions and the following disclaimer.
  *     * Redistributions in binary form must reproduce the above
@@ skipping 157 matching lines @@
   // This is equivalent to swapping the byte order of the two bytes (x, 0),
   // depending on endianness.
   if (m_dataBufferSize % 2)
     dst[wireSizeBytes / 2 - 1] = m_dataBuffer[m_dataBufferSize - 1] << 8;
 }
 
 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));
   }
 }
 
 std::unique_ptr<SerializedScriptValue::ImageBitmapContentsArray>
 SerializedScriptValue::transferImageBitmapContents(
     v8::Isolate* isolate,
     const ImageBitmapArray& imageBitmaps,
     ExceptionState& exceptionState) {
@@ skipping 284 matching lines @@
     for (size_t i = 0; i < m_arrayBufferContentsArray->size(); ++i) {
       WTF::ArrayBufferContents& buffer = m_arrayBufferContentsArray->at(i);
       buffer.adjustExternalAllocatedMemoryUponContextTransfer(
           WTF::ArrayBufferContents::Enter);
     }
     m_adjustTransferableExternalAllocationOnContextTransfer = false;
   }
 }
 
 }  // namespace blink