Merge r221561 - [SOUP] Use fastMalloced SoupBuffer in ResourcehandleSoup

https://bugs.webkit.org/show_bug.cgi?id=176311 Reviewed by Michael Catanzaro. Use fastMalloced memory instead of g_malloc for SoupBuffer. * platform/network/soup/ResourceHandleSoup.cpp: (WebCore::ResourceHandle::ensureReadBuffer):
WebKit · Sep 4, 2017 · 75b9aef · 75b9aef
1 parent 003d342
commit 75b9aef
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 2 deletions.
diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog
@@ -1,3 +1,15 @@
+2017-09-03  Yusuke Suzuki  <utatane.tea@gmail.com>
+
+        [SOUP] Use fastMalloced SoupBuffer in ResourcehandleSoup
+        https://bugs.webkit.org/show_bug.cgi?id=176311
+
+        Reviewed by Michael Catanzaro.
+
+        Use fastMalloced memory instead of g_malloc for SoupBuffer.
+
+        * platform/network/soup/ResourceHandleSoup.cpp:
+        (WebCore::ResourceHandle::ensureReadBuffer):
+
 2017-09-02  Emilio Cobos Álvarez  <emilio@crisal.io>
 
         Wrong getComputedStyle result for pseudo-elements in display: none subtrees.

diff --git a/Source/WebCore/platform/network/soup/ResourceHandleSoup.cpp b/Source/WebCore/platform/network/soup/ResourceHandleSoup.cpp
@@ -143,8 +143,10 @@ void ResourceHandle::ensureReadBuffer()
     char* bufferFromClient = client()->getOrCreateReadBuffer(gDefaultReadBufferSize, bufferSize);
     if (bufferFromClient)
         d->m_soupBuffer.reset(soup_buffer_new(SOUP_MEMORY_TEMPORARY, bufferFromClient, bufferSize));
-    else
-        d->m_soupBuffer.reset(soup_buffer_new(SOUP_MEMORY_TAKE, static_cast<char*>(g_malloc(gDefaultReadBufferSize)), gDefaultReadBufferSize));
+    else {
+        auto* buffer = static_cast<uint8_t*>(fastMalloc(gDefaultReadBufferSize));
+        d->m_soupBuffer.reset(soup_buffer_new_with_owner(buffer, gDefaultReadBufferSize, buffer, fastFree));
+    }
 
     ASSERT(d->m_soupBuffer);
 }