Changeset 155198 in webkit

Timestamp:

Sep 6, 2013, 11:21:35 AM (12 years ago)

Author:

andersca@apple.com

Message:

Stop using fastNew/fastDelete in WebCore
​https://bugs.webkit.org/show_bug.cgi?id=120867

Reviewed by Geoffrey Garen.

Using fastNew/fastDelete can be dangerous, especially when put into a smart pointer
such as OwnPtr which uses regular delete. Because of this I'd like to remove fastNew/fastDelete.
Turns out it's only used in a couple of places in WebCore, so just use new/delete here instead.

• platform/audio/FFTFrame.h:
• platform/audio/gstreamer/FFTFrameGStreamer.cpp:

(WebCore::FFTFrame::FFTFrame):
(WebCore::FFTFrame::~FFTFrame):
(WebCore::FFTFrame::doFFT):
(WebCore::FFTFrame::doInverseFFT):

• platform/graphics/gstreamer/MediaPlayerPrivateGStreamerBase.cpp:

(WebCore::MediaPlayerPrivateGStreamerBase::MediaPlayerPrivateGStreamerBase):
(WebCore::MediaPlayerPrivateGStreamerBase::~MediaPlayerPrivateGStreamerBase):

• platform/graphics/gstreamer/VideoSinkGStreamer.cpp:

