[SCM] WebKit Debian packaging branch, webkit-1.1, updated. upstream/1.1.22-985-g3c00f00

[kov at webkit.org]

The following commit has been merged in the webkit-1.1 branch:
commit 217114aea76bdc5dff6e53650cca2860023f5268
Author: kov at webkit.org <kov at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Tue Mar 16 14:35:53 2010 +0000

    2010-03-16  Gustavo Noronha Silva  <gustavo.noronha at collabora.co.uk>
    
            Revert r56006 as it caused functional issues. We will work on a
            testcase, and rework the fix, and land when we have this a bit
            more testable.
    
            * platform/gtk/RenderThemeGtk.cpp:
            (WebCore::RenderThemeGtk::paintMediaPlayButton):
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@56061 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 4976ee1..0469e1b 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,12 @@
+2010-03-16  Gustavo Noronha Silva  <gustavo.noronha at collabora.co.uk>
+
+        Revert r56006 as it caused functional issues. We will work on a
+        testcase, and rework the fix, and land when we have this a bit
+        more testable.
+
+        * platform/gtk/RenderThemeGtk.cpp:
+        (WebCore::RenderThemeGtk::paintMediaPlayButton):
+
 2010-03-16  Pavel Feldman  <pfeldman at chromium.org>
 
         Reviewed by Timothy Hatcher.
@@ -603,19 +612,6 @@
         (WebCore::MediaPlayerPrivate::pipeline): public accessor for the
         playbin element.
 
-2010-03-15  Philippe Normand  <pnormand at igalia.com>
-
-        Reviewed by  Gustavo Noronha Silva.
-
-        [GTK] video playback position query flood when mouse over the video element
-        https://bugs.webkit.org/show_bug.cgi?id=35333
-
-        Don't trigger a position query only to know which play/pause
-        button to display.
-
-        * platform/gtk/RenderThemeGtk.cpp:
-        (WebCore::RenderThemeGtk::paintMediaPlayButton):
-
 2010-03-15  Jian Li  <jianli at chromium.org>
 
         Reviewed by Nate Chapin.
diff --git a/WebCore/platform/gtk/RenderThemeGtk.cpp b/WebCore/platform/gtk/RenderThemeGtk.cpp
index 0e3e299..e19e2fa 100644
--- a/WebCore/platform/gtk/RenderThemeGtk.cpp
+++ b/WebCore/platform/gtk/RenderThemeGtk.cpp
@@ -673,7 +673,7 @@ bool RenderThemeGtk::paintMediaPlayButton(RenderObject* o, const RenderObject::P
     if (!mediaElement)
         return false;
 
-    return paintMediaButton(paintInfo.context, r, mediaElement->paused() ? m_playButton.get() : m_pauseButton.get(), m_panelColor, m_mediaIconSize);
+    return paintMediaButton(paintInfo.context, r, mediaElement->canPlay() ? m_playButton.get() : m_pauseButton.get(), m_panelColor, m_mediaIconSize);
 }
 
 bool RenderThemeGtk::paintMediaSeekBackButton(RenderObject* o, const RenderObject::PaintInfo& paintInfo, const IntRect& r)

-- 
WebKit Debian packaging