[SCM] WebKit Debian packaging branch, webkit-1.1, updated. upstream/1.1.15.1-1414-gc69ee75

[eric at webkit.org]

The following commit has been merged in the webkit-1.1 branch:
commit 4440fa83c0d7e854f730b2c2aa27e5565b2f604d
Author: eric at webkit.org <eric at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Fri Oct 16 21:06:15 2009 +0000

    2009-10-16  Andrew Scherkus  <scherkus at chromium.org>
    
            Reviewed by Eric Seidel.
    
            Remove FIXME in RenderMediaControlsChromium as bug was fixed upstream.
    
            https://bugs.webkit.org/show_bug.cgi?id=30422
    
            Covered by existing media layout tests.
    
            * rendering/RenderMediaControlsChromium.cpp:
            (WebCore::paintMediaSlider): Removed round() and FIXME.
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@49697 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 5b30826..ea73661 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -2,6 +2,19 @@
 
         Reviewed by Eric Seidel.
 
+        Remove FIXME in RenderMediaControlsChromium as bug was fixed upstream.
+
+        https://bugs.webkit.org/show_bug.cgi?id=30422
+
+        Covered by existing media layout tests.
+
+        * rendering/RenderMediaControlsChromium.cpp:
+        (WebCore::paintMediaSlider): Removed round() and FIXME.
+
+2009-10-16  Andrew Scherkus  <scherkus at chromium.org>
+
+        Reviewed by Eric Seidel.
+
         Fix Chromium media controls to render a disabled play button when the element is unintialized.
 
         https://bugs.webkit.org/show_bug.cgi?id=30410
diff --git a/WebCore/rendering/RenderMediaControlsChromium.cpp b/WebCore/rendering/RenderMediaControlsChromium.cpp
index 1847aad..c49204c 100644
--- a/WebCore/rendering/RenderMediaControlsChromium.cpp
+++ b/WebCore/rendering/RenderMediaControlsChromium.cpp
@@ -120,10 +120,9 @@ static bool paintMediaSlider(RenderObject* object, const RenderObject::PaintInfo
 
     // Draw the buffered ranges.
     // FIXME: Draw multiple ranges if there are multiple buffered ranges.
-    // FIXME: percentLoaded() doesn't always hit 1.0 so we're using round().
     IntRect bufferedRect = rect;
     bufferedRect.inflate(-style->borderLeftWidth());
-    bufferedRect.setWidth(round((bufferedRect.width() * mediaElement->percentLoaded())));
+    bufferedRect.setWidth((bufferedRect.width() * mediaElement->percentLoaded()));
 
     // Don't bother drawing an empty area.
     if (!bufferedRect.isEmpty()) {

-- 
WebKit Debian packaging