Collapse Should{Enable,Disable}Defer() into ShouldDefer() + simplify some other code.

webkit/media/buffered_resource_loader.h

 // 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.
 
 #ifndef WEBKIT_MEDIA_BUFFERED_RESOURCE_LOADER_H_
 #define WEBKIT_MEDIA_BUFFERED_RESOURCE_LOADER_H_
 
 #include <string>
 
 #include "base/callback.h"
@@ skipping 13 matching lines @@
 }
 
 namespace webkit_media {
 
 const int64 kPositionNotSpecified = -1;
 
 const char kHttpScheme[] = "http";
 const char kHttpsScheme[] = "https";
 const char kDataScheme[] = "data";
 
 // BufferedResourceLoader is single threaded and must be accessed on the

[Ami GONE FROM CHROMIUM, 2012/07/12 00:24:37]

Promote threadedness comment to NotThreadSafe w/ checking in the various public
entry points, or overkill?

[scherkus (not reviewing), 2012/07/12 21:02:17]

IMO overkill at this point in time

 // render thread. It wraps a WebURLLoader and does in-memory buffering,
 // pausing resource loading when the in-memory buffer is full and resuming
 // resource loading when there is available capacity.
 class BufferedResourceLoader : public WebKit::WebURLLoaderClient {
  public:
   // kNeverDefer - Aggresively buffer; never defer loading while paused.
   // kReadThenDefer - Request only enough data to fulfill read requests.
   // kCapacityDefer - Try to keep amount of buffered data at capacity.
   enum DeferStrategy {
     kNeverDefer,
@@ skipping 161 matching lines @@
       int64* last_byte_position, int64* instance_size);
 
  private:
   friend class BufferedDataSourceTest;
   friend class BufferedResourceLoaderTest;
   friend class MockBufferedDataSource;
 
   // Updates the |buffer_|'s forward and backward capacities.
   void UpdateBufferWindow();
 
-  // Returns true if we should defer resource loading based on the current
-  // buffering scheme.
-  bool ShouldEnableDefer() const;
-
-  // Returns true if we should enable resource loading based on the current
-  // buffering scheme.
-  bool ShouldDisableDefer() const;
-
   // Updates deferring behavior based on current buffering scheme.
   void UpdateDeferBehavior();
 
-  // Set defer state to |deferred| and cease/continue downloading data
-  // accordingly.
+  // Sets |active_loader_|'s defer state and fires |loading_cb_| if the state
+  // changed.
   void SetDeferred(bool deferred);
 
+  // Returns true if we should defer resource loading based on the current
+  // buffering scheme.
+  bool ShouldDefer() const;
+
   // Returns true if the current read request can be fulfilled by what is in
   // the buffer.
   bool CanFulfillRead() const;
 
   // Returns true if the current read request will be fulfilled in the future.
   bool WillFulfillRead() const;
 
   // Method that does the actual read and calls the |read_cb_|, assuming the
   // request range is in |buffer_|.
   void ReadInternal();
@@ skipping 89 matching lines @@
   float playback_rate_;
 
   scoped_refptr<media::MediaLog> media_log_;
 
   DISALLOW_COPY_AND_ASSIGN(BufferedResourceLoader);
 };
 
 }  // namespace webkit_media
 
 #endif  // WEBKIT_MEDIA_BUFFERED_RESOURCE_LOADER_H_