[SCM] WebKit Debian packaging branch, webkit-1.2, updated. upstream/1.1.90-6072-g9a69373

[eric at webkit.org]

The following commit has been merged in the webkit-1.2 branch:
commit ffb83ff8835bc65af3f02b64ea090338cbb66454
Author: eric at webkit.org <eric at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Thu Nov 5 00:50:59 2009 +0000

    2009-11-04  Alpha Lam  <hclam at chromium.org>
    
            Reviewed by Eric Carlson.
    
            Volume slider doesn't have a thumb
            https://bugs.webkit.org/show_bug.cgi?id=31135
    
            Fixed an incorrect if statement that prevents volume slider
            being updated.
    
            The statement checks if the slider value equals to the current
            volume value of the media control to avoid updating the volume
            slider. Updating the volume slider control shouldn't be within
            this condition because we explicitly set them to be equals
            during creation of the controls and also when mouse events are
            received on the volume control.
    
            No new tests because existing code breaks:
            LayoutTests/media/video-volume-slider.html
    
            It should now start passing on Chromium.
    
            * rendering/MediaControlElements.cpp:
            (WebCore::MediaControlVolumeSliderElement::update):
            Update the volume slider regardless of the current volume value
            of the media control.
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@50535 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 6369748..1c0bc57 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,30 @@
+2009-11-04  Alpha Lam  <hclam at chromium.org>
+
+        Reviewed by Eric Carlson.
+
+        Volume slider doesn't have a thumb
+        https://bugs.webkit.org/show_bug.cgi?id=31135
+
+        Fixed an incorrect if statement that prevents volume slider
+        being updated.
+
+        The statement checks if the slider value equals to the current
+        volume value of the media control to avoid updating the volume
+        slider. Updating the volume slider control shouldn't be within
+        this condition because we explicitly set them to be equals
+        during creation of the controls and also when mouse events are
+        received on the volume control.
+
+        No new tests because existing code breaks:
+        LayoutTests/media/video-volume-slider.html
+
+        It should now start passing on Chromium.
+
+        * rendering/MediaControlElements.cpp:
+        (WebCore::MediaControlVolumeSliderElement::update):
+        Update the volume slider regardless of the current volume value
+        of the media control.
+
 2009-11-04  Jenn Braithwaite  <jennb at chromium.org>
 
         Reviewed by David Levin.
diff --git a/WebCore/rendering/MediaControlElements.cpp b/WebCore/rendering/MediaControlElements.cpp
index a57c866..78216fc 100644
--- a/WebCore/rendering/MediaControlElements.cpp
+++ b/WebCore/rendering/MediaControlElements.cpp
@@ -650,10 +650,9 @@ void MediaControlVolumeSliderElement::defaultEventHandler(Event* event)
 void MediaControlVolumeSliderElement::update()
 {
     float volume = m_mediaElement->volume();
-    if (value().toFloat() != volume) {
+    if (value().toFloat() != volume)
         setValue(String::number(volume));
-        MediaControlInputElement::update();
-    }
+    MediaControlInputElement::update();
 }
 
 // ----------------------------

-- 
WebKit Debian packaging