(webkitVideoSinkDispose):

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• platform/audio/FFTFrame.h (modified) (2 diffs)
• platform/audio/gstreamer/FFTFrameGStreamer.cpp (modified) (6 diffs)
• platform/graphics/gstreamer/MediaPlayerPrivateGStreamerBase.cpp (modified) (2 diffs)
• platform/graphics/gstreamer/VideoSinkGStreamer.cpp (modified) (4 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2013-09-06  Anders Carlsson  <andersca@apple.com>
+
+        Stop using fastNew/fastDelete in WebCore
+        https://bugs.webkit.org/show_bug.cgi?id=120867
+
+        Reviewed by Geoffrey Garen.
+
+        Using fastNew/fastDelete can be dangerous, especially when put into a smart pointer
+        such as OwnPtr which uses regular delete. Because of this I'd like to remove fastNew/fastDelete.
+        Turns out it's only used in a couple of places in WebCore, so just use new/delete here instead.
+
+        * platform/audio/FFTFrame.h:
+        * platform/audio/gstreamer/FFTFrameGStreamer.cpp:
+        (WebCore::FFTFrame::FFTFrame):
+        (WebCore::FFTFrame::~FFTFrame):
+        (WebCore::FFTFrame::doFFT):
+        (WebCore::FFTFrame::doInverseFFT):
+        * platform/graphics/gstreamer/MediaPlayerPrivateGStreamerBase.cpp:
+        (WebCore::MediaPlayerPrivateGStreamerBase::MediaPlayerPrivateGStreamerBase):
+        (WebCore::MediaPlayerPrivateGStreamerBase::~MediaPlayerPrivateGStreamerBase):
+        * platform/graphics/gstreamer/VideoSinkGStreamer.cpp:
+        (webkitVideoSinkDispose):
+
 2013-09-06  Anders Carlsson  <andersca@apple.com>
 

trunk/Source/WebCore/platform/audio/FFTFrame.h

@@ -69 +69 @@
 
 #include <wtf/Forward.h>
+#include <wtf/PassOwnArrayPtr.h>
 #include <wtf/PassOwnPtr.h>
 #include <wtf/Threading.h>
@@ -164 +165 @@
     GstFFTF32* m_fft;
     GstFFTF32* m_inverseFft;
-    GstFFTF32Complex* m_complexData;
+    OwnArrayPtr<GstFFTF32Complex> m_complexData;
     AudioFloatArray m_realData;
     AudioFloatArray m_imagData;

trunk/Source/WebCore/platform/audio/gstreamer/FFTFrameGStreamer.cpp

@@ -43 +43 @@
     : m_FFTSize(fftSize)
     , m_log2FFTSize(static_cast<unsigned>(log2(fftSize)))
+    , m_complexData(adoptArrayPtr(new GstFFTF32Complex[unpackedFFTDataSize(m_FFTSize)]))
     , m_realData(unpackedFFTDataSize(m_FFTSize))
     , m_imagData(unpackedFFTDataSize(m_FFTSize))
 {
-    m_complexData = WTF::fastNewArray<GstFFTF32Complex>(unpackedFFTDataSize(m_FFTSize));
-
     int fftLength = gst_fft_next_fast_length(m_FFTSize);
     m_fft = gst_fft_f32_new(fftLength, FALSE);
@@ -57 +56 @@
     : m_FFTSize(0)
     , m_log2FFTSize(0)
-    , m_complexData(0)
 {
     int fftLength = gst_fft_next_fast_length(m_FFTSize);
@@ -68 +66 @@
     : m_FFTSize(frame.m_FFTSize)
     , m_log2FFTSize(frame.m_log2FFTSize)
+    , m_complexData(adoptArrayPtr(new GstFFTF32Complex[unpackedFFTDataSize(m_FFTSize)]))
     , m_realData(unpackedFFTDataSize(frame.m_FFTSize))
     , m_imagData(unpackedFFTDataSize(frame.m_FFTSize))
 {
-    m_complexData = WTF::fastNewArray<GstFFTF32Complex>(unpackedFFTDataSize(m_FFTSize));
-
     int fftLength = gst_fft_next_fast_length(m_FFTSize);
     m_fft = gst_fft_f32_new(fftLength, FALSE);
@@ -100 +97 @@
     gst_fft_f32_free(m_inverseFft);
     m_inverseFft = 0;
-
-    WTF::fastDeleteArray(m_complexData);
 }
 
@@ -129 +124 @@
 void FFTFrame::doFFT(const float* data)
 {
-    gst_fft_f32_fft(m_fft, data, m_complexData);
+    gst_fft_f32_fft(m_fft, data, m_complexData.get());
 
     // Scale the frequency domain data to match vecLib's scale factor
@@ -157 +152 @@
     }
 
-    gst_fft_f32_inverse_fft(m_inverseFft, m_complexData, data);
+    gst_fft_f32_inverse_fft(m_inverseFft, m_complexData.get(), data);
 
     // Scale so that a forward then inverse FFT yields exactly the original data.

trunk/Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamerBase.cpp

@@ -119 +119 @@
 {
 #if GLIB_CHECK_VERSION(2, 31, 0)
-    m_bufferMutex = WTF::fastNew<GMutex>();
+    m_bufferMutex = new GMutex;
     g_mutex_init(m_bufferMutex);
 #else
@@ -132 +132 @@
 #if GLIB_CHECK_VERSION(2, 31, 0)
     g_mutex_clear(m_bufferMutex);
-    WTF::fastDelete(m_bufferMutex);
+    delete m_bufferMutex;
 #else
     g_mutex_free(m_bufferMutex);

trunk/Source/WebCore/platform/graphics/gstreamer/VideoSinkGStreamer.cpp

@@ -39 +39 @@
 #include <gst/video/gstvideopool.h>
 #endif
-#include <wtf/FastAllocBase.h>
+#include <wtf/OwnPtr.h>
 
 // CAIRO_FORMAT_RGB24 used to render the video buffers is little/big endian dependant.
@@ -118 +118 @@
     sink->priv = G_TYPE_INSTANCE_GET_PRIVATE(sink, WEBKIT_TYPE_VIDEO_SINK, WebKitVideoSinkPrivate);
 #if GLIB_CHECK_VERSION(2, 31, 0)
-    sink->priv->dataCondition = WTF::fastNew<GCond>();
+    sink->priv->dataCondition = new GCond;
     g_cond_init(sink->priv->dataCondition);
-    sink->priv->bufferMutex = WTF::fastNew<GMutex>();
+    sink->priv->bufferMutex = new GMutex;
     g_mutex_init(sink->priv->bufferMutex);
 #else
@@ -280 +280 @@
 #if GLIB_CHECK_VERSION(2, 31, 0)
         g_cond_clear(priv->dataCondition);
-        WTF::fastDelete(priv->dataCondition);
+        delete priv->dataCondition;
 #else
         g_cond_free(priv->dataCondition);
@@ -290 +290 @@
 #if GLIB_CHECK_VERSION(2, 31, 0)
         g_mutex_clear(priv->bufferMutex);
-        WTF::fastDelete(priv->bufferMutex);
+        delete priv->bufferMutex;
 #else
         g_mutex_free(priv->bufferMutex);