Changeset 168059 in webkit


Ignore:
Timestamp:
Apr 30, 2014 4:16:48 PM (10 years ago)
Author:
vjaquez@igalia.com
Message:

[GTK][GStreamer] Remove unnecessary GLIB_CHECK_VERSION #ifdefs
https://bugs.webkit.org/show_bug.cgi?id=132390

Reviewed by Philippe Normand.

Since EFL port use GLib 2.38 and GTK+, 2.33.2, I assume it is OK
remove, in GTK+ and GST, the existing glib version guards.

Source/WebCore:
No new tests, already covered by current tests.

  • platform/graphics/gstreamer/MediaPlayerPrivateGStreamerBase.cpp:

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

  • platform/graphics/gstreamer/VideoSinkGStreamer.cpp:

(webkitVideoSinkDispose):
(webkitVideoSinkFinalize): Deleted.

Source/WTF:
This code was rollback from r149879 because Qt MIPS used it. But since
Qt is gone, it is safe to remove now.

  • wtf/gobject/GRefPtr.cpp:

(WTF::refGPtr): Deleted.
(WTF::derefGPtr): Deleted.

Location:
trunk/Source
Files:
5 edited

Legend:

Unmodified
Added
Removed
  • trunk/Source/WTF/ChangeLog

    r167971 r168059  
     12014-04-30  Víctor Manuel Jáquez Leal  <vjaquez@igalia.com>
     2
     3        [GTK][GStreamer] Remove unnecessary GLIB_CHECK_VERSION #ifdefs
     4        https://bugs.webkit.org/show_bug.cgi?id=132390
     5
     6        Reviewed by Philippe Normand.
     7
     8        Since EFL port use GLib 2.38 and GTK+, 2.33.2, I assume it is OK
     9        remove, in GTK+ and GST, the existing glib version guards.
     10
     11        This code was rollback from r149879 because Qt MIPS used it. But since
     12        Qt is gone, it is safe to remove now.
     13
     14        * wtf/gobject/GRefPtr.cpp:
     15        (WTF::refGPtr): Deleted.
     16        (WTF::derefGPtr): Deleted.
     17
    1182014-04-29  Alex Christensen  <achristensen@webkit.org>
    219
  • trunk/Source/WTF/wtf/gobject/GRefPtr.cpp

    r162306 r168059  
    6565}
    6666
    67 #if GLIB_CHECK_VERSION(2, 32, 0)
    6867template <> GBytes* refGPtr(GBytes* ptr)
    6968{
     
    7877        g_bytes_unref(ptr);
    7978}
    80 
    81 # else
    82 
    83 typedef struct _GBytes {
    84     bool fake;
    85 } GBytes;
    86 
    87 template <> GBytes* refGPtr(GBytes* ptr)
    88 {
    89     return ptr;
    90 }
    91 
    92 template <> void derefGPtr(GBytes* ptr)
    93 {
    94 }
    95 
    96 #endif
    9779
    9880template <> GVariant* refGPtr(GVariant* ptr)
  • trunk/Source/WebCore/ChangeLog

    r168055 r168059  
     12014-04-30  Víctor Manuel Jáquez Leal  <vjaquez@igalia.com>
     2
     3        [GTK][GStreamer] Remove unnecessary GLIB_CHECK_VERSION #ifdefs
     4        https://bugs.webkit.org/show_bug.cgi?id=132390
     5
     6        Reviewed by Philippe Normand.
     7
     8        Since EFL port use GLib 2.38 and GTK+, 2.33.2, I assume it is OK
     9        remove, in GTK+ and GST, the existing glib version guards.
     10
     11        No new tests, already covered by current tests.
     12
     13        * platform/graphics/gstreamer/MediaPlayerPrivateGStreamerBase.cpp:
     14        (WebCore::MediaPlayerPrivateGStreamerBase::MediaPlayerPrivateGStreamerBase):
     15        (WebCore::MediaPlayerPrivateGStreamerBase::~MediaPlayerPrivateGStreamerBase):
     16        * platform/graphics/gstreamer/VideoSinkGStreamer.cpp:
     17        (webkitVideoSinkDispose):
     18        (webkitVideoSinkFinalize): Deleted.
     19
    1202014-04-30  Alex Christensen  <achristensen@webkit.org>
    221
  • trunk/Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamerBase.cpp

    r166643 r168059  
    9494    , m_muteSignalHandler(0)
    9595{
    96 #if GLIB_CHECK_VERSION(2, 31, 0)
    9796    m_bufferMutex = new GMutex;
    9897    g_mutex_init(m_bufferMutex);
    99 #else
    100     m_bufferMutex = g_mutex_new();
    101 #endif
    10298}
    10399
     
    106102    g_signal_handler_disconnect(m_webkitVideoSink.get(), m_repaintHandler);
    107103
    108 #if GLIB_CHECK_VERSION(2, 31, 0)
    109104    g_mutex_clear(m_bufferMutex);
    110105    delete m_bufferMutex;
    111 #else
    112     g_mutex_free(m_bufferMutex);
    113 #endif
    114106
    115107    if (m_buffer)
  • trunk/Source/WebCore/platform/graphics/gstreamer/VideoSinkGStreamer.cpp

    r166643 r168059  
    103103    sink->priv = G_TYPE_INSTANCE_GET_PRIVATE(sink, WEBKIT_TYPE_VIDEO_SINK, WebKitVideoSinkPrivate);
    104104    new (sink->priv) WebKitVideoSinkPrivate();
    105 #if GLIB_CHECK_VERSION(2, 31, 0)
    106105    sink->priv->dataCondition = new GCond;
    107106    g_cond_init(sink->priv->dataCondition);
    108107    sink->priv->bufferMutex = new GMutex;
    109108    g_mutex_init(sink->priv->bufferMutex);
    110 #else
    111     sink->priv->dataCondition = g_cond_new();
    112     sink->priv->bufferMutex = g_mutex_new();
    113 #endif
    114109
    115110    gst_video_info_init(&sink->priv->info);
     
    229224
    230225    if (priv->dataCondition) {
    231 #if GLIB_CHECK_VERSION(2, 31, 0)
    232226        g_cond_clear(priv->dataCondition);
    233227        delete priv->dataCondition;
    234 #else
    235         g_cond_free(priv->dataCondition);
    236 #endif
    237228        priv->dataCondition = 0;
    238229    }
    239230
    240231    if (priv->bufferMutex) {
    241 #if GLIB_CHECK_VERSION(2, 31, 0)
    242232        g_mutex_clear(priv->bufferMutex);
    243233        delete priv->bufferMutex;
    244 #else
    245         g_mutex_free(priv->bufferMutex);
    246 #endif
    247234        priv->bufferMutex = 0;
    248235    }
Note: See TracChangeset for help on using the changeset viewer.