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

[philn at webkit.org]

The following commit has been merged in the webkit-1.1 branch:
commit 20eda3fb030ab26f8a71e2779b4ff873a73f7eaa
Author: philn at webkit.org <philn at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Mon Mar 15 20:00:53 2010 +0000

    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):
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@56006 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 1656dc8..a1b0ec8 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,16 @@
+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 e19e2fa..0e3e299 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->canPlay() ? m_playButton.get() : m_pauseButton.get(), m_panelColor, m_mediaIconSize);
+    return paintMediaButton(paintInfo.context, r, mediaElement->paused() ? 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