<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[187485] trunk/Source</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/187485">187485</a></dd>
<dt>Author</dt> <dd>carlosgc@webkit.org</dd>
<dt>Date</dt> <dd>2015-07-28 03:03:13 -0700 (Tue, 28 Jul 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>[GTK] Use fastMalloc instead of g_slice
https://bugs.webkit.org/show_bug.cgi?id=147357
Reviewed by Sergio Villar Senin.
The use of g_slice is no longer encouraged by glib developers.
Source/WebCore:
* platform/graphics/gstreamer/GStreamerUtilities.cpp:
(WebCore::mapGstBuffer):
(WebCore::unmapGstBuffer):
Source/WebKit2:
* UIProcess/API/gtk/WebKitCredential.cpp:
(webkitCredentialCreate):
(webkit_credential_free):
* UIProcess/API/gtk/WebKitJavascriptResult.cpp:
(webkitJavascriptResultCreate):
(webkit_javascript_result_unref):
* UIProcess/API/gtk/WebKitMimeInfo.cpp:
(webkitMimeInfoCreate):
(webkit_mime_info_unref):
* UIProcess/API/gtk/WebKitNavigationAction.cpp:
(webkitNavigationActionCreate):
(webkit_navigation_action_copy):
(webkit_navigation_action_free):
* UIProcess/API/gtk/WebKitPrivate.h:
* UIProcess/API/gtk/WebKitScriptDialog.cpp:
(webkitScriptDialogCopy):
(webkitScriptDialogFree):
* UIProcess/API/gtk/WebKitUserContent.cpp:
(webkit_user_style_sheet_unref):
(webkit_user_style_sheet_new):
(webkit_user_script_unref):
(webkit_user_script_new):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicsgstreamerGStreamerUtilitiescpp">trunk/Source/WebCore/platform/graphics/gstreamer/GStreamerUtilities.cpp</a></li>
<li><a href="#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeLog</a></li>
<li><a href="#trunkSourceWebKit2UIProcessAPIgtkWebKitCredentialcpp">trunk/Source/WebKit2/UIProcess/API/gtk/WebKitCredential.cpp</a></li>
<li><a href="#trunkSourceWebKit2UIProcessAPIgtkWebKitJavascriptResultcpp">trunk/Source/WebKit2/UIProcess/API/gtk/WebKitJavascriptResult.cpp</a></li>
<li><a href="#trunkSourceWebKit2UIProcessAPIgtkWebKitMimeInfocpp">trunk/Source/WebKit2/UIProcess/API/gtk/WebKitMimeInfo.cpp</a></li>
<li><a href="#trunkSourceWebKit2UIProcessAPIgtkWebKitNavigationActioncpp">trunk/Source/WebKit2/UIProcess/API/gtk/WebKitNavigationAction.cpp</a></li>
<li><a href="#trunkSourceWebKit2UIProcessAPIgtkWebKitPrivateh">trunk/Source/WebKit2/UIProcess/API/gtk/WebKitPrivate.h</a></li>
<li><a href="#trunkSourceWebKit2UIProcessAPIgtkWebKitScriptDialogcpp">trunk/Source/WebKit2/UIProcess/API/gtk/WebKitScriptDialog.cpp</a></li>
<li><a href="#trunkSourceWebKit2UIProcessAPIgtkWebKitUserContentcpp">trunk/Source/WebKit2/UIProcess/API/gtk/WebKitUserContent.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (187484 => 187485)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2015-07-28 08:32:19 UTC (rev 187484)
+++ trunk/Source/WebCore/ChangeLog 2015-07-28 10:03:13 UTC (rev 187485)
</span><span class="lines">@@ -1,3 +1,16 @@
</span><ins>+2015-07-28 Carlos Garcia Campos <cgarcia@igalia.com>
+
+ [GTK] Use fastMalloc instead of g_slice
+ https://bugs.webkit.org/show_bug.cgi?id=147357
+
+ Reviewed by Sergio Villar Senin.
+
+ The use of g_slice is no longer encouraged by glib developers.
+
+ * platform/graphics/gstreamer/GStreamerUtilities.cpp:
+ (WebCore::mapGstBuffer):
+ (WebCore::unmapGstBuffer):
+
</ins><span class="cx"> 2015-07-27 Jon Davis <jond@apple.com>
</span><span class="cx">
</span><span class="cx"> Adding Web Components to feature status page.
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsgstreamerGStreamerUtilitiescpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/gstreamer/GStreamerUtilities.cpp (187484 => 187485)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/gstreamer/GStreamerUtilities.cpp 2015-07-28 08:32:19 UTC (rev 187484)
+++ trunk/Source/WebCore/platform/graphics/gstreamer/GStreamerUtilities.cpp 2015-07-28 10:03:13 UTC (rev 187485)
</span><span class="lines">@@ -105,9 +105,9 @@
</span><span class="cx">
</span><span class="cx"> void mapGstBuffer(GstBuffer* buffer)
</span><span class="cx"> {
</span><del>- GstMapInfo* mapInfo = g_slice_new(GstMapInfo);
</del><ins>+ GstMapInfo* mapInfo = static_cast<GstMapInfo*>(fastMalloc(sizeof(GstMapInfo)));
</ins><span class="cx"> if (!gst_buffer_map(buffer, mapInfo, GST_MAP_WRITE)) {
</span><del>- g_slice_free(GstMapInfo, mapInfo);
</del><ins>+ fastFree(mapInfo);
</ins><span class="cx"> gst_buffer_unref(buffer);
</span><span class="cx"> return;
</span><span class="cx"> }
</span><span class="lines">@@ -125,7 +125,7 @@
</span><span class="cx"> return;
</span><span class="cx">
</span><span class="cx"> gst_buffer_unmap(buffer, mapInfo);
</span><del>- g_slice_free(GstMapInfo, mapInfo);
</del><ins>+ fastFree(mapInfo);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> bool initializeGStreamer()
</span></span></pre></div>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (187484 => 187485)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2015-07-28 08:32:19 UTC (rev 187484)
+++ trunk/Source/WebKit2/ChangeLog 2015-07-28 10:03:13 UTC (rev 187485)
</span><span class="lines">@@ -1,3 +1,35 @@
</span><ins>+2015-07-28 Carlos Garcia Campos <cgarcia@igalia.com>
+
+ [GTK] Use fastMalloc instead of g_slice
+ https://bugs.webkit.org/show_bug.cgi?id=147357
+
+ Reviewed by Sergio Villar Senin.
+
+ The use of g_slice is no longer encouraged by glib developers.
+
+ * UIProcess/API/gtk/WebKitCredential.cpp:
+ (webkitCredentialCreate):
+ (webkit_credential_free):
+ * UIProcess/API/gtk/WebKitJavascriptResult.cpp:
+ (webkitJavascriptResultCreate):
+ (webkit_javascript_result_unref):
+ * UIProcess/API/gtk/WebKitMimeInfo.cpp:
+ (webkitMimeInfoCreate):
+ (webkit_mime_info_unref):
+ * UIProcess/API/gtk/WebKitNavigationAction.cpp:
+ (webkitNavigationActionCreate):
+ (webkit_navigation_action_copy):
+ (webkit_navigation_action_free):
+ * UIProcess/API/gtk/WebKitPrivate.h:
+ * UIProcess/API/gtk/WebKitScriptDialog.cpp:
+ (webkitScriptDialogCopy):
+ (webkitScriptDialogFree):
+ * UIProcess/API/gtk/WebKitUserContent.cpp:
+ (webkit_user_style_sheet_unref):
+ (webkit_user_style_sheet_new):
+ (webkit_user_script_unref):
+ (webkit_user_script_new):
+
</ins><span class="cx"> 2015-07-27 Dan Bernstein <mitz@apple.com>
</span><span class="cx">
</span><span class="cx"> [iOS] REGRESSION (r187376): Form editing buttons are missing from the Shortcut Bar
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPIgtkWebKitCredentialcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/API/gtk/WebKitCredential.cpp (187484 => 187485)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/gtk/WebKitCredential.cpp 2015-07-28 08:32:19 UTC (rev 187484)
+++ trunk/Source/WebKit2/UIProcess/API/gtk/WebKitCredential.cpp 2015-07-28 10:03:13 UTC (rev 187485)
</span><span class="lines">@@ -71,7 +71,7 @@
</span><span class="cx">
</span><span class="cx"> WebKitCredential* webkitCredentialCreate(const WebCore::Credential& coreCredential)
</span><span class="cx"> {
</span><del>- WebKitCredential* credential = g_slice_new(WebKitCredential);
</del><ins>+ WebKitCredential* credential = static_cast<WebKitCredential*>(fastMalloc(sizeof(WebKitCredential)));
</ins><span class="cx"> new (credential) WebKitCredential(coreCredential);
</span><span class="cx"> return credential;
</span><span class="cx"> }
</span><span class="lines">@@ -132,7 +132,7 @@
</span><span class="cx"> g_return_if_fail(credential);
</span><span class="cx">
</span><span class="cx"> credential->~WebKitCredential();
</span><del>- g_slice_free(WebKitCredential, credential);
</del><ins>+ fastFree(credential);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> /**
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPIgtkWebKitJavascriptResultcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/API/gtk/WebKitJavascriptResult.cpp (187484 => 187485)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/gtk/WebKitJavascriptResult.cpp 2015-07-28 08:32:19 UTC (rev 187484)
+++ trunk/Source/WebKit2/UIProcess/API/gtk/WebKitJavascriptResult.cpp 2015-07-28 10:03:13 UTC (rev 187485)
</span><span class="lines">@@ -44,7 +44,7 @@
</span><span class="cx">
</span><span class="cx"> WebKitJavascriptResult* webkitJavascriptResultCreate(WebKitWebView* webView, WebCore::SerializedScriptValue& serializedScriptValue)
</span><span class="cx"> {
</span><del>- WebKitJavascriptResult* result = g_slice_new(WebKitJavascriptResult);
</del><ins>+ WebKitJavascriptResult* result = static_cast<WebKitJavascriptResult*>(fastMalloc(sizeof(WebKitJavascriptResult)));
</ins><span class="cx"> new (result) WebKitJavascriptResult(webView, serializedScriptValue);
</span><span class="cx"> return result;
</span><span class="cx"> }
</span><span class="lines">@@ -77,7 +77,7 @@
</span><span class="cx"> {
</span><span class="cx"> if (g_atomic_int_dec_and_test(&javascriptResult->referenceCount)) {
</span><span class="cx"> javascriptResult->~WebKitJavascriptResult();
</span><del>- g_slice_free(WebKitJavascriptResult, javascriptResult);
</del><ins>+ fastFree(javascriptResult);
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPIgtkWebKitMimeInfocpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/API/gtk/WebKitMimeInfo.cpp (187484 => 187485)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/gtk/WebKitMimeInfo.cpp 2015-07-28 08:32:19 UTC (rev 187484)
+++ trunk/Source/WebKit2/UIProcess/API/gtk/WebKitMimeInfo.cpp 2015-07-28 10:03:13 UTC (rev 187485)
</span><span class="lines">@@ -42,7 +42,7 @@
</span><span class="cx">
</span><span class="cx"> WebKitMimeInfo* webkitMimeInfoCreate(const WebCore::MimeClassInfo& mimeInfo)
</span><span class="cx"> {
</span><del>- WebKitMimeInfo* info = g_slice_new(WebKitMimeInfo);
</del><ins>+ WebKitMimeInfo* info = static_cast<WebKitMimeInfo*>(fastMalloc(sizeof(WebKitMimeInfo)));
</ins><span class="cx"> new (info) WebKitMimeInfo(mimeInfo);
</span><span class="cx"> return info;
</span><span class="cx"> }
</span><span class="lines">@@ -75,7 +75,7 @@
</span><span class="cx"> {
</span><span class="cx"> if (g_atomic_int_dec_and_test(&info->referenceCount)) {
</span><span class="cx"> info->~WebKitMimeInfo();
</span><del>- g_slice_free(WebKitMimeInfo, info);
</del><ins>+ fastFree(info);
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPIgtkWebKitNavigationActioncpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/API/gtk/WebKitNavigationAction.cpp (187484 => 187485)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/gtk/WebKitNavigationAction.cpp 2015-07-28 08:32:19 UTC (rev 187484)
+++ trunk/Source/WebKit2/UIProcess/API/gtk/WebKitNavigationAction.cpp 2015-07-28 10:03:13 UTC (rev 187485)
</span><span class="lines">@@ -30,7 +30,7 @@
</span><span class="cx">
</span><span class="cx"> WebKitNavigationAction* webkitNavigationActionCreate(WebKitURIRequest* request, const NavigationActionData& navigationActionData)
</span><span class="cx"> {
</span><del>- WebKitNavigationAction* navigation = g_slice_new0(WebKitNavigationAction);
</del><ins>+ WebKitNavigationAction* navigation = static_cast<WebKitNavigationAction*>(fastZeroedMalloc(sizeof(WebKitNavigationAction)));
</ins><span class="cx"> new (navigation) WebKitNavigationAction(request, navigationActionData);
</span><span class="cx"> return navigation;
</span><span class="cx"> }
</span><span class="lines">@@ -49,7 +49,7 @@
</span><span class="cx"> {
</span><span class="cx"> g_return_val_if_fail(navigation, nullptr);
</span><span class="cx">
</span><del>- WebKitNavigationAction* copy = g_slice_new0(WebKitNavigationAction);
</del><ins>+ WebKitNavigationAction* copy = static_cast<WebKitNavigationAction*>(fastZeroedMalloc(sizeof(WebKitNavigationAction)));
</ins><span class="cx"> new (copy) WebKitNavigationAction(navigation);
</span><span class="cx"> return copy;
</span><span class="cx"> }
</span><span class="lines">@@ -67,7 +67,7 @@
</span><span class="cx"> g_return_if_fail(navigation);
</span><span class="cx">
</span><span class="cx"> navigation->~WebKitNavigationAction();
</span><del>- g_slice_free(WebKitNavigationAction, navigation);
</del><ins>+ fastFree(navigation);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> /**
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPIgtkWebKitPrivateh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/API/gtk/WebKitPrivate.h (187484 => 187485)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/gtk/WebKitPrivate.h 2015-07-28 08:32:19 UTC (rev 187484)
+++ trunk/Source/WebKit2/UIProcess/API/gtk/WebKitPrivate.h 2015-07-28 10:03:13 UTC (rev 187485)
</span><span class="lines">@@ -53,14 +53,14 @@
</span><span class="cx"> #define WEBKIT_DEFINE_ASYNC_DATA_STRUCT(structName) \
</span><span class="cx"> static structName* create##structName() \
</span><span class="cx"> { \
</span><del>- structName* data = g_slice_new0(structName); \
</del><ins>+ structName* data = static_cast<structName*>(fastZeroedMalloc(sizeof(structName))); \
</ins><span class="cx"> new (data) structName(); \
</span><span class="cx"> return data; \
</span><span class="cx"> } \
</span><span class="cx"> static void destroy##structName(structName* data) \
</span><span class="cx"> { \
</span><span class="cx"> data->~structName(); \
</span><del>- g_slice_free(structName, data); \
</del><ins>+ fastFree(data); \
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> #define WEBKIT_DEFINE_TYPE(TypeName, type_name, TYPE_PARENT) _WEBKIT_DEFINE_TYPE_EXTENDED(TypeName, type_name, TYPE_PARENT, 0, { })
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPIgtkWebKitScriptDialogcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/API/gtk/WebKitScriptDialog.cpp (187484 => 187485)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/gtk/WebKitScriptDialog.cpp 2015-07-28 08:32:19 UTC (rev 187484)
+++ trunk/Source/WebKit2/UIProcess/API/gtk/WebKitScriptDialog.cpp 2015-07-28 10:03:13 UTC (rev 187485)
</span><span class="lines">@@ -24,7 +24,7 @@
</span><span class="cx">
</span><span class="cx"> static WebKitScriptDialog* webkitScriptDialogCopy(WebKitScriptDialog* dialog)
</span><span class="cx"> {
</span><del>- WebKitScriptDialog* copy = g_slice_new0(WebKitScriptDialog);
</del><ins>+ WebKitScriptDialog* copy = static_cast<WebKitScriptDialog*>(fastZeroedMalloc(sizeof(WebKitScriptDialog)));
</ins><span class="cx"> new (copy) WebKitScriptDialog(dialog);
</span><span class="cx"> return copy;
</span><span class="cx"> }
</span><span class="lines">@@ -32,7 +32,7 @@
</span><span class="cx"> static void webkitScriptDialogFree(WebKitScriptDialog* dialog)
</span><span class="cx"> {
</span><span class="cx"> dialog->~WebKitScriptDialog();
</span><del>- g_slice_free(WebKitScriptDialog, dialog);
</del><ins>+ fastFree(dialog);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> G_DEFINE_BOXED_TYPE(WebKitScriptDialog, webkit_script_dialog, webkitScriptDialogCopy, webkitScriptDialogFree)
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPIgtkWebKitUserContentcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/API/gtk/WebKitUserContent.cpp (187484 => 187485)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/gtk/WebKitUserContent.cpp 2015-07-28 08:32:19 UTC (rev 187484)
+++ trunk/Source/WebKit2/UIProcess/API/gtk/WebKitUserContent.cpp 2015-07-28 10:03:13 UTC (rev 187485)
</span><span class="lines">@@ -136,7 +136,7 @@
</span><span class="cx"> {
</span><span class="cx"> if (g_atomic_int_dec_and_test(&userStyleSheet->referenceCount)) {
</span><span class="cx"> userStyleSheet->~WebKitUserStyleSheet();
</span><del>- g_slice_free(WebKitUserStyleSheet, userStyleSheet);
</del><ins>+ fastFree(userStyleSheet);
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -163,7 +163,7 @@
</span><span class="cx"> WebKitUserStyleSheet* webkit_user_style_sheet_new(const gchar* source, WebKitUserContentInjectedFrames injectedFrames, WebKitUserStyleLevel level, const char* const* whitelist, const char* const* blacklist)
</span><span class="cx"> {
</span><span class="cx"> g_return_val_if_fail(source, nullptr);
</span><del>- WebKitUserStyleSheet* userStyleSheet = g_slice_new(WebKitUserStyleSheet);
</del><ins>+ WebKitUserStyleSheet* userStyleSheet = static_cast<WebKitUserStyleSheet*>(fastMalloc(sizeof(WebKitUserStyleSheet)));
</ins><span class="cx"> new (userStyleSheet) WebKitUserStyleSheet(source, injectedFrames, level, whitelist, blacklist);
</span><span class="cx"> return userStyleSheet;
</span><span class="cx"> }
</span><span class="lines">@@ -222,7 +222,7 @@
</span><span class="cx"> {
</span><span class="cx"> if (g_atomic_int_dec_and_test(&userScript->referenceCount)) {
</span><span class="cx"> userScript->~WebKitUserScript();
</span><del>- g_slice_free(WebKitUserScript, userScript);
</del><ins>+ fastFree(userScript);
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -249,7 +249,7 @@
</span><span class="cx"> WebKitUserScript* webkit_user_script_new(const gchar* source, WebKitUserContentInjectedFrames injectedFrames, WebKitUserScriptInjectionTime injectionTime, const gchar* const* whitelist, const gchar* const* blacklist)
</span><span class="cx"> {
</span><span class="cx"> g_return_val_if_fail(source, nullptr);
</span><del>- WebKitUserScript* userScript = g_slice_new(WebKitUserScript);
</del><ins>+ WebKitUserScript* userScript = static_cast<WebKitUserScript*>(fastMalloc(sizeof(WebKitUserScript)));
</ins><span class="cx"> new (userScript) WebKitUserScript(source, injectedFrames, injectionTime, whitelist, blacklist);
</span><span class="cx"> return userScript;
</span><span class="cx"> }
</span></span></pre>
</div>
</div>
</body>
</html>