HACK on m21 branch 1180 to avoid flickering of buffered bar by lying.

webkit/media/webmediaplayer_impl.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "webkit/media/webmediaplayer_impl.h"
 
 #include <limits>
 #include <string>
 #include <vector>
 
@@ skipping 455 matching lines @@
 
 WebMediaPlayer::ReadyState WebMediaPlayerImpl::readyState() const {
   DCHECK_EQ(main_loop_, MessageLoop::current());
   return ready_state_;
 }
 
 const WebKit::WebTimeRanges& WebMediaPlayerImpl::buffered() {
   DCHECK_EQ(main_loop_, MessageLoop::current());
   media::Ranges<base::TimeDelta> buffered_time_ranges =
       pipeline_->GetBufferedTimeRanges();
-  WebKit::WebTimeRanges web_ranges(buffered_time_ranges.size());
-  for (size_t i = 0; i < buffered_time_ranges.size(); ++i) {
-    web_ranges[i].start = buffered_time_ranges.start(i).InSecondsF();
-    web_ranges[i].end = buffered_time_ranges.end(i).InSecondsF();
-  }
+
+  // HACK http://crrev.com/143765 was deemed to large to merge to m21, so *only
+  // on the 1180 branch* we fake out buffered() to return
+  // [0,min(duration, max(currentTime+0.5, buffered.end(lastRange)))).
+  if (buffered_time_ranges.size() == 0)
+    return buffered_;
+  float fake_end = std::min(duration(), std::max(
+      currentTime() + 0.5f, static_cast<float>(buffered_time_ranges.end(
+          buffered_time_ranges.size() - 1).InSecondsF())));
+  WebKit::WebTimeRanges web_ranges(static_cast<size_t>(1));

[scherkus (not reviewing), 2012/06/27 17:52:18]

1u doesn't work!? :~(

[Ami GONE FROM CHROMIUM, 2012/06/27 18:15:19]

Nope.  The template foo in WebVector tries to treat "1" as a class type and
confuses the compiler.  Haven't dug into why.

+  web_ranges[0].start = 0;
+  web_ranges[0].end = fake_end;
   buffered_.swap(web_ranges);
   return buffered_;
 }
 
 float WebMediaPlayerImpl::maxTimeSeekable() const {
   DCHECK_EQ(main_loop_, MessageLoop::current());
 
   // We don't support seeking in streaming media.
   if (proxy_ && proxy_->data_source() && proxy_->data_source()->IsStreaming())
     return 0.0f;
@@ skipping 530 matching lines @@
   return audio_source_provider_;
 }
 
 void WebMediaPlayerImpl::IncrementExternallyAllocatedMemory() {
   DCHECK_EQ(main_loop_, MessageLoop::current());
   incremented_externally_allocated_memory_ = true;
   v8::V8::AdjustAmountOfExternalAllocatedMemory(kPlayerExtraMemory);
 }
 
 }  // namespace webkit_media