Changeset 116539 in webkit

Timestamp:

May 9, 2012 10:02:50 AM (12 years ago)

Author:

fischman@chromium.org

Message:

[chromium] Support multiple buffered time ranges
​https://bugs.webkit.org/show_bug.cgi?id=85926

Reviewed by Eric Carlson.

Preserve existing rendering of a single rect even in the presence of multiple buffered regions.

No new tests as this change has no functional effects.

• rendering/RenderMediaControlsChromium.cpp:

(WebCore::paintMediaSlider):

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• rendering/RenderMediaControlsChromium.cpp (modified) (3 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2012-05-09  Ami Fischman  <fischman@chromium.org>
+
+        [chromium] Support multiple buffered time ranges
+        https://bugs.webkit.org/show_bug.cgi?id=85926
+
+        Reviewed by Eric Carlson.
+
+        Preserve existing rendering of a single rect even in the presence of multiple buffered regions.
+
+        No new tests as this change has no functional effects.
+
+        * rendering/RenderMediaControlsChromium.cpp:
+        (WebCore::paintMediaSlider):
+
 2012-05-09  Dana Jansens  <danakj@chromium.org>
 

trunk/Source/WebCore/rendering/RenderMediaControlsChromium.cpp

@@ -34 +34 @@
 #include "HTMLNames.h"
 #include "PaintInfo.h"
+#include "TimeRanges.h"
 
 namespace WebCore {
@@ -128 +129 @@
 
     // Draw the buffered ranges.
-    // FIXME: Draw multiple ranges if there are multiple buffered ranges.
+    // FIXME: Draw multiple ranges if there are multiple buffered ranges. http://webkit.org/b/85925
     IntRect bufferedRect = rect;
     bufferedRect.inflate(-style->borderLeftWidth());
 
     double bufferedWidth = 0.0;
-    if (mediaElement->percentLoaded() > 0.0) {
+    RefPtr<TimeRanges> bufferedTimeRanges = mediaElement->buffered();
+    if (bufferedTimeRanges->length() > 0) {
         // Account for the width of the slider thumb.
         Image* mediaSliderThumb = getMediaSliderThumb();
@@ -140 +142 @@
         if (rectWidth < 0.0)
             rectWidth = 0.0;
-        bufferedWidth = rectWidth * mediaElement->percentLoaded() + thumbWidth;
+        // 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);