Rewrite guts of ResourceLoader and BufferedResourceHandler to suck less.

content/browser/renderer_host/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 CONTENT_BROWSER_RENDERER_HOST_RESOURCE_LOADER_H_
 #define CONTENT_BROWSER_RENDERER_HOST_RESOURCE_LOADER_H_
+#pragma once
 
 #include "base/memory/scoped_ptr.h"
 #include "base/memory/weak_ptr.h"
 #include "content/browser/renderer_host/resource_handler.h"
 #include "content/browser/ssl/ssl_error_handler.h"
 #include "content/public/browser/resource_controller.h"
 #include "net/url_request/url_request.h"
 
 class SSLClientAuthHandler;
 
@@ skipping 54 matching lines @@
                                 int error,
                                 const net::SSLInfo* ssl_info) OVERRIDE;
   virtual void ContinueSSLRequest(const GlobalRequestID& id) OVERRIDE;
 
   // ResourceController implementation:
   virtual void Resume() OVERRIDE;
   virtual void Cancel() OVERRIDE;
 
   void StartRequestInternal();
   void CancelRequestInternal(int error, bool from_renderer);
-  bool CompleteResponseStarted();
-  void StartReading();
-  bool ReadMore(int* bytes_read);
-  bool CompleteRead(int* bytes_read);
+  void CompleteResponseStarted();
+  void StartReading(bool is_continuation);
+  void ResumeReading();
+  void ReadMore(int* bytes_read);
+  void CompleteRead(int bytes_read);
   void ResponseCompleted();
-  bool PauseRequestIfNeeded();
-  void PauseRequest(bool pause);
-  void ResumeRequest();
   void CallDidFinishLoading();
 
+  bool is_deferred() const { return deferred_stage_ != DEFERRED_NONE; }
+
   enum DeferredStage {
     DEFERRED_NONE,
     DEFERRED_START,
     DEFERRED_REDIRECT,
-    DEFERRED_RESPONSE,
     DEFERRED_READ,
     DEFERRED_FINISH
   };
   DeferredStage deferred_stage_;
 
   scoped_ptr<net::URLRequest> request_;
   scoped_ptr<ResourceHandler> handler_;
   ResourceLoaderDelegate* delegate_;
 
   scoped_refptr<ResourceDispatcherHostLoginDelegate> login_delegate_;
   scoped_refptr<SSLClientAuthHandler> ssl_client_auth_handler_;
 
   uint64 last_upload_position_;
   bool waiting_for_upload_progress_ack_;
   base::TimeTicks last_upload_ticks_;
 
-  bool called_on_response_started_;
-  bool has_started_reading_;
-
-  bool is_paused_;
-  int pause_count_;
-  int paused_read_bytes_;
-
   // Indicates that we are in a state of being transferred to a new downstream
   // consumer.  We are waiting for a notification to complete the transfer, at
   // which point we'll receive a new ResourceHandler.
   bool is_transferring_;
 
   DISALLOW_COPY_AND_ASSIGN(ResourceLoader);
 };
 
 }  // namespace content
 
 #endif  // CONTENT_BROWSER_RENDERER_HOST_RESOURCE_LOADER_H_