WIP: Adjust externally allocated memory when ImageBitmap is transferred

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 429 matching lines @@
   }
 
   // TODO: if other transferables start accounting for their external
   // allocations with V8, extend this with corresponding cases.
   if (m_arrayBufferContentsArray &&
       !m_transferablesNeedExternalAllocationRegistration) {
     for (auto& buffer : *m_arrayBufferContentsArray)
       buffer.unregisterExternalAllocationWithCurrentContext();
     m_transferablesNeedExternalAllocationRegistration = true;
   }
+
+  if (m_imageBitmapContentsArray &&
+      !m_transferablesNeedExternalAllocationRegistration) {
+    for (auto& buffer : *m_imageBitmapContentsArray)
+      buffer->unregisterExternalAllocationWithCurrentContext();
+    m_transferablesNeedExternalAllocationRegistration = true;

[jbroman, 2017/04/04 15:44:56]

This would need to be fused with the one above. Otherwise an array buffer being
transferred will prevent image bitmaps from being properly transferred.

+  }
 }
 
 void SerializedScriptValue::registerMemoryAllocatedWithCurrentScriptContext() {
   if (m_hasRegisteredExternalAllocation)
     return;
 
   m_hasRegisteredExternalAllocation = true;
   int64_t diff = static_cast<int64_t>(dataLengthInBytes());
   DCHECK_GE(diff, 0);
   v8::Isolate::GetCurrent()->AdjustAmountOfExternalAllocatedMemory(diff);
 
   // Only (re)register allocation cost for transferables if this
   // SerializedScriptValue has explicitly unregistered them before.
   if (m_arrayBufferContentsArray &&
       m_transferablesNeedExternalAllocationRegistration) {
     for (auto& buffer : *m_arrayBufferContentsArray)
       buffer.registerExternalAllocationWithCurrentContext();
   }
+
+  if (m_imageBitmapContentsArray &&
+      m_transferablesNeedExternalAllocationRegistration) {
+    for (auto& buffer : *m_imageBitmapContentsArray)
+      buffer->registerExternalAllocationWithCurrentContext();
+  }
 }
 
 }  // namespace blink