Adding security info to canceled requests

webkit/glue/resource_handle_impl.cc

 // Copyright (c) 2006-2008 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.
 //
 // This file replaces WebCore/platform/network/win/ResourceHandleWin.cpp with a
 // platform-neutral implementation that simply defers almost entirely to
 // ResouceLoaderBridge.
 //
 // This uses the same ResourceHandle.h header file that the rest of WebKit
 // uses, allowing us to avoid complicated changes. Our specific things are
@@ skipping 208 matching lines @@
 
   // Used to suspend/resume an asynchronous load.
   void SetDefersLoading(bool value);
 
   // ResourceLoaderBridge::Peer implementation
   virtual void OnReceivedRedirect(const GURL& new_url);
   virtual void OnReceivedResponse(
       const ResourceLoaderBridge::ResponseInfo& info,
       bool content_filtered);
   virtual void OnReceivedData(const char* data, int len);
-  virtual void OnCompletedRequest(const URLRequestStatus& status);
+  virtual void OnCompletedRequest(const URLRequestStatus& status,
+                                  const std::string& security_info);
   virtual std::string GetURLForDebugging();
 
   // Handles a data: url internally instead of calling the bridge.
   void HandleDataUrl();
 
   // This is the bridge implemented by the embedder.
   // The bridge is kept alive as long as the request is valid and we
   // are ready for callbacks.
   scoped_ptr<ResourceLoaderBridge> bridge_;
 
@@ skipping 51 matching lines @@
   std::string data;
 
   if (GetInfoFromDataUrl(webkit_glue::KURLToGURL(request_.url()), &info, &data,
                          &status)) {
     OnReceivedResponse(info, false);
 
     if (data.size())
       OnReceivedData(data.c_str(), data.size());
   }
 
-  OnCompletedRequest(status);
+  OnCompletedRequest(status, info.security_info);
 
   // We are done using the object. ResourceHandle and ResourceHandleInternal
   // might be destroyed now.
   job_->deref();
 }
 
 bool ResourceHandleInternal::Start(
     ResourceLoaderBridge::SyncLoadResponse* sync_load_response) {
   DCHECK(!bridge_.get());
 
@@ skipping 284 matching lines @@
       client_->didReceiveData(job_, data, data_len, lengthReceived);
     } else {
       // AddData will make the appropriate calls to client_->didReceiveData
       // and client_->didReceiveResponse
       multipart_delegate_->OnReceivedData(data, data_len);
     }
   }
 }
 
 void ResourceHandleInternal::OnCompletedRequest(
-    const URLRequestStatus& status) {
+    const URLRequestStatus& status,
+    const std::string& security_info) {

[darin (slow to review), 2009/03/04 19:29:01]

i don't see us doing anything with this security_info parameter here, which
leads me to wonder why we need this parameter at all.

[jcampan, 2009/03/04 22:33:43]

It's now part of the peer interface.
the security filter peers (which for example display the blocked frame message)
use it.

   if (multipart_delegate_.get()) {
     multipart_delegate_->OnCompletedRequest();
     multipart_delegate_.reset(NULL);
   }
 
   pending_ = false;
 
   if (client_) {
     if (status.status() != URLRequestStatus::SUCCESS) {
         int error_code;
@@ skipping 147 matching lines @@
   // if the request cannot be serviced from cache.  We force the 'DontLoad'
   // cache policy at this point to ensure that we never hit the network for
   // this request.
   //
   DCHECK(request.httpMethod() == "POST");
   request.setCachePolicy(ReturnCacheDataDontLoad);
   return true;
 }
 
 }  // namespace WebCore