| Index: content/browser/renderer_host/resource_loader.h
|
| ===================================================================
|
| --- content/browser/renderer_host/resource_loader.h (revision 144275)
|
| +++ content/browser/renderer_host/resource_loader.h (working copy)
|
| @@ -4,6 +4,7 @@
|
|
|
| #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"
|
| @@ -78,21 +79,20 @@
|
|
|
| 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
|
| };
|
| @@ -109,13 +109,6 @@
|
| 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.
|
|
|