#ifndef CHROME_RENDERER_SECURITY_FILTER_PEER_H_
#define CHROME_RENDERER_SECURITY_FILTER_PEER_H_
-#include "webkit/child/resource_loader_bridge.h"
+#include "content/public/child/request_peer.h"
+#include "webkit/common/resource_response_info.h"
+#include "webkit/common/resource_type.h"
// The SecurityFilterPeer is a proxy to a
-// webkit_glue::ResourceLoaderBridge::Peer instance. It is used to pre-process
+// content::RequestPeer instance. It is used to pre-process
// unsafe resources (such as mixed-content resource).
// Call the factory method CreateSecurityFilterPeer() to obtain an instance of
// SecurityFilterPeer based on the original Peer.
// NOTE: subclasses should insure they delete themselves at the end of the
// OnReceiveComplete call.
-class SecurityFilterPeer : public webkit_glue::ResourceLoaderBridge::Peer {
+class SecurityFilterPeer : public content::RequestPeer {
public:
virtual ~SecurityFilterPeer();
static SecurityFilterPeer* CreateSecurityFilterPeerForDeniedRequest(
ResourceType::Type resource_type,
- webkit_glue::ResourceLoaderBridge::Peer* peer,
+ content::RequestPeer* peer,
int os_error);
static SecurityFilterPeer* CreateSecurityFilterPeerForFrame(
- webkit_glue::ResourceLoaderBridge::Peer* peer,
+ content::RequestPeer* peer,
int os_error);
- // ResourceLoaderBridge::Peer methods.
+ // content::RequestPeer methods.
virtual void OnUploadProgress(uint64 position, uint64 size) OVERRIDE;
- virtual bool OnReceivedRedirect(
- const GURL& new_url,
- const webkit_glue::ResourceResponseInfo& info,
- bool* has_new_first_party_for_cookies,
- GURL* new_first_party_for_cookies) OVERRIDE;
+ virtual bool OnReceivedRedirect(const GURL& new_url,
+ const webkit_glue::ResourceResponseInfo& info,
+ bool* has_new_first_party_for_cookies,
+ GURL* new_first_party_for_cookies) OVERRIDE;
virtual void OnReceivedResponse(
const webkit_glue::ResourceResponseInfo& info) OVERRIDE;
virtual void OnDownloadedData(int len, int encoded_data_length) OVERRIDE {}
virtual void OnReceivedData(const char* data,
int data_length,
int encoded_data_length) OVERRIDE;
- virtual void OnCompletedRequest(
- int error_code,
- bool was_ignored_by_handler,
- const std::string& security_info,
- const base::TimeTicks& completion_time) OVERRIDE;
+ virtual void OnCompletedRequest(int error_code,
+ bool was_ignored_by_handler,
+ bool stale_copy_in_cache,
+ const std::string& security_info,
+ const base::TimeTicks& completion_time,
+ int64 total_transfer_size) OVERRIDE;
protected:
- SecurityFilterPeer(webkit_glue::ResourceLoaderBridge* resource_loader_bridge,
- webkit_glue::ResourceLoaderBridge::Peer* peer);
+ explicit SecurityFilterPeer(content::RequestPeer* peer);
- webkit_glue::ResourceLoaderBridge::Peer* original_peer_;
- webkit_glue::ResourceLoaderBridge* resource_loader_bridge_;
+ content::RequestPeer* original_peer_;
private:
DISALLOW_COPY_AND_ASSIGN(SecurityFilterPeer);
// Subclasses should implement DataReady() to process the data as necessary.
class BufferedPeer : public SecurityFilterPeer {
public:
- BufferedPeer(webkit_glue::ResourceLoaderBridge* resource_loader_bridge,
- webkit_glue::ResourceLoaderBridge::Peer* peer,
- const std::string& mime_type);
+ BufferedPeer(content::RequestPeer* peer, const std::string& mime_type);
virtual ~BufferedPeer();
- // ResourceLoaderBridge::Peer Implementation.
+ // content::RequestPeer Implementation.
virtual void OnReceivedResponse(
const webkit_glue::ResourceResponseInfo& info) OVERRIDE;
virtual void OnReceivedData(const char* data,
virtual void OnCompletedRequest(
int error_code,
bool was_ignored_by_handler,
+ bool stale_copy_in_cache,
const std::string& security_info,
- const base::TimeTicks& completion_time) OVERRIDE;
+ const base::TimeTicks& completion_time,
+ int64 total_transfer_size) OVERRIDE;
protected:
// Invoked when the entire request has been processed before the data is sent
// The ReplaceContentPeer cancels the request and serves the provided data as
// content instead.
-// TODO(jcampan): we do not as of now cancel the request, as we do not have
-// access to the resource_loader_bridge in the SecurityFilterPeer factory
-// method. For now the resource is still being fetched, but ignored, as once
-// we have provided the replacement content, the associated pending request
+// TODO(jcampan): For now the resource is still being fetched, but ignored, as
+// once we have provided the replacement content, the associated pending request
// in ResourceDispatcher is removed and further OnReceived* notifications are
// ignored.
class ReplaceContentPeer : public SecurityFilterPeer {
public:
- ReplaceContentPeer(webkit_glue::ResourceLoaderBridge* resource_loader_bridge,
- webkit_glue::ResourceLoaderBridge::Peer* peer,
+ ReplaceContentPeer(content::RequestPeer* peer,
const std::string& mime_type,
const std::string& data);
virtual ~ReplaceContentPeer();
- // ResourceLoaderBridge::Peer Implementation.
+ // content::RequestPeer Implementation.
virtual void OnReceivedResponse(
const webkit_glue::ResourceResponseInfo& info) OVERRIDE;
virtual void OnReceivedData(const char* data,
virtual void OnCompletedRequest(
int error_code,
bool was_ignored_by_handler,
+ bool stale_copy_in_cache,
const std::string& security_info,
- const base::TimeTicks& completion_time) OVERRIDE;
+ const base::TimeTicks& completion_time,
+ int64 total_transfer_size) OVERRIDE;
private:
webkit_glue::ResourceResponseInfo response_info_;