[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-9427-gc2be6fc

commit-queue at webkit.org commit-queue at webkit.org
Wed Dec 22 11:29:55 UTC 2010


The following commit has been merged in the debian/experimental branch:
commit 0eeef8b175deac1b8c357bf5ce88d6e68fd5c3c9
Author: commit-queue at webkit.org <commit-queue at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Tue Jul 27 15:06:15 2010 +0000

    2010-07-27  Pranav Kedia  <pranavk at chromium.org>
    
            Reviewed by Adam Barth.
    
            Chrome browser Bug: Pause button stays when <audio> hits end
            https://bugs.webkit.org/show_bug.cgi?id=42677
    
            The change is just in chromium media. Tested using media part of
            WebKit layout tests. The following test that was failing is passing.
            media/video-duration-known-after-eos.html -> unexpected pass
    
            * rendering/RenderMediaControlsChromium.cpp:
            (WebCore::paintMediaPlayButton):
            Using mediaElement->canPlay() instead of mediaElement->paused() to
            paint the play/pause button.
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@64128 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 1304201..150d0e3 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,19 @@
+2010-07-27  Pranav Kedia  <pranavk at chromium.org>
+
+        Reviewed by Adam Barth.
+
+        Chrome browser Bug: Pause button stays when <audio> hits end
+        https://bugs.webkit.org/show_bug.cgi?id=42677
+
+        The change is just in chromium media. Tested using media part of
+        WebKit layout tests. The following test that was failing is passing.
+        media/video-duration-known-after-eos.html -> unexpected pass
+
+        * rendering/RenderMediaControlsChromium.cpp:
+        (WebCore::paintMediaPlayButton):
+        Using mediaElement->canPlay() instead of mediaElement->paused() to
+        paint the play/pause button.
+
 2010-07-27  Steve Block  <steveblock at google.com>
 
         Reviewed by Jeremy Orlow.
diff --git a/WebCore/rendering/RenderMediaControlsChromium.cpp b/WebCore/rendering/RenderMediaControlsChromium.cpp
index 98fdc7b..ab650da 100644
--- a/WebCore/rendering/RenderMediaControlsChromium.cpp
+++ b/WebCore/rendering/RenderMediaControlsChromium.cpp
@@ -96,7 +96,7 @@ static bool paintMediaPlayButton(RenderObject* object, const PaintInfo& paintInf
     if (!hasSource(mediaElement))
         return paintMediaButton(paintInfo.context, rect, mediaPlayDisabled);
 
-    return paintMediaButton(paintInfo.context, rect, mediaElement->paused() ? mediaPlay : mediaPause);
+    return paintMediaButton(paintInfo.context, rect, mediaElement->canPlay() ? mediaPlay : mediaPause);
 }
 
 static Image* getMediaSliderThumb()

-- 
WebKit Debian packaging



More information about the Pkg-webkit-commits mailing list