[arraybuffer] Remove uses of ArrayBufferContents::DataHandle

We are removing external uses of ArrayBufferContents::DataHandle so that
eventually we can remove the whole class and change the
implementation of WTF::ArrayBuffers. This CL is an intermediate step on
the way which replaces the external use of DataHandle to make a later
refactoring of ArrayBufferContents easier.

Bug: chromium:1008840
Change-Id: I9bcdee83e26eeccc7a8028c0bf3dd8fe9a455692
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1868993Reviewed-by: Kentaro Hara <haraken@chromium.org>
Reviewed-by: Kenneth Russell <kbr@chromium.org>
Commit-Queue: Andreas Haas <ahaas@chromium.org>
Cr-Commit-Position: refs/heads/master@{#708162}

third_party/blink/renderer/core/mojo/mojo_handle.cc

@@ -242,15 +242,13 @@ MojoMapBufferResult* MojoHandle::mapBuffer(unsigned offset,
       MojoMapBuffer(handle_.get().value(), offset, num_bytes, nullptr, &data);
   result_dict->setResult(result);
   if (result == MOJO_RESULT_OK) {
-    WTF::ArrayBufferContents::DataHandle data_handle(
+    WTF::ArrayBufferContents contents(
         data, num_bytes,
         [](void* buffer, size_t length, void* alloc_data) {
           MojoResult result = MojoUnmapBuffer(buffer);
           DCHECK_EQ(result, MOJO_RESULT_OK);
         },
-        nullptr);
-    WTF::ArrayBufferContents contents(std::move(data_handle),
-                                      WTF::ArrayBufferContents::kNotShared);
+        WTF::ArrayBufferContents::kNotShared);
     result_dict->setBuffer(DOMArrayBuffer::Create(contents));
   }
   return result_dict;

third_party/blink/renderer/modules/webgpu/gpu_buffer.cc

@@ -61,15 +61,12 @@ DawnBufferDescriptor AsDawnType(const GPUBufferDescriptor* webgpu_desc) {
 DOMArrayBuffer* CreateArrayBufferForMappedData(void* data, size_t data_length) {
   DCHECK(data);
 
-  WTF::ArrayBufferContents::DataHandle handle(
+  WTF::ArrayBufferContents contents(
       data, data_length,
       [](void* data, size_t length, void* info) {
         // DataDeleter does nothing because Dawn wire owns the memory.
       },
-      nullptr);
-
-  WTF::ArrayBufferContents contents(
-      std::move(handle), WTF::ArrayBufferContents::SharingType::kNotShared);
+      WTF::ArrayBufferContents::SharingType::kNotShared);
 
   return DOMArrayBuffer::Create(contents);
 }

third_party/blink/renderer/platform/wtf/typed_arrays/array_buffer_contents.cc

@@ -66,6 +66,14 @@ ArrayBufferContents::ArrayBufferContents(DataHandle data,
   }
 }
 
+ArrayBufferContents::ArrayBufferContents(void* data,
+                                         size_t length,
+                                         DataDeleter deleter,
+                                         SharingType is_shared)
+    : holder_(base::AdoptRef(new DataHolder())) {
+  holder_->Adopt(DataHandle(data, length, deleter, nullptr), is_shared);
+}
+
 ArrayBufferContents::~ArrayBufferContents() = default;
 
 void ArrayBufferContents::Detach() {

third_party/blink/renderer/platform/wtf/typed_arrays/array_buffer_contents.h

@@ -114,6 +114,10 @@ class WTF_EXPORT ArrayBufferContents {
                       unsigned element_byte_size,
                       SharingType is_shared,
                       InitializationPolicy);
+  ArrayBufferContents(void* data,
+                      size_t length,
+                      DataDeleter deleter,
+                      SharingType is_shared);
   ArrayBufferContents(DataHandle,
                       SharingType is_shared);
   ArrayBufferContents(ArrayBufferContents&&) = default;