Upstream version 5.34.104.0

[platform/framework/web/crosswalk.git] / src / chrome / renderer / security_filter_peer.cc

diff --git a/src/chrome/renderer/security_filter_peer.cc b/src/chrome/renderer/security_filter_peer.cc
index 9799ca0..370fb66 100644 (file)
--- a/src/chrome/renderer/security_filter_peer.cc
+++ b/src/chrome/renderer/security_filter_peer.cc
@@ -93,8 +93,10 @@ void SecurityFilterPeer::OnReceivedData(const char* data,
 void SecurityFilterPeer::OnCompletedRequest(
     int error_code,
     bool was_ignored_by_handler,
+    bool stale_copy_in_cache,
     const std::string& security_info,
-    const base::TimeTicks& completion_time) {
+    const base::TimeTicks& completion_time,
+    int64 total_transfer_size) {
   NOTREACHED();
 }
 
@@ -154,8 +156,10 @@ void BufferedPeer::OnReceivedData(const char* data,
 
 void BufferedPeer::OnCompletedRequest(int error_code,
                                       bool was_ignored_by_handler,
+                                      bool stale_copy_in_cache,
                                       const std::string& security_info,
-                                      const base::TimeTicks& completion_time) {
+                                      const base::TimeTicks& completion_time,
+                                      int64 total_transfer_size) {
   // Make sure we delete ourselves at the end of this call.
   scoped_ptr<BufferedPeer> this_deleter(this);
 
@@ -163,8 +167,10 @@ void BufferedPeer::OnCompletedRequest(int error_code,
   if (error_code != net::OK || !DataReady()) {
     // Pretend we failed to load the resource.
     original_peer_->OnReceivedResponse(response_info_);
-    original_peer_->OnCompletedRequest(net::ERR_ABORTED, false, security_info,
-                                       completion_time);
+    original_peer_->OnCompletedRequest(net::ERR_ABORTED, false,
+                                       stale_copy_in_cache,
+                                       security_info, completion_time,
+                                       total_transfer_size);
     return;
   }
 
@@ -174,7 +180,8 @@ void BufferedPeer::OnCompletedRequest(int error_code,
                                    static_cast<int>(data_.size()),
                                    -1);
   original_peer_->OnCompletedRequest(error_code, was_ignored_by_handler,
-                                     security_info, completion_time);
+                                     stale_copy_in_cache, security_info,
+                                     completion_time, total_transfer_size);
 }
 
 ////////////////////////////////////////////////////////////////////////////////
@@ -207,8 +214,10 @@ void ReplaceContentPeer::OnReceivedData(const char* data,
 void ReplaceContentPeer::OnCompletedRequest(
     int error_code,
     bool was_ignored_by_handler,
+    bool stale_copy_in_cache,
     const std::string& security_info,
-    const base::TimeTicks& completion_time) {
+    const base::TimeTicks& completion_time,
+    int64 total_transfer_size) {
   webkit_glue::ResourceResponseInfo info;
   ProcessResponseInfo(info, &info, mime_type_);
   info.security_info = security_info;
@@ -220,8 +229,10 @@ void ReplaceContentPeer::OnCompletedRequest(
                                    -1);
   original_peer_->OnCompletedRequest(net::OK,
                                      false,
+                                     stale_copy_in_cache,
                                      security_info,
-                                     completion_time);
+                                     completion_time,
+                                     total_transfer_size);
 
   // The request processing is complete, we must delete ourselves.
   delete this;