<!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>[150035] trunk/Source/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/150035">150035</a></dd>
<dt>Author</dt> <dd>philn@webkit.org</dd>
<dt>Date</dt> <dd>2013-05-13 13:29:52 -0700 (Mon, 13 May 2013)</dd>
</dl>

<h3>Log Message</h3>
<pre>Unreviewed, rolling out <a href="http://trac.webkit.org/projects/webkit/changeset/150014">r150014</a>.
http://trac.webkit.org/changeset/150014
https://bugs.webkit.org/show_bug.cgi?id=86410

Broke video playback on WK2 and some webgl tests

* platform/graphics/gstreamer/MediaPlayerPrivateGStreamerBase.cpp:
(WebCore::MediaPlayerPrivateGStreamerBase::MediaPlayerPrivateGStreamerBase):
(WebCore::MediaPlayerPrivateGStreamerBase::triggerRepaint):
(WebCore::MediaPlayerPrivateGStreamerBase::paint):
* platform/graphics/gstreamer/MediaPlayerPrivateGStreamerBase.h:
(MediaPlayerPrivateGStreamerBase):</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicsgstreamerMediaPlayerPrivateGStreamerBasecpp">trunk/Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamerBase.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicsgstreamerMediaPlayerPrivateGStreamerBaseh">trunk/Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamerBase.h</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (150034 => 150035)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog        2013-05-13 20:07:20 UTC (rev 150034)
+++ trunk/Source/WebCore/ChangeLog        2013-05-13 20:29:52 UTC (rev 150035)
</span><span class="lines">@@ -1,3 +1,18 @@
</span><ins>+2013-05-13  Philippe Normand  &lt;pnormand@igalia.com&gt;
+
+        Unreviewed, rolling out r150014.
+        http://trac.webkit.org/changeset/150014
+        https://bugs.webkit.org/show_bug.cgi?id=86410
+
+        Broke video playback on WK2 and some webgl tests
+
+        * platform/graphics/gstreamer/MediaPlayerPrivateGStreamerBase.cpp:
+        (WebCore::MediaPlayerPrivateGStreamerBase::MediaPlayerPrivateGStreamerBase):
+        (WebCore::MediaPlayerPrivateGStreamerBase::triggerRepaint):
+        (WebCore::MediaPlayerPrivateGStreamerBase::paint):
+        * platform/graphics/gstreamer/MediaPlayerPrivateGStreamerBase.h:
+        (MediaPlayerPrivateGStreamerBase):
+
</ins><span class="cx"> 2013-05-13  Christophe Dumez  &lt;ch.dumez@sisa.samsung.com&gt;
</span><span class="cx"> 
</span><span class="cx">         Unreviewed, rolling out r150022.
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsgstreamerMediaPlayerPrivateGStreamerBasecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamerBase.cpp (150034 => 150035)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamerBase.cpp        2013-05-13 20:07:20 UTC (rev 150034)
+++ trunk/Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamerBase.cpp        2013-05-13 20:29:52 UTC (rev 150035)
</span><span class="lines">@@ -111,9 +111,6 @@
</span><span class="cx">     , m_repaintHandler(0)
</span><span class="cx">     , m_volumeSignalHandler(0)
</span><span class="cx">     , m_muteSignalHandler(0)
</span><del>-#if USE(ACCELERATED_COMPOSITING) &amp;&amp; USE(TEXTURE_MAPPER_GL)
-    , m_texture(0)
-#endif
</del><span class="cx"> {
</span><span class="cx"> }
</span><span class="cx"> 
</span><span class="lines">@@ -300,54 +297,11 @@
</span><span class="cx">     m_muteTimerHandler = g_timeout_add(0, reinterpret_cast&lt;GSourceFunc&gt;(mediaPlayerPrivateMuteChangeTimeoutCallback), this);
</span><span class="cx"> }
</span><span class="cx"> 
</span><del>-
-#if USE(ACCELERATED_COMPOSITING) &amp;&amp; USE(TEXTURE_MAPPER_GL)
-void MediaPlayerPrivateGStreamerBase::updateTexture(GstBuffer* buffer)
-{
-    if (!m_texture)
-        return;
-
-    if (!client())
-        return;
-
-    const void* srcData = 0;
-    IntSize size = naturalSize();
-
-    if (m_texture-&gt;size() != size)
-        m_texture-&gt;reset(size);
-
-#ifdef GST_API_VERSION_1
-    GstMapInfo srcInfo;
-    gst_buffer_map(buffer, &amp;srcInfo, GST_MAP_READ);
-    srcData = srcInfo.data;
-#else
-    srcData = GST_BUFFER_DATA(buffer);
-#endif
-
-    // @TODO: support cropping
-    m_texture-&gt;updateContents(srcData, WebCore::IntRect(WebCore::IntPoint(0, 0), size), WebCore::IntPoint(0, 0), size.width() * 4, BitmapTexture::UpdateCannotModifyOriginalImageData);
-
-#ifdef GST_API_VERSION_1
-    gst_buffer_unmap(buffer, &amp;srcInfo);
-#endif
-
-    client()-&gt;setPlatformLayerNeedsDisplay();
-}
-#endif
-
</del><span class="cx"> void MediaPlayerPrivateGStreamerBase::triggerRepaint(GstBuffer* buffer)
</span><span class="cx"> {
</span><span class="cx">     g_return_if_fail(GST_IS_BUFFER(buffer));
</span><del>-
-#if USE(ACCELERATED_COMPOSITING) &amp;&amp; USE(TEXTURE_MAPPER_GL)
-    if (supportsAcceleratedRendering() &amp;&amp; m_player-&gt;mediaPlayerClient()-&gt;mediaPlayerRenderingCanBeAccelerated(m_player))
-        updateTexture(buffer);
-    else
-#endif
-    {
-        gst_buffer_replace(&amp;m_buffer, buffer);
-        m_player-&gt;repaint();
-    }
</del><ins>+    gst_buffer_replace(&amp;m_buffer, buffer);
+    m_player-&gt;repaint();
</ins><span class="cx"> }
</span><span class="cx"> 
</span><span class="cx"> void MediaPlayerPrivateGStreamerBase::setSize(const IntSize&amp; size)
</span><span class="lines">@@ -357,11 +311,6 @@
</span><span class="cx"> 
</span><span class="cx"> void MediaPlayerPrivateGStreamerBase::paint(GraphicsContext* context, const IntRect&amp; rect)
</span><span class="cx"> {
</span><del>-#if USE(ACCELERATED_COMPOSITING) &amp;&amp; USE(TEXTURE_MAPPER_GL)
-    if (m_texture)
-        return;
-#endif
-
</del><span class="cx">     if (context-&gt;paintingDisabled())
</span><span class="cx">         return;
</span><span class="cx"> 
</span><span class="lines">@@ -383,21 +332,6 @@
</span><span class="cx">         rect, gstImage-&gt;rect(), CompositeCopy, DoNotRespectImageOrientation, false);
</span><span class="cx"> }
</span><span class="cx"> 
</span><del>-#if USE(ACCELERATED_COMPOSITING) &amp;&amp; USE(TEXTURE_MAPPER_GL)
-void MediaPlayerPrivateGStreamerBase::paintToTextureMapper(TextureMapper* textureMapper, const FloatRect&amp; targetRect, const TransformationMatrix&amp; matrix, float opacity)
-{
-    if (textureMapper-&gt;accelerationMode() != TextureMapper::OpenGLMode)
-        return;
-
-    if (!m_texture) {
-        m_texture = textureMapper-&gt;acquireTextureFromPool(naturalSize());
-        return;
-    }
-
-    textureMapper-&gt;drawTexture(*m_texture.get(), targetRect, matrix, opacity);
-}
-#endif
-
</del><span class="cx"> #if USE(NATIVE_FULLSCREEN_VIDEO)
</span><span class="cx"> void MediaPlayerPrivateGStreamerBase::enterFullscreen()
</span><span class="cx"> {
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsgstreamerMediaPlayerPrivateGStreamerBaseh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamerBase.h (150034 => 150035)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamerBase.h        2013-05-13 20:07:20 UTC (rev 150034)
+++ trunk/Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamerBase.h        2013-05-13 20:29:52 UTC (rev 150035)
</span><span class="lines">@@ -29,10 +29,6 @@
</span><span class="cx"> 
</span><span class="cx"> #include &lt;wtf/Forward.h&gt;
</span><span class="cx"> 
</span><del>-#if USE(ACCELERATED_COMPOSITING) &amp;&amp; USE(TEXTURE_MAPPER_GL)
-#include &quot;TextureMapperPlatformLayer.h&quot;
-#endif
-
</del><span class="cx"> typedef struct _GstBuffer GstBuffer;
</span><span class="cx"> typedef struct _GstElement GstElement;
</span><span class="cx"> typedef struct _GstMessage GstMessage;
</span><span class="lines">@@ -47,11 +43,7 @@
</span><span class="cx"> class IntRect;
</span><span class="cx"> class GStreamerGWorld;
</span><span class="cx"> 
</span><del>-class MediaPlayerPrivateGStreamerBase : public MediaPlayerPrivateInterface
-#if USE(ACCELERATED_COMPOSITING) &amp;&amp; USE(TEXTURE_MAPPER_GL)
-    , public TextureMapperPlatformLayer
-#endif
-{
</del><ins>+class MediaPlayerPrivateGStreamerBase : public MediaPlayerPrivateInterface {
</ins><span class="cx"> 
</span><span class="cx"> public:
</span><span class="cx">     ~MediaPlayerPrivateGStreamerBase();
</span><span class="lines">@@ -101,12 +93,6 @@
</span><span class="cx">     unsigned audioDecodedByteCount() const;
</span><span class="cx">     unsigned videoDecodedByteCount() const;
</span><span class="cx"> 
</span><del>-#if USE(ACCELERATED_COMPOSITING) &amp;&amp; USE(TEXTURE_MAPPER_GL)
-    virtual PlatformLayer* platformLayer() const { return const_cast&lt;MediaPlayerPrivateGStreamerBase*&gt;(this); }
-    virtual bool supportsAcceleratedRendering() const { return true; }
-    virtual void paintToTextureMapper(TextureMapper*, const FloatRect&amp;, const TransformationMatrix&amp;, float);
-#endif
-
</del><span class="cx"> protected:
</span><span class="cx">     MediaPlayerPrivateGStreamerBase(MediaPlayer*);
</span><span class="cx">     GstElement* createVideoSink(GstElement* pipeline);
</span><span class="lines">@@ -133,10 +119,6 @@
</span><span class="cx">     unsigned long m_muteSignalHandler;
</span><span class="cx">     GRefPtr&lt;GstPad&gt; m_videoSinkPad;
</span><span class="cx">     mutable IntSize m_videoSize;
</span><del>-#if USE(ACCELERATED_COMPOSITING) &amp;&amp; USE(TEXTURE_MAPPER_GL)
-    void updateTexture(GstBuffer*);
-    RefPtr&lt;BitmapTexture&gt; m_texture;
-#endif
</del><span class="cx"> };
</span><span class="cx"> }
</span><span class="cx"> 
</span></span></pre>
</div>
</div>

</body>
</html>