Make ImageBitmap transfers work in cases that require serialization

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 190 matching lines @@
         buffers.append(v8::Local<v8::ArrayBuffer>::Cast(wrapper));
     }
   } else {
     v8::Local<v8::Object> wrapper =
         DOMWrapperWorld::current(isolate).domDataStore().get(object, isolate);
     if (!wrapper.IsEmpty())
       buffers.append(v8::Local<v8::ArrayBuffer>::Cast(wrapper));
   }
 }
 
-void SerializedScriptValue::transferImageBitmaps(
+std::unique_ptr<ImageBitmapContentsArray>
+SerializedScriptValue::transferImageBitmapContents(
     v8::Isolate* isolate,
     const ImageBitmapArray& imageBitmaps,
     ExceptionState& exceptionState) {
   if (!imageBitmaps.size())
-    return;
+    return nullptr;
 
   for (size_t i = 0; i < imageBitmaps.size(); ++i) {
     if (imageBitmaps[i]->isNeutered()) {
       exceptionState.throwDOMException(
           DataCloneError, "ImageBitmap at index " + String::number(i) +
                               " is already detached.");
-      return;
+      return nullptr;
     }
   }
 
   std::unique_ptr<ImageBitmapContentsArray> contents =
       wrapUnique(new ImageBitmapContentsArray);
   HeapHashSet<Member<ImageBitmap>> visited;
   for (size_t i = 0; i < imageBitmaps.size(); ++i) {
     if (visited.contains(imageBitmaps[i]))
       continue;
     visited.add(imageBitmaps[i]);
     contents->append(imageBitmaps[i]->transfer());
   }
+  return contents;
+}
+
+void SerializedScriptValue::transferImageBitmaps(
+    v8::Isolate* isolate,
+    const ImageBitmapArray& imageBitmaps,
+    ExceptionState& exceptionState) {
+  std::unique_ptr<ImageBitmapContentsArray> contents =
+      transferImageBitmapContents(isolate, imageBitmaps, exceptionState);
   m_imageBitmapContentsArray = std::move(contents);
 }
 
 void SerializedScriptValue::transferOffscreenCanvas(
     v8::Isolate* isolate,
     const OffscreenCanvasArray& offscreenCanvases,
     ExceptionState& exceptionState) {
   if (!offscreenCanvases.size())
     return;
 
@@ skipping 209 matching lines @@
 void SerializedScriptValue::registerMemoryAllocatedWithCurrentScriptContext() {
   if (m_externallyAllocatedMemory)
     return;
 
   m_externallyAllocatedMemory = static_cast<intptr_t>(dataLengthInBytes());
   v8::Isolate::GetCurrent()->AdjustAmountOfExternalAllocatedMemory(
       m_externallyAllocatedMemory);
 }
 
 }  // namespace blink