Added Dartium changes onto 45.0.2454.104

Source/wtf/ArrayBufferContents.cpp

 /*
  * Copyright (C) 2009 Apple Inc. All rights reserved.
  * Copyright (C) 2013 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:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
@@ skipping 41 matching lines @@
 
     m_holder->allocateNew(totalSize, isShared, policy);
 }
 
 ArrayBufferContents::ArrayBufferContents(
     void* data, unsigned sizeInBytes, SharingType isShared)
     : m_holder(adoptRef(new DataHolder()))
 {
     if (data) {
         m_holder->adopt(data, sizeInBytes, isShared);
+        m_holder->setAllocated(false);
     } else {
         ASSERT(!sizeInBytes);
         sizeInBytes = 0;
         // Allow null data if size is 0 bytes, make sure data is valid pointer.
         // (PartitionAlloc guarantees valid pointer for size 0)
         m_holder->allocateNew(sizeInBytes, isShared, ZeroInitialize);
     }
 }
 
 ArrayBufferContents::~ArrayBufferContents()
@@ skipping 37 matching lines @@
 
 void ArrayBufferContents::freeMemory(void* data, size_t size)
 {
     partitionFreeGeneric(WTF::Partitions::bufferPartition(), data);
     if (s_adjustAmountOfExternalAllocatedMemoryFunction)
         s_adjustAmountOfExternalAllocatedMemoryFunction(-static_cast<int>(size));
 }
 
 ArrayBufferContents::DataHolder::DataHolder()
     : m_data(nullptr)
+    , m_malloc(false)
     , m_sizeInBytes(0)
     , m_isShared(NotShared) { }
 
 ArrayBufferContents::DataHolder::~DataHolder()
 {
-    ArrayBufferContents::freeMemory(m_data, m_sizeInBytes);
+    if (m_malloc)
+        ArrayBufferContents::freeMemory(m_data, m_sizeInBytes);
 
     m_data = nullptr;
     m_sizeInBytes = 0;
     m_isShared = NotShared;
+    m_malloc = false;
 }
 
 void ArrayBufferContents::DataHolder::allocateNew(unsigned sizeInBytes, SharingType isShared, InitializationPolicy policy)
 {
     ASSERT(!m_data);
     void* data = nullptr;
     allocateMemory(sizeInBytes, policy, data);
     m_data = data;
     m_sizeInBytes = data ? sizeInBytes : 0;
     m_isShared = isShared;
+    m_malloc = true;
 }
 
 void ArrayBufferContents::DataHolder::adopt(void* data, unsigned sizeInBytes, SharingType isShared)
 {
     ASSERT(!m_data);
     m_data = data;
     m_sizeInBytes = sizeInBytes;
     m_isShared = isShared;
 }
 
 void ArrayBufferContents::DataHolder::copyMemoryTo(DataHolder& other)
 {
     ASSERT(!other.m_sizeInBytes);
     ArrayBufferContents::freeMemory(other.m_data, other.m_sizeInBytes);
     ArrayBufferContents::allocateMemory(m_sizeInBytes, DontInitialize, other.m_data);
     if (!other.m_data)
         return;
     memcpy(other.m_data, m_data, m_sizeInBytes);
     other.m_sizeInBytes = m_sizeInBytes;
 }
 
 } // namespace WTF