Changeset 118577 in webkit

Timestamp:

May 25, 2012, 3:30:56 PM (14 years ago)

Author:

fischman@chromium.org

Message:

[chromium] Default media controls should render only the currentTime-containing buffered range
​https://bugs.webkit.org/show_bug.cgi?id=85925

Reviewed by Eric Carlson.

Test: http/tests/media/video-buffered-range-contains-currentTime.html

• rendering/RenderMediaControlsChromium.cpp:

(WebCore::paintMediaSlider):

Location:

trunk

Files:

• LayoutTests/http/tests/media/video-buffered-range-contains-currentTime-expected.txt (added)
• LayoutTests/http/tests/media/video-buffered-range-contains-currentTime.html (added)
• LayoutTests/platform/chromium-linux/http/tests/media/video-buffered-range-contains-currentTime-expected.png (added)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/rendering/RenderMediaControlsChromium.cpp (modified) (2 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2012-05-25  Ami Fischman  <fischman@chromium.org>
+
+        [chromium] Default media controls should render only the currentTime-containing buffered range
+        https://bugs.webkit.org/show_bug.cgi?id=85925
+
+        Reviewed by Eric Carlson.
+
+        Test: http/tests/media/video-buffered-range-contains-currentTime.html
+
+        * rendering/RenderMediaControlsChromium.cpp:
+        (WebCore::paintMediaSlider):
+
 2012-05-25  Simon Fraser  <simon.fraser@apple.com>
 

trunk/Source/WebCore/rendering/RenderMediaControlsChromium.cpp

@@ -128 +128 @@
     context->restore();
 
-    // Draw the buffered ranges.
-    // FIXME: Draw multiple ranges if there are multiple buffered ranges. http://webkit.org/b/85925
+    // Draw the buffered range. Since the element may have multiple buffered ranges and it'd be
+    // distracting/'busy' to show all of them, show only the buffered range containing the current play head.
     IntRect bufferedRect = rect;
     bufferedRect.inflate(-style->borderLeftWidth());
 
-    double bufferedWidth = 0.0;
     RefPtr<TimeRanges> bufferedTimeRanges = mediaElement->buffered();
-    if (bufferedTimeRanges->length() > 0) {
-        // Account for the width of the slider thumb.
-        Image* mediaSliderThumb = getMediaSliderThumb();
-        double thumbWidth = mediaSliderThumb->width() / 2.0 + 1.0;
-        double rectWidth = bufferedRect.width() - thumbWidth;
-        if (rectWidth < 0.0)
-            rectWidth = 0.0;
-        // Preserve old behavior pending resolution of UI design of multiple ranges (see FIXME above).
-        // http://webkit.org/b/85926
-        double fakePercentLoaded = 0;
-        float duration = mediaElement->duration();
-        if (duration && !isinf(duration))
-            fakePercentLoaded = bufferedTimeRanges->end(bufferedTimeRanges->length() - 1, ASSERT_NO_EXCEPTION) / duration;
-        bufferedWidth = rectWidth * fakePercentLoaded + thumbWidth;
-    }
-    bufferedRect.setWidth(bufferedWidth);
-
-    // Don't bother drawing an empty area.
-    if (!bufferedRect.isEmpty()) {
+    float duration = mediaElement->duration();
+    float currentTime = mediaElement->currentTime();
+    if (isnan(duration) || isinf(duration) || !duration || isnan(currentTime))
+        return true;
+
+    for (unsigned i = 0; i < bufferedTimeRanges->length(); ++i) {
+        float start = bufferedTimeRanges->start(i, ASSERT_NO_EXCEPTION);
+        float end = bufferedTimeRanges->end(i, ASSERT_NO_EXCEPTION);
+        if (isnan(start) || isnan(end) || start > currentTime || end < currentTime)
+            continue;
+        float startFraction = start / duration;
+        float endFraction = end / duration;
+        float widthFraction = endFraction - startFraction;
+        bufferedRect.move(startFraction * bufferedRect.width(), 0);
+        bufferedRect.setWidth(widthFraction * bufferedRect.width());
+
+        // Don't bother drawing an empty area.
+        if (bufferedRect.isEmpty())
+            return true;
+
         IntPoint sliderTopLeft = bufferedRect.location();
-        IntPoint sliderTopRight = sliderTopLeft;
-        sliderTopRight.move(0, bufferedRect.height());
-
-        RefPtr<Gradient> gradient = Gradient::create(sliderTopLeft, sliderTopRight);
+        IntPoint sliderBottomLeft = sliderTopLeft;
+        sliderBottomLeft.move(0, bufferedRect.height());
+
+        RefPtr<Gradient> gradient = Gradient::create(sliderTopLeft, sliderBottomLeft);
         Color startColor = object->style()->visitedDependentColor(CSSPropertyColor);
         gradient->addColorStop(0.0, startColor);
@@ -168 +168 @@
         context->fillRect(bufferedRect);
         context->restore();
+        return true;
     }