<!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>[56707] trunk/WebCore</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/56707">56707</a></dd>
<dt>Author</dt> <dd>philn@webkit.org</dd>
<dt>Date</dt> <dd>2010-03-29 00:29:28 -0700 (Mon, 29 Mar 2010)</dd>
</dl>

<h3>Log Message</h3>
<pre>2010-03-26  Philippe Normand  &lt;pnormand@igalia.com&gt;

        Reviewed by Eric Carlson.

        It should be possible to use GStreamer in addition to another media engine
        https://bugs.webkit.org/show_bug.cgi?id=36654

        Renamed gstreamer player and added a WTF_USE_GSTREAMER
        define. Made the MediaPlayer register the GStreamer backend only
        if it's enabled (true by default on WebKitGTK+).

        * GNUmakefile.am:
        * platform/graphics/MediaPlayer.cpp:
        (WebCore::installedMediaEngines):
        * platform/graphics/gstreamer/MediaPlayerPrivateGStreamer.cpp:
        (WebCore::mediaPlayerPrivateMessageCallback):
        (WebCore::mediaPlayerPrivateSourceChangedCallback):
        (WebCore::mediaPlayerPrivateVolumeChangedCallback):
        (WebCore::mediaPlayerPrivateMuteChangedCallback):
        (WebCore::mediaPlayerPrivateRepaintCallback):
        (WebCore::MediaPlayerPrivateGStreamer::create):
        (WebCore::MediaPlayerPrivateGStreamer::registerMediaEngine):
        (WebCore::MediaPlayerPrivateGStreamer::isAvailable):
        (WebCore::MediaPlayerPrivateGStreamer::MediaPlayerPrivateGStreamer):
        (WebCore::MediaPlayerPrivateGStreamer::~MediaPlayerPrivateGStreamer):
        (WebCore::MediaPlayerPrivateGStreamer::load):
        (WebCore::MediaPlayerPrivateGStreamer::commitLoad):
        (WebCore::MediaPlayerPrivateGStreamer::changePipelineState):
        (WebCore::MediaPlayerPrivateGStreamer::prepareToPlay):
        (WebCore::MediaPlayerPrivateGStreamer::play):
        (WebCore::MediaPlayerPrivateGStreamer::pause):
        (WebCore::MediaPlayerPrivateGStreamer::duration):
        (WebCore::MediaPlayerPrivateGStreamer::currentTime):
        (WebCore::MediaPlayerPrivateGStreamer::seek):
        (WebCore::MediaPlayerPrivateGStreamer::startEndPointTimerIfNeeded):
        (WebCore::MediaPlayerPrivateGStreamer::cancelSeek):
        (WebCore::MediaPlayerPrivateGStreamer::endPointTimerFired):
        (WebCore::MediaPlayerPrivateGStreamer::paused):
        (WebCore::MediaPlayerPrivateGStreamer::seeking):
        (WebCore::MediaPlayerPrivateGStreamer::naturalSize):
        (WebCore::MediaPlayerPrivateGStreamer::hasVideo):
        (WebCore::MediaPlayerPrivateGStreamer::hasAudio):
        (WebCore::MediaPlayerPrivateGStreamer::setVolume):
        (WebCore::MediaPlayerPrivateGStreamer::volumeChangedTimerFired):
        (WebCore::MediaPlayerPrivateGStreamer::volumeChanged):
        (WebCore::MediaPlayerPrivateGStreamer::setRate):
        (WebCore::MediaPlayerPrivateGStreamer::networkState):
        (WebCore::MediaPlayerPrivateGStreamer::readyState):
        (WebCore::MediaPlayerPrivateGStreamer::buffered):
        (WebCore::MediaPlayerPrivateGStreamer::processBufferingStats):
        (WebCore::MediaPlayerPrivateGStreamer::fillTimerFired):
        (WebCore::MediaPlayerPrivateGStreamer::maxTimeSeekable):
        (WebCore::MediaPlayerPrivateGStreamer::maxTimeLoaded):
        (WebCore::MediaPlayerPrivateGStreamer::bytesLoaded):
        (WebCore::MediaPlayerPrivateGStreamer::totalBytes):
        (WebCore::MediaPlayerPrivateGStreamer::cancelLoad):
        (WebCore::MediaPlayerPrivateGStreamer::updateStates):
        (WebCore::MediaPlayerPrivateGStreamer::mediaLocationChanged):
        (WebCore::MediaPlayerPrivateGStreamer::loadNextLocation):
        (WebCore::MediaPlayerPrivateGStreamer::loadStateChanged):
        (WebCore::MediaPlayerPrivateGStreamer::sizeChanged):
        (WebCore::MediaPlayerPrivateGStreamer::timeChanged):
        (WebCore::MediaPlayerPrivateGStreamer::didEnd):
        (WebCore::MediaPlayerPrivateGStreamer::durationChanged):
        (WebCore::MediaPlayerPrivateGStreamer::supportsMuting):
        (WebCore::MediaPlayerPrivateGStreamer::setMuted):
        (WebCore::MediaPlayerPrivateGStreamer::muteChangedTimerFired):
        (WebCore::MediaPlayerPrivateGStreamer::muteChanged):
        (WebCore::MediaPlayerPrivateGStreamer::loadingFailed):
        (WebCore::MediaPlayerPrivateGStreamer::setSize):
        (WebCore::MediaPlayerPrivateGStreamer::setVisible):
        (WebCore::MediaPlayerPrivateGStreamer::repaint):
        (WebCore::MediaPlayerPrivateGStreamer::paint):
        (WebCore::MediaPlayerPrivateGStreamer::getSupportedTypes):
        (WebCore::MediaPlayerPrivateGStreamer::supportsType):
        (WebCore::MediaPlayerPrivateGStreamer::hasSingleSecurityOrigin):
        (WebCore::MediaPlayerPrivateGStreamer::supportsFullscreen):
        (WebCore::MediaPlayerPrivateGStreamer::setPreload):
        (WebCore::MediaPlayerPrivateGStreamer::createGSTPlayBin):
        * platform/graphics/gstreamer/MediaPlayerPrivateGStreamer.h:</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkWebCoreChangeLog">trunk/WebCore/ChangeLog</a></li>
<li><a href="#trunkWebCoreGNUmakefileam">trunk/WebCore/GNUmakefile.am</a></li>
<li><a href="#trunkWebCoreplatformgraphicsMediaPlayercpp">trunk/WebCore/platform/graphics/MediaPlayer.cpp</a></li>
<li><a href="#trunkWebCoreplatformgraphicsgstreamerMediaPlayerPrivateGStreamercpp">trunk/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamer.cpp</a></li>
<li><a href="#trunkWebCoreplatformgraphicsgstreamerMediaPlayerPrivateGStreamerh">trunk/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamer.h</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/WebCore/ChangeLog (56706 => 56707)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/WebCore/ChangeLog        2010-03-29 04:11:11 UTC (rev 56706)
+++ trunk/WebCore/ChangeLog        2010-03-29 07:29:28 UTC (rev 56707)
</span><span class="lines">@@ -1,3 +1,84 @@
</span><ins>+2010-03-26  Philippe Normand  &lt;pnormand@igalia.com&gt;
+
+        Reviewed by Eric Carlson.
+
+        It should be possible to use GStreamer in addition to another media engine
+        https://bugs.webkit.org/show_bug.cgi?id=36654
+
+        Renamed gstreamer player and added a WTF_USE_GSTREAMER
+        define. Made the MediaPlayer register the GStreamer backend only
+        if it's enabled (true by default on WebKitGTK+).
+
+        * GNUmakefile.am:
+        * platform/graphics/MediaPlayer.cpp:
+        (WebCore::installedMediaEngines):
+        * platform/graphics/gstreamer/MediaPlayerPrivateGStreamer.cpp:
+        (WebCore::mediaPlayerPrivateMessageCallback):
+        (WebCore::mediaPlayerPrivateSourceChangedCallback):
+        (WebCore::mediaPlayerPrivateVolumeChangedCallback):
+        (WebCore::mediaPlayerPrivateMuteChangedCallback):
+        (WebCore::mediaPlayerPrivateRepaintCallback):
+        (WebCore::MediaPlayerPrivateGStreamer::create):
+        (WebCore::MediaPlayerPrivateGStreamer::registerMediaEngine):
+        (WebCore::MediaPlayerPrivateGStreamer::isAvailable):
+        (WebCore::MediaPlayerPrivateGStreamer::MediaPlayerPrivateGStreamer):
+        (WebCore::MediaPlayerPrivateGStreamer::~MediaPlayerPrivateGStreamer):
+        (WebCore::MediaPlayerPrivateGStreamer::load):
+        (WebCore::MediaPlayerPrivateGStreamer::commitLoad):
+        (WebCore::MediaPlayerPrivateGStreamer::changePipelineState):
+        (WebCore::MediaPlayerPrivateGStreamer::prepareToPlay):
+        (WebCore::MediaPlayerPrivateGStreamer::play):
+        (WebCore::MediaPlayerPrivateGStreamer::pause):
+        (WebCore::MediaPlayerPrivateGStreamer::duration):
+        (WebCore::MediaPlayerPrivateGStreamer::currentTime):
+        (WebCore::MediaPlayerPrivateGStreamer::seek):
+        (WebCore::MediaPlayerPrivateGStreamer::startEndPointTimerIfNeeded):
+        (WebCore::MediaPlayerPrivateGStreamer::cancelSeek):
+        (WebCore::MediaPlayerPrivateGStreamer::endPointTimerFired):
+        (WebCore::MediaPlayerPrivateGStreamer::paused):
+        (WebCore::MediaPlayerPrivateGStreamer::seeking):
+        (WebCore::MediaPlayerPrivateGStreamer::naturalSize):
+        (WebCore::MediaPlayerPrivateGStreamer::hasVideo):
+        (WebCore::MediaPlayerPrivateGStreamer::hasAudio):
+        (WebCore::MediaPlayerPrivateGStreamer::setVolume):
+        (WebCore::MediaPlayerPrivateGStreamer::volumeChangedTimerFired):
+        (WebCore::MediaPlayerPrivateGStreamer::volumeChanged):
+        (WebCore::MediaPlayerPrivateGStreamer::setRate):
+        (WebCore::MediaPlayerPrivateGStreamer::networkState):
+        (WebCore::MediaPlayerPrivateGStreamer::readyState):
+        (WebCore::MediaPlayerPrivateGStreamer::buffered):
+        (WebCore::MediaPlayerPrivateGStreamer::processBufferingStats):
+        (WebCore::MediaPlayerPrivateGStreamer::fillTimerFired):
+        (WebCore::MediaPlayerPrivateGStreamer::maxTimeSeekable):
+        (WebCore::MediaPlayerPrivateGStreamer::maxTimeLoaded):
+        (WebCore::MediaPlayerPrivateGStreamer::bytesLoaded):
+        (WebCore::MediaPlayerPrivateGStreamer::totalBytes):
+        (WebCore::MediaPlayerPrivateGStreamer::cancelLoad):
+        (WebCore::MediaPlayerPrivateGStreamer::updateStates):
+        (WebCore::MediaPlayerPrivateGStreamer::mediaLocationChanged):
+        (WebCore::MediaPlayerPrivateGStreamer::loadNextLocation):
+        (WebCore::MediaPlayerPrivateGStreamer::loadStateChanged):
+        (WebCore::MediaPlayerPrivateGStreamer::sizeChanged):
+        (WebCore::MediaPlayerPrivateGStreamer::timeChanged):
+        (WebCore::MediaPlayerPrivateGStreamer::didEnd):
+        (WebCore::MediaPlayerPrivateGStreamer::durationChanged):
+        (WebCore::MediaPlayerPrivateGStreamer::supportsMuting):
+        (WebCore::MediaPlayerPrivateGStreamer::setMuted):
+        (WebCore::MediaPlayerPrivateGStreamer::muteChangedTimerFired):
+        (WebCore::MediaPlayerPrivateGStreamer::muteChanged):
+        (WebCore::MediaPlayerPrivateGStreamer::loadingFailed):
+        (WebCore::MediaPlayerPrivateGStreamer::setSize):
+        (WebCore::MediaPlayerPrivateGStreamer::setVisible):
+        (WebCore::MediaPlayerPrivateGStreamer::repaint):
+        (WebCore::MediaPlayerPrivateGStreamer::paint):
+        (WebCore::MediaPlayerPrivateGStreamer::getSupportedTypes):
+        (WebCore::MediaPlayerPrivateGStreamer::supportsType):
+        (WebCore::MediaPlayerPrivateGStreamer::hasSingleSecurityOrigin):
+        (WebCore::MediaPlayerPrivateGStreamer::supportsFullscreen):
+        (WebCore::MediaPlayerPrivateGStreamer::setPreload):
+        (WebCore::MediaPlayerPrivateGStreamer::createGSTPlayBin):
+        * platform/graphics/gstreamer/MediaPlayerPrivateGStreamer.h:
+
</ins><span class="cx"> 2010-03-28  Alexey Proskuryakov  &lt;ap@apple.com&gt;
</span><span class="cx"> 
</span><span class="cx">         Reviewed by Sam Weinig.
</span></span></pre></div>
<a id="trunkWebCoreGNUmakefileam"></a>
<div class="modfile"><h4>Modified: trunk/WebCore/GNUmakefile.am (56706 => 56707)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/WebCore/GNUmakefile.am        2010-03-29 04:11:11 UTC (rev 56706)
+++ trunk/WebCore/GNUmakefile.am        2010-03-29 07:29:28 UTC (rev 56707)
</span><span class="lines">@@ -64,6 +64,7 @@
</span><span class="cx"> 
</span><span class="cx"> webcoregtk_cppflags += \
</span><span class="cx">         -DWTF_USE_SOUP=1 \
</span><ins>+        -DWTF_USE_GSTREAMER=1 \
</ins><span class="cx">         -I$(srcdir)/WebCore/accessibility/gtk \
</span><span class="cx">         -I$(srcdir)/WebCore/loader/gtk \
</span><span class="cx">         -I$(srcdir)/WebCore/page/gtk \
</span></span></pre></div>
<a id="trunkWebCoreplatformgraphicsMediaPlayercpp"></a>
<div class="modfile"><h4>Modified: trunk/WebCore/platform/graphics/MediaPlayer.cpp (56706 => 56707)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/WebCore/platform/graphics/MediaPlayer.cpp        2010-03-29 04:11:11 UTC (rev 56706)
+++ trunk/WebCore/platform/graphics/MediaPlayer.cpp        2010-03-29 07:29:28 UTC (rev 56707)
</span><span class="lines">@@ -159,7 +159,14 @@
</span><span class="cx"> 
</span><span class="cx">     if (!enginesQueried) {
</span><span class="cx">         enginesQueried = true;
</span><ins>+#if USE(GSTREAMER)
+        MediaPlayerPrivateGStreamer::registerMediaEngine(addMediaEngine);
+#else
+        // FIXME: currently all the MediaEngines are named
+        // MediaPlayerPrivate. This code will need an update when bug
+        // 36663 is adressed.
</ins><span class="cx">         MediaPlayerPrivate::registerMediaEngine(addMediaEngine);
</span><ins>+#endif
</ins><span class="cx"> 
</span><span class="cx">         // register additional engines here
</span><span class="cx">     }
</span></span></pre></div>
<a id="trunkWebCoreplatformgraphicsgstreamerMediaPlayerPrivateGStreamercpp"></a>
<div class="modfile"><h4>Modified: trunk/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamer.cpp (56706 => 56707)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamer.cpp        2010-03-29 04:11:11 UTC (rev 56706)
+++ trunk/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamer.cpp        2010-03-29 07:29:28 UTC (rev 56707)
</span><span class="lines">@@ -93,7 +93,7 @@
</span><span class="cx">     GOwnPtr&lt;GError&gt; err;
</span><span class="cx">     GOwnPtr&lt;gchar&gt; debug;
</span><span class="cx">     MediaPlayer::NetworkState error;
</span><del>-    MediaPlayerPrivate* mp = reinterpret_cast&lt;MediaPlayerPrivate*&gt;(data);
</del><ins>+    MediaPlayerPrivateGStreamer* mp = reinterpret_cast&lt;MediaPlayerPrivateGStreamer*&gt;(data);
</ins><span class="cx">     bool issueError = true;
</span><span class="cx">     bool attemptNextLocation = false;
</span><span class="cx">     GstElement* pipeline = mp-&gt;pipeline();
</span><span class="lines">@@ -163,7 +163,7 @@
</span><span class="cx"> 
</span><span class="cx"> void mediaPlayerPrivateSourceChangedCallback(GObject *object, GParamSpec *pspec, gpointer data)
</span><span class="cx"> {
</span><del>-    MediaPlayerPrivate* mp = reinterpret_cast&lt;MediaPlayerPrivate*&gt;(data);
</del><ins>+    MediaPlayerPrivateGStreamer* mp = reinterpret_cast&lt;MediaPlayerPrivateGStreamer*&gt;(data);
</ins><span class="cx">     GOwnPtr&lt;GstElement&gt; element;
</span><span class="cx"> 
</span><span class="cx">     g_object_get(mp-&gt;m_playBin, &quot;source&quot;, &amp;element.outPtr(), NULL);
</span><span class="lines">@@ -180,14 +180,14 @@
</span><span class="cx"> void mediaPlayerPrivateVolumeChangedCallback(GObject *element, GParamSpec *pspec, gpointer data)
</span><span class="cx"> {
</span><span class="cx">     // This is called when playbin receives the notify::volume signal.
</span><del>-    MediaPlayerPrivate* mp = reinterpret_cast&lt;MediaPlayerPrivate*&gt;(data);
</del><ins>+    MediaPlayerPrivateGStreamer* mp = reinterpret_cast&lt;MediaPlayerPrivateGStreamer*&gt;(data);
</ins><span class="cx">     mp-&gt;volumeChanged();
</span><span class="cx"> }
</span><span class="cx"> 
</span><span class="cx"> void mediaPlayerPrivateMuteChangedCallback(GObject *element, GParamSpec *pspec, gpointer data)
</span><span class="cx"> {
</span><span class="cx">     // This is called when playbin receives the notify::mute signal.
</span><del>-    MediaPlayerPrivate* mp = reinterpret_cast&lt;MediaPlayerPrivate*&gt;(data);
</del><ins>+    MediaPlayerPrivateGStreamer* mp = reinterpret_cast&lt;MediaPlayerPrivateGStreamer*&gt;(data);
</ins><span class="cx">     mp-&gt;muteChanged();
</span><span class="cx"> }
</span><span class="cx"> 
</span><span class="lines">@@ -219,19 +219,19 @@
</span><span class="cx"> }
</span><span class="cx"> 
</span><span class="cx"> 
</span><del>-void mediaPlayerPrivateRepaintCallback(WebKitVideoSink*, GstBuffer *buffer, MediaPlayerPrivate* playerPrivate)
</del><ins>+void mediaPlayerPrivateRepaintCallback(WebKitVideoSink*, GstBuffer *buffer, MediaPlayerPrivateGStreamer* playerPrivate)
</ins><span class="cx"> {
</span><span class="cx">     g_return_if_fail(GST_IS_BUFFER(buffer));
</span><span class="cx">     gst_buffer_replace(&amp;playerPrivate-&gt;m_buffer, buffer);
</span><span class="cx">     playerPrivate-&gt;repaint();
</span><span class="cx"> }
</span><span class="cx"> 
</span><del>-MediaPlayerPrivateInterface* MediaPlayerPrivate::create(MediaPlayer* player)
</del><ins>+MediaPlayerPrivateInterface* MediaPlayerPrivateGStreamer::create(MediaPlayer* player)
</ins><span class="cx"> {
</span><del>-    return new MediaPlayerPrivate(player);
</del><ins>+    return new MediaPlayerPrivateGStreamer(player);
</ins><span class="cx"> }
</span><span class="cx"> 
</span><del>-void MediaPlayerPrivate::registerMediaEngine(MediaEngineRegistrar registrar)
</del><ins>+void MediaPlayerPrivateGStreamer::registerMediaEngine(MediaEngineRegistrar registrar)
</ins><span class="cx"> {
</span><span class="cx">     if (isAvailable())
</span><span class="cx">         registrar(create, getSupportedTypes, supportsType);
</span><span class="lines">@@ -259,7 +259,7 @@
</span><span class="cx">     return gstInitialized;
</span><span class="cx"> }
</span><span class="cx"> 
</span><del>-bool MediaPlayerPrivate::isAvailable()
</del><ins>+bool MediaPlayerPrivateGStreamer::isAvailable()
</ins><span class="cx"> {
</span><span class="cx">     if (!doGstInit())
</span><span class="cx">         return false;
</span><span class="lines">@@ -272,7 +272,7 @@
</span><span class="cx">     return false;
</span><span class="cx"> }
</span><span class="cx"> 
</span><del>-MediaPlayerPrivate::MediaPlayerPrivate(MediaPlayer* player)
</del><ins>+MediaPlayerPrivateGStreamer::MediaPlayerPrivateGStreamer(MediaPlayer* player)
</ins><span class="cx">     : m_player(player)
</span><span class="cx">     , m_playBin(0)
</span><span class="cx">     , m_videoSink(0)
</span><span class="lines">@@ -296,7 +296,7 @@
</span><span class="cx">     , m_errorOccured(false)
</span><span class="cx">     , m_mediaDuration(0)
</span><span class="cx">     , m_startedBuffering(false)
</span><del>-    , m_fillTimer(this, &amp;MediaPlayerPrivate::fillTimerFired)
</del><ins>+    , m_fillTimer(this, &amp;MediaPlayerPrivateGStreamer::fillTimerFired)
</ins><span class="cx">     , m_maxTimeLoaded(0)
</span><span class="cx">     , m_bufferingPercentage(0)
</span><span class="cx">     , m_preload(MediaPlayer::Auto)
</span><span class="lines">@@ -307,7 +307,7 @@
</span><span class="cx">         createGSTPlayBin();
</span><span class="cx"> }
</span><span class="cx"> 
</span><del>-MediaPlayerPrivate::~MediaPlayerPrivate()
</del><ins>+MediaPlayerPrivateGStreamer::~MediaPlayerPrivateGStreamer()
</ins><span class="cx"> {
</span><span class="cx">     if (m_fillTimer.isActive())
</span><span class="cx">         m_fillTimer.stop();
</span><span class="lines">@@ -342,7 +342,7 @@
</span><span class="cx">     }
</span><span class="cx"> }
</span><span class="cx"> 
</span><del>-void MediaPlayerPrivate::load(const String&amp; url)
</del><ins>+void MediaPlayerPrivateGStreamer::load(const String&amp; url)
</ins><span class="cx"> {
</span><span class="cx">     g_object_set(m_playBin, &quot;uri&quot;, url.utf8().data(), NULL);
</span><span class="cx"> 
</span><span class="lines">@@ -357,7 +357,7 @@
</span><span class="cx">     commitLoad();
</span><span class="cx"> }
</span><span class="cx"> 
</span><del>-void MediaPlayerPrivate::commitLoad()
</del><ins>+void MediaPlayerPrivateGStreamer::commitLoad()
</ins><span class="cx"> {
</span><span class="cx">     // GStreamer needs to have the pipeline set to a paused state to
</span><span class="cx">     // start providing anything useful.
</span><span class="lines">@@ -374,7 +374,7 @@
</span><span class="cx">     }
</span><span class="cx"> }
</span><span class="cx"> 
</span><del>-bool MediaPlayerPrivate::changePipelineState(GstState newState)
</del><ins>+bool MediaPlayerPrivateGStreamer::changePipelineState(GstState newState)
</ins><span class="cx"> {
</span><span class="cx">     ASSERT(newState == GST_STATE_PLAYING || newState == GST_STATE_PAUSED);
</span><span class="cx"> 
</span><span class="lines">@@ -393,7 +393,7 @@
</span><span class="cx">     return true;
</span><span class="cx"> }
</span><span class="cx"> 
</span><del>-void MediaPlayerPrivate::prepareToPlay()
</del><ins>+void MediaPlayerPrivateGStreamer::prepareToPlay()
</ins><span class="cx"> {
</span><span class="cx">     if (m_delayingLoad) {
</span><span class="cx">         m_delayingLoad = false;
</span><span class="lines">@@ -401,19 +401,19 @@
</span><span class="cx">     }
</span><span class="cx"> }
</span><span class="cx"> 
</span><del>-void MediaPlayerPrivate::play()
</del><ins>+void MediaPlayerPrivateGStreamer::play()
</ins><span class="cx"> {
</span><span class="cx">     if (changePipelineState(GST_STATE_PLAYING))
</span><span class="cx">         LOG_VERBOSE(Media, &quot;Play&quot;);
</span><span class="cx"> }
</span><span class="cx"> 
</span><del>-void MediaPlayerPrivate::pause()
</del><ins>+void MediaPlayerPrivateGStreamer::pause()
</ins><span class="cx"> {
</span><span class="cx">     if (changePipelineState(GST_STATE_PAUSED))
</span><span class="cx">         LOG_VERBOSE(Media, &quot;Pause&quot;);
</span><span class="cx"> }
</span><span class="cx"> 
</span><del>-float MediaPlayerPrivate::duration() const
</del><ins>+float MediaPlayerPrivateGStreamer::duration() const
</ins><span class="cx"> {
</span><span class="cx">     if (!m_playBin)
</span><span class="cx">         return 0.0;
</span><span class="lines">@@ -442,7 +442,7 @@
</span><span class="cx">     // FIXME: handle 3.14.9.5 properly
</span><span class="cx"> }
</span><span class="cx"> 
</span><del>-float MediaPlayerPrivate::currentTime() const
</del><ins>+float MediaPlayerPrivateGStreamer::currentTime() const
</ins><span class="cx"> {
</span><span class="cx">     if (!m_playBin)
</span><span class="cx">         return 0;
</span><span class="lines">@@ -457,7 +457,7 @@
</span><span class="cx"> 
</span><span class="cx"> }
</span><span class="cx"> 
</span><del>-void MediaPlayerPrivate::seek(float time)
</del><ins>+void MediaPlayerPrivateGStreamer::seek(float time)
</ins><span class="cx"> {
</span><span class="cx">     // Avoid useless seeking.
</span><span class="cx">     if (time == playbackPosition(m_playBin))
</span><span class="lines">@@ -483,33 +483,33 @@
</span><span class="cx">     }
</span><span class="cx"> }
</span><span class="cx"> 
</span><del>-void MediaPlayerPrivate::startEndPointTimerIfNeeded()
</del><ins>+void MediaPlayerPrivateGStreamer::startEndPointTimerIfNeeded()
</ins><span class="cx"> {
</span><span class="cx">     notImplemented();
</span><span class="cx"> }
</span><span class="cx"> 
</span><del>-void MediaPlayerPrivate::cancelSeek()
</del><ins>+void MediaPlayerPrivateGStreamer::cancelSeek()
</ins><span class="cx"> {
</span><span class="cx">     notImplemented();
</span><span class="cx"> }
</span><span class="cx"> 
</span><del>-void MediaPlayerPrivate::endPointTimerFired(Timer&lt;MediaPlayerPrivate&gt;*)
</del><ins>+void MediaPlayerPrivateGStreamer::endPointTimerFired(Timer&lt;MediaPlayerPrivateGStreamer&gt;*)
</ins><span class="cx"> {
</span><span class="cx">     notImplemented();
</span><span class="cx"> }
</span><span class="cx"> 
</span><del>-bool MediaPlayerPrivate::paused() const
</del><ins>+bool MediaPlayerPrivateGStreamer::paused() const
</ins><span class="cx"> {
</span><span class="cx">     return m_paused;
</span><span class="cx"> }
</span><span class="cx"> 
</span><del>-bool MediaPlayerPrivate::seeking() const
</del><ins>+bool MediaPlayerPrivateGStreamer::seeking() const
</ins><span class="cx"> {
</span><span class="cx">     return m_seeking;
</span><span class="cx"> }
</span><span class="cx"> 
</span><span class="cx"> // Returns the size of the video
</span><del>-IntSize MediaPlayerPrivate::naturalSize() const
</del><ins>+IntSize MediaPlayerPrivateGStreamer::naturalSize() const
</ins><span class="cx"> {
</span><span class="cx">     if (!hasVideo())
</span><span class="cx">         return IntSize();
</span><span class="lines">@@ -571,7 +571,7 @@
</span><span class="cx">     return IntSize(width, height);
</span><span class="cx"> }
</span><span class="cx"> 
</span><del>-bool MediaPlayerPrivate::hasVideo() const
</del><ins>+bool MediaPlayerPrivateGStreamer::hasVideo() const
</ins><span class="cx"> {
</span><span class="cx">     gint currentVideo = -1;
</span><span class="cx">     if (m_playBin)
</span><span class="lines">@@ -579,7 +579,7 @@
</span><span class="cx">     return currentVideo &gt; -1;
</span><span class="cx"> }
</span><span class="cx"> 
</span><del>-bool MediaPlayerPrivate::hasAudio() const
</del><ins>+bool MediaPlayerPrivateGStreamer::hasAudio() const
</ins><span class="cx"> {
</span><span class="cx">     gint currentAudio = -1;
</span><span class="cx">     if (m_playBin)
</span><span class="lines">@@ -587,7 +587,7 @@
</span><span class="cx">     return currentAudio &gt; -1;
</span><span class="cx"> }
</span><span class="cx"> 
</span><del>-void MediaPlayerPrivate::setVolume(float volume)
</del><ins>+void MediaPlayerPrivateGStreamer::setVolume(float volume)
</ins><span class="cx"> {
</span><span class="cx">     if (!m_playBin)
</span><span class="cx">         return;
</span><span class="lines">@@ -595,20 +595,20 @@
</span><span class="cx">     g_object_set(m_playBin, &quot;volume&quot;, static_cast&lt;double&gt;(volume), NULL);
</span><span class="cx"> }
</span><span class="cx"> 
</span><del>-void MediaPlayerPrivate::volumeChangedTimerFired(Timer&lt;MediaPlayerPrivate&gt;*)
</del><ins>+void MediaPlayerPrivateGStreamer::volumeChangedTimerFired(Timer&lt;MediaPlayerPrivateGStreamer&gt;*)
</ins><span class="cx"> {
</span><span class="cx">     double volume;
</span><span class="cx">     g_object_get(m_playBin, &quot;volume&quot;, &amp;volume, NULL);
</span><span class="cx">     m_player-&gt;volumeChanged(static_cast&lt;float&gt;(volume));
</span><span class="cx"> }
</span><span class="cx"> 
</span><del>-void MediaPlayerPrivate::volumeChanged()
</del><ins>+void MediaPlayerPrivateGStreamer::volumeChanged()
</ins><span class="cx"> {
</span><del>-    Timer&lt;MediaPlayerPrivate&gt; volumeChangedTimer(this, &amp;MediaPlayerPrivate::volumeChangedTimerFired);
</del><ins>+    Timer&lt;MediaPlayerPrivateGStreamer&gt; volumeChangedTimer(this, &amp;MediaPlayerPrivateGStreamer::volumeChangedTimerFired);
</ins><span class="cx">     volumeChangedTimer.startOneShot(0);
</span><span class="cx"> }
</span><span class="cx"> 
</span><del>-void MediaPlayerPrivate::setRate(float rate)
</del><ins>+void MediaPlayerPrivateGStreamer::setRate(float rate)
</ins><span class="cx"> {
</span><span class="cx">     // Avoid useless playback rate update.
</span><span class="cx">     if (m_playbackRate == rate)
</span><span class="lines">@@ -661,17 +661,17 @@
</span><span class="cx">         g_object_set(m_playBin, &quot;mute&quot;, mute, NULL);
</span><span class="cx"> }
</span><span class="cx"> 
</span><del>-MediaPlayer::NetworkState MediaPlayerPrivate::networkState() const
</del><ins>+MediaPlayer::NetworkState MediaPlayerPrivateGStreamer::networkState() const
</ins><span class="cx"> {
</span><span class="cx">     return m_networkState;
</span><span class="cx"> }
</span><span class="cx"> 
</span><del>-MediaPlayer::ReadyState MediaPlayerPrivate::readyState() const
</del><ins>+MediaPlayer::ReadyState MediaPlayerPrivateGStreamer::readyState() const
</ins><span class="cx"> {
</span><span class="cx">     return m_readyState;
</span><span class="cx"> }
</span><span class="cx"> 
</span><del>-PassRefPtr&lt;TimeRanges&gt; MediaPlayerPrivate::buffered() const
</del><ins>+PassRefPtr&lt;TimeRanges&gt; MediaPlayerPrivateGStreamer::buffered() const
</ins><span class="cx"> {
</span><span class="cx">     RefPtr&lt;TimeRanges&gt; timeRanges = TimeRanges::create();
</span><span class="cx">     float loaded = maxTimeLoaded();
</span><span class="lines">@@ -680,7 +680,7 @@
</span><span class="cx">     return timeRanges.release();
</span><span class="cx"> }
</span><span class="cx"> 
</span><del>-void MediaPlayerPrivate::processBufferingStats(GstMessage* message)
</del><ins>+void MediaPlayerPrivateGStreamer::processBufferingStats(GstMessage* message)
</ins><span class="cx"> {
</span><span class="cx">     // This is the immediate buffering that needs to happen so we have
</span><span class="cx">     // enough to play right now.
</span><span class="lines">@@ -711,7 +711,7 @@
</span><span class="cx">     }
</span><span class="cx"> }
</span><span class="cx"> 
</span><del>-void MediaPlayerPrivate::fillTimerFired(Timer&lt;MediaPlayerPrivate&gt;*)
</del><ins>+void MediaPlayerPrivateGStreamer::fillTimerFired(Timer&lt;MediaPlayerPrivateGStreamer&gt;*)
</ins><span class="cx"> {
</span><span class="cx">     GstQuery* query = gst_query_new_buffering(GST_FORMAT_PERCENT);
</span><span class="cx"> 
</span><span class="lines">@@ -757,7 +757,7 @@
</span><span class="cx">     updateStates();
</span><span class="cx"> }
</span><span class="cx"> 
</span><del>-float MediaPlayerPrivate::maxTimeSeekable() const
</del><ins>+float MediaPlayerPrivateGStreamer::maxTimeSeekable() const
</ins><span class="cx"> {
</span><span class="cx">     if (m_errorOccured)
</span><span class="cx">         return 0.0;
</span><span class="lines">@@ -770,7 +770,7 @@
</span><span class="cx">     return maxTimeLoaded();
</span><span class="cx"> }
</span><span class="cx"> 
</span><del>-float MediaPlayerPrivate::maxTimeLoaded() const
</del><ins>+float MediaPlayerPrivateGStreamer::maxTimeLoaded() const
</ins><span class="cx"> {
</span><span class="cx">     if (m_errorOccured)
</span><span class="cx">         return 0.0;
</span><span class="lines">@@ -782,7 +782,7 @@
</span><span class="cx">     return loaded;
</span><span class="cx"> }
</span><span class="cx"> 
</span><del>-unsigned MediaPlayerPrivate::bytesLoaded() const
</del><ins>+unsigned MediaPlayerPrivateGStreamer::bytesLoaded() const
</ins><span class="cx"> {
</span><span class="cx">     if (!m_playBin)
</span><span class="cx">         return 0;
</span><span class="lines">@@ -795,7 +795,7 @@
</span><span class="cx">     return loaded;
</span><span class="cx"> }
</span><span class="cx"> 
</span><del>-unsigned MediaPlayerPrivate::totalBytes() const
</del><ins>+unsigned MediaPlayerPrivateGStreamer::totalBytes() const
</ins><span class="cx"> {
</span><span class="cx">     if (!m_source)
</span><span class="cx">         return 0;
</span><span class="lines">@@ -811,7 +811,7 @@
</span><span class="cx">     return length;
</span><span class="cx"> }
</span><span class="cx"> 
</span><del>-void MediaPlayerPrivate::cancelLoad()
</del><ins>+void MediaPlayerPrivateGStreamer::cancelLoad()
</ins><span class="cx"> {
</span><span class="cx">     if (m_networkState &lt; MediaPlayer::Loading || m_networkState == MediaPlayer::Loaded)
</span><span class="cx">         return;
</span><span class="lines">@@ -820,7 +820,7 @@
</span><span class="cx">         gst_element_set_state(m_playBin, GST_STATE_NULL);
</span><span class="cx"> }
</span><span class="cx"> 
</span><del>-void MediaPlayerPrivate::updateStates()
</del><ins>+void MediaPlayerPrivateGStreamer::updateStates()
</ins><span class="cx"> {
</span><span class="cx">     if (!m_playBin)
</span><span class="cx">         return;
</span><span class="lines">@@ -988,7 +988,7 @@
</span><span class="cx">     }
</span><span class="cx"> }
</span><span class="cx"> 
</span><del>-void MediaPlayerPrivate::mediaLocationChanged(GstMessage* message)
</del><ins>+void MediaPlayerPrivateGStreamer::mediaLocationChanged(GstMessage* message)
</ins><span class="cx"> {
</span><span class="cx">     if (m_mediaLocations)
</span><span class="cx">         gst_structure_free(m_mediaLocations);
</span><span class="lines">@@ -1007,7 +1007,7 @@
</span><span class="cx">     }
</span><span class="cx"> }
</span><span class="cx"> 
</span><del>-bool MediaPlayerPrivate::loadNextLocation()
</del><ins>+bool MediaPlayerPrivateGStreamer::loadNextLocation()
</ins><span class="cx"> {
</span><span class="cx">     if (!m_mediaLocations)
</span><span class="cx">         return false;
</span><span class="lines">@@ -1087,23 +1087,23 @@
</span><span class="cx"> 
</span><span class="cx"> }
</span><span class="cx"> 
</span><del>-void MediaPlayerPrivate::loadStateChanged()
</del><ins>+void MediaPlayerPrivateGStreamer::loadStateChanged()
</ins><span class="cx"> {
</span><span class="cx">     updateStates();
</span><span class="cx"> }
</span><span class="cx"> 
</span><del>-void MediaPlayerPrivate::sizeChanged()
</del><ins>+void MediaPlayerPrivateGStreamer::sizeChanged()
</ins><span class="cx"> {
</span><span class="cx">     notImplemented();
</span><span class="cx"> }
</span><span class="cx"> 
</span><del>-void MediaPlayerPrivate::timeChanged()
</del><ins>+void MediaPlayerPrivateGStreamer::timeChanged()
</ins><span class="cx"> {
</span><span class="cx">     updateStates();
</span><span class="cx">     m_player-&gt;timeChanged();
</span><span class="cx"> }
</span><span class="cx"> 
</span><del>-void MediaPlayerPrivate::didEnd()
</del><ins>+void MediaPlayerPrivateGStreamer::didEnd()
</ins><span class="cx"> {
</span><span class="cx">     // EOS was reached but in case of reverse playback the position is
</span><span class="cx">     // not always 0. So to not confuse the HTMLMediaElement we
</span><span class="lines">@@ -1119,7 +1119,7 @@
</span><span class="cx">     timeChanged();
</span><span class="cx"> }
</span><span class="cx"> 
</span><del>-void MediaPlayerPrivate::durationChanged()
</del><ins>+void MediaPlayerPrivateGStreamer::durationChanged()
</ins><span class="cx"> {
</span><span class="cx">     // Reset cached media duration
</span><span class="cx">     m_mediaDuration = 0;
</span><span class="lines">@@ -1147,12 +1147,12 @@
</span><span class="cx">     m_player-&gt;durationChanged();
</span><span class="cx"> }
</span><span class="cx"> 
</span><del>-bool MediaPlayerPrivate::supportsMuting() const
</del><ins>+bool MediaPlayerPrivateGStreamer::supportsMuting() const
</ins><span class="cx"> {
</span><span class="cx">     return true;
</span><span class="cx"> }
</span><span class="cx"> 
</span><del>-void MediaPlayerPrivate::setMuted(bool muted)
</del><ins>+void MediaPlayerPrivateGStreamer::setMuted(bool muted)
</ins><span class="cx"> {
</span><span class="cx">     if (!m_playBin)
</span><span class="cx">         return;
</span><span class="lines">@@ -1160,20 +1160,20 @@
</span><span class="cx">     g_object_set(m_playBin, &quot;mute&quot;, muted, NULL);
</span><span class="cx"> }
</span><span class="cx"> 
</span><del>-void MediaPlayerPrivate::muteChangedTimerFired(Timer&lt;MediaPlayerPrivate&gt;*)
</del><ins>+void MediaPlayerPrivateGStreamer::muteChangedTimerFired(Timer&lt;MediaPlayerPrivateGStreamer&gt;*)
</ins><span class="cx"> {
</span><span class="cx">     gboolean muted;
</span><span class="cx">     g_object_get(m_playBin, &quot;mute&quot;, &amp;muted, NULL);
</span><span class="cx">     m_player-&gt;muteChanged(static_cast&lt;bool&gt;(muted));
</span><span class="cx"> }
</span><span class="cx"> 
</span><del>-void MediaPlayerPrivate::muteChanged()
</del><ins>+void MediaPlayerPrivateGStreamer::muteChanged()
</ins><span class="cx"> {
</span><del>-    Timer&lt;MediaPlayerPrivate&gt; muteChangedTimer(this, &amp;MediaPlayerPrivate::muteChangedTimerFired);
</del><ins>+    Timer&lt;MediaPlayerPrivateGStreamer&gt; muteChangedTimer(this, &amp;MediaPlayerPrivateGStreamer::muteChangedTimerFired);
</ins><span class="cx">     muteChangedTimer.startOneShot(0);
</span><span class="cx"> }
</span><span class="cx"> 
</span><del>-void MediaPlayerPrivate::loadingFailed(MediaPlayer::NetworkState error)
</del><ins>+void MediaPlayerPrivateGStreamer::loadingFailed(MediaPlayer::NetworkState error)
</ins><span class="cx"> {
</span><span class="cx">     m_errorOccured = true;
</span><span class="cx">     if (m_networkState != error) {
</span><span class="lines">@@ -1186,21 +1186,21 @@
</span><span class="cx">     }
</span><span class="cx"> }
</span><span class="cx"> 
</span><del>-void MediaPlayerPrivate::setSize(const IntSize&amp; size)
</del><ins>+void MediaPlayerPrivateGStreamer::setSize(const IntSize&amp; size)
</ins><span class="cx"> {
</span><span class="cx">     m_size = size;
</span><span class="cx"> }
</span><span class="cx"> 
</span><del>-void MediaPlayerPrivate::setVisible(bool visible)
</del><ins>+void MediaPlayerPrivateGStreamer::setVisible(bool visible)
</ins><span class="cx"> {
</span><span class="cx"> }
</span><span class="cx"> 
</span><del>-void MediaPlayerPrivate::repaint()
</del><ins>+void MediaPlayerPrivateGStreamer::repaint()
</ins><span class="cx"> {
</span><span class="cx">     m_player-&gt;repaint();
</span><span class="cx"> }
</span><span class="cx"> 
</span><del>-void MediaPlayerPrivate::paint(GraphicsContext* context, const IntRect&amp; rect)
</del><ins>+void MediaPlayerPrivateGStreamer::paint(GraphicsContext* context, const IntRect&amp; rect)
</ins><span class="cx"> {
</span><span class="cx">     if (context-&gt;paintingDisabled())
</span><span class="cx">         return;
</span><span class="lines">@@ -1321,12 +1321,12 @@
</span><span class="cx">     return cache;
</span><span class="cx"> }
</span><span class="cx"> 
</span><del>-void MediaPlayerPrivate::getSupportedTypes(HashSet&lt;String&gt;&amp; types)
</del><ins>+void MediaPlayerPrivateGStreamer::getSupportedTypes(HashSet&lt;String&gt;&amp; types)
</ins><span class="cx"> {
</span><span class="cx">     types = mimeTypeCache();
</span><span class="cx"> }
</span><span class="cx"> 
</span><del>-MediaPlayer::SupportsType MediaPlayerPrivate::supportsType(const String&amp; type, const String&amp; codecs)
</del><ins>+MediaPlayer::SupportsType MediaPlayerPrivateGStreamer::supportsType(const String&amp; type, const String&amp; codecs)
</ins><span class="cx"> {
</span><span class="cx">     if (type.isNull() || type.isEmpty())
</span><span class="cx">         return MediaPlayer::IsNotSupported;
</span><span class="lines">@@ -1337,17 +1337,17 @@
</span><span class="cx">     return MediaPlayer::IsNotSupported;
</span><span class="cx"> }
</span><span class="cx"> 
</span><del>-bool MediaPlayerPrivate::hasSingleSecurityOrigin() const
</del><ins>+bool MediaPlayerPrivateGStreamer::hasSingleSecurityOrigin() const
</ins><span class="cx"> {
</span><span class="cx">     return true;
</span><span class="cx"> }
</span><span class="cx"> 
</span><del>-bool MediaPlayerPrivate::supportsFullscreen() const
</del><ins>+bool MediaPlayerPrivateGStreamer::supportsFullscreen() const
</ins><span class="cx"> {
</span><span class="cx">     return true;
</span><span class="cx"> }
</span><span class="cx"> 
</span><del>-void MediaPlayerPrivate::setPreload(MediaPlayer::Preload preload)
</del><ins>+void MediaPlayerPrivateGStreamer::setPreload(MediaPlayer::Preload preload)
</ins><span class="cx"> {
</span><span class="cx">     ASSERT(m_playBin);
</span><span class="cx"> 
</span><span class="lines">@@ -1366,7 +1366,7 @@
</span><span class="cx">     }
</span><span class="cx"> }
</span><span class="cx"> 
</span><del>-void MediaPlayerPrivate::createGSTPlayBin()
</del><ins>+void MediaPlayerPrivateGStreamer::createGSTPlayBin()
</ins><span class="cx"> {
</span><span class="cx">     ASSERT(!m_playBin);
</span><span class="cx">     m_playBin = gst_element_factory_make(&quot;playbin2&quot;, &quot;play&quot;);
</span></span></pre></div>
<a id="trunkWebCoreplatformgraphicsgstreamerMediaPlayerPrivateGStreamerh"></a>
<div class="modfile"><h4>Modified: trunk/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamer.h (56706 => 56707)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamer.h        2010-03-29 04:11:11 UTC (rev 56706)
+++ trunk/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamer.h        2010-03-29 07:29:28 UTC (rev 56707)
</span><span class="lines">@@ -48,14 +48,14 @@
</span><span class="cx"> void mediaPlayerPrivateVolumeChangedCallback(GObject* element, GParamSpec* pspec, gpointer data);
</span><span class="cx"> void mediaPlayerPrivateSourceChangedCallback(GObject* element, GParamSpec* pspec, gpointer data);
</span><span class="cx"> 
</span><del>-class MediaPlayerPrivate : public MediaPlayerPrivateInterface {
</del><ins>+class MediaPlayerPrivateGStreamer : public MediaPlayerPrivateInterface {
</ins><span class="cx">         friend gboolean mediaPlayerPrivateMessageCallback(GstBus* bus, GstMessage* message, gpointer data);
</span><del>-        friend void mediaPlayerPrivateRepaintCallback(WebKitVideoSink*, GstBuffer* buffer, MediaPlayerPrivate* playerPrivate);
</del><ins>+        friend void mediaPlayerPrivateRepaintCallback(WebKitVideoSink*, GstBuffer* buffer, MediaPlayerPrivateGStreamer* playerPrivate);
</ins><span class="cx">         friend void mediaPlayerPrivateSourceChangedCallback(GObject* element, GParamSpec* pspec, gpointer data);
</span><span class="cx"> 
</span><span class="cx">         public:
</span><span class="cx">             static void registerMediaEngine(MediaEngineRegistrar);
</span><del>-            ~MediaPlayerPrivate();
</del><ins>+            ~MediaPlayerPrivateGStreamer();
</ins><span class="cx"> 
</span><span class="cx">             IntSize naturalSize() const;
</span><span class="cx">             bool hasVideo() const;
</span><span class="lines">@@ -81,15 +81,15 @@
</span><span class="cx"> 
</span><span class="cx">             void setVolume(float);
</span><span class="cx">             void volumeChanged();
</span><del>-            void volumeChangedTimerFired(Timer&lt;MediaPlayerPrivate&gt;*);
</del><ins>+            void volumeChangedTimerFired(Timer&lt;MediaPlayerPrivateGStreamer&gt;*);
</ins><span class="cx"> 
</span><span class="cx">             bool supportsMuting() const;
</span><span class="cx">             void setMuted(bool);
</span><span class="cx">             void muteChanged();
</span><del>-            void muteChangedTimerFired(Timer&lt;MediaPlayerPrivate&gt;*);
</del><ins>+            void muteChangedTimerFired(Timer&lt;MediaPlayerPrivateGStreamer&gt;*);
</ins><span class="cx"> 
</span><span class="cx">             void setPreload(MediaPlayer::Preload);
</span><del>-            void fillTimerFired(Timer&lt;MediaPlayerPrivate&gt;*);
</del><ins>+            void fillTimerFired(Timer&lt;MediaPlayerPrivateGStreamer&gt;*);
</ins><span class="cx"> 
</span><span class="cx">             MediaPlayer::NetworkState networkState() const;
</span><span class="cx">             MediaPlayer::ReadyState readyState() const;
</span><span class="lines">@@ -121,7 +121,7 @@
</span><span class="cx">             bool pipelineReset() const { return m_resetPipeline; }
</span><span class="cx"> 
</span><span class="cx">         private:
</span><del>-            MediaPlayerPrivate(MediaPlayer*);
</del><ins>+            MediaPlayerPrivateGStreamer(MediaPlayer*);
</ins><span class="cx">             static MediaPlayerPrivateInterface* create(MediaPlayer* player);
</span><span class="cx"> 
</span><span class="cx">             static void getSupportedTypes(HashSet&lt;String&gt;&amp;);
</span><span class="lines">@@ -130,7 +130,7 @@
</span><span class="cx"> 
</span><span class="cx">             void updateStates();
</span><span class="cx">             void cancelSeek();
</span><del>-            void endPointTimerFired(Timer&lt;MediaPlayerPrivate&gt;*);
</del><ins>+            void endPointTimerFired(Timer&lt;MediaPlayerPrivateGStreamer&gt;*);
</ins><span class="cx">             float maxTimeLoaded() const;
</span><span class="cx">             void startEndPointTimerIfNeeded();
</span><span class="cx"> 
</span><span class="lines">@@ -164,7 +164,7 @@
</span><span class="cx">             bool m_errorOccured;
</span><span class="cx">             gfloat m_mediaDuration;
</span><span class="cx">             bool m_startedBuffering;
</span><del>-            Timer&lt;MediaPlayerPrivate&gt; m_fillTimer;
</del><ins>+            Timer&lt;MediaPlayerPrivateGStreamer&gt; m_fillTimer;
</ins><span class="cx">             float m_maxTimeLoaded;
</span><span class="cx">             int m_bufferingPercentage;
</span><span class="cx">             MediaPlayer::Preload m_preload;
</span></span></pre>
</div>
</div>

</body>
</html>