Merge 83942 - Partial revert of 82061 so we keep the initial unbounded range request.

webkit/glue/media/buffered_resource_loader.cc

 // Copyright (c) 2011 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/glue/media/buffered_resource_loader.h"
 
 #include "base/format_macros.h"
 #include "base/string_util.h"
 #include "net/base/net_errors.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebKit.h"
@@ skipping 85 matching lines @@
   }
 
   // Increment the reference count right before we start the request. This
   // reference will be release when this request has ended.
   AddRef();
 
   // Prepare the request.
   WebURLRequest request(url_);
   request.setTargetType(WebURLRequest::TargetIsMedia);
 
-  if (!IsWholeFileRange()) {
+  if (IsRangeRequest()) {
     range_requested_ = true;
     request.setHTTPHeaderField(WebString::fromUTF8("Range"),
                                WebString::fromUTF8(GenerateHeaders(
                                    first_byte_position_,
                                    last_byte_position_)));
   }
   frame->setReferrerForRequest(request, WebKit::WebURL());
 
   // This flag is for unittests as we don't want to reset |url_loader|
   if (!keep_test_loader_)
@@ skipping 171 matching lines @@
 
     // Check to see whether the server supports byte ranges.
     std::string accept_ranges =
         response.httpHeaderField("Accept-Ranges").utf8();
     range_supported_ = (accept_ranges.find("bytes") != std::string::npos);
 
     partial_response = (response.httpStatusCode() == kHttpPartialContent);
 
     if (range_requested_) {
       // If we have verified the partial response and it is correct, we will
-      // return net::OK.
-      if (!partial_response || !VerifyPartialResponse(response))
+      // return net::OK. It's also possible for a server to support range
+      // requests without advertising Accept-Ranges: bytes.
+      if (partial_response && VerifyPartialResponse(response))
+        range_supported_ = true;
+      else
         error = net::ERR_INVALID_RESPONSE;
     } else if (response.httpStatusCode() != kHttpOK) {
       // We didn't request a range but server didn't reply with "200 OK".
       error = net::ERR_FAILED;
     }
 
     if (error != net::OK) {
       DoneStart(error);
       Stop();
       return;
@@ skipping 326 matching lines @@
 void BufferedResourceLoader::DoneStart(int error) {
   start_callback_->RunWithParams(Tuple1<int>(error));
   start_callback_.reset();
 }
 
 void BufferedResourceLoader::NotifyNetworkEvent() {
   if (event_callback_.get())
     event_callback_->Run();
 }
 
-bool BufferedResourceLoader::IsWholeFileRange() const {
-  return ((first_byte_position_ == kPositionNotSpecified ||
-           first_byte_position_ == 0) &&
-          last_byte_position_ == kPositionNotSpecified);
+bool BufferedResourceLoader::IsRangeRequest() const {
+  return first_byte_position_ != kPositionNotSpecified;
 }
 
 }  // namespace webkit_glue