bcarrella/cef
1
0
Fork 0
mirror of https://bitbucket.org/chromiumembedded/cef synced 2025-06-05 21:39:12 +02:00
Code Issues Packages Projects Releases Wiki Activity

Update to Chromium revision 80310.

Browse Source 
git-svn-id: https://chromiumembedded.googlecode.com/svn/trunk@213 5089003a-bbd8-11dd-ad1f-f1f9622dbc98
This commit is contained in:
Marshall Greenblatt
2011-04-05 16:17:33 +00:00
parent 029fbc8865
commit 71a6f6548b
43 changed files with 456 additions and 291 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
libcef/browser_resource_loader_bridge.cc
View File

@@ -46,12 +46,12 @@
#include "base/file_path.h"
#include "base/file_util.h"
#include "base/memory/ref_counted.h"
#include "base/message_loop.h"
#include "base/message_loop_proxy.h"
#if defined(OS_MACOSX) || defined(OS_WIN)
#include "base/nss_util.h"
#endif
#include "base/ref_counted.h"
#include "base/synchronization/waitable_event.h"
#include "base/time.h"
#include "base/timer.h"
@@ -70,13 +70,13 @@
#include "net/http/http_request_headers.h"
#include "net/http/http_response_headers.h"
#include "net/proxy/proxy_service.h"
#if defined(OS_WIN)
#include "net/socket/ssl_client_socket_nss_factory.h"
#endif
#include "net/url_request/url_request.h"
#include "webkit/appcache/appcache_interfaces.h"
#include "webkit/blob/blob_storage_controller.h"
#include "webkit/blob/deletable_file_reference.h"
#include "webkit/fileapi/file_system_context.h"
#include "webkit/fileapi/file_system_dir_url_request_job.h"
#include "webkit/fileapi/file_system_url_request_job.h"
#include "webkit/glue/resource_loader_bridge.h"
using net::HttpResponseHeaders;
@@ -190,7 +190,6 @@ class RequestProxy : public net::URLRequest::Delegate,
}
void NotifyReceivedResponse(const ResourceResponseInfo& info,
bool content_filtered,
const GURL& url, bool allow_download) {
if (browser_.get() && info.headers.get()) {
@@ -215,7 +214,7 @@ class RequestProxy : public net::URLRequest::Delegate,
}
if (peer_)
peer_->OnReceivedResponse(info, content_filtered);
peer_->OnReceivedResponse(info);
}
void NotifyReceivedData(int bytes_read) {
@@ -376,7 +375,7 @@ class RequestProxy : public net::URLRequest::Delegate,
info.content_length = static_cast<int64>(offset);
if(!mimeType.empty())
info.mime_type = mimeType;
OnReceivedResponse(info, false);
OnReceivedResponse(info);
AsyncReadData();
}
@@ -511,8 +510,7 @@ class RequestProxy : public net::URLRequest::Delegate,
}
virtual void OnReceivedResponse(
const ResourceResponseInfo& info,
bool content_filtered) {
const ResourceResponseInfo& info) {
GURL url;
bool allow_download(false);
if (request_.get()){
@@ -524,8 +522,8 @@ class RequestProxy : public net::URLRequest::Delegate,
}
owner_loop_->PostTask(FROM_HERE, NewRunnableMethod(
this, &RequestProxy::NotifyReceivedResponse, info, content_filtered,
url, allow_download));
this, &RequestProxy::NotifyReceivedResponse, info, url,
allow_download));
}
virtual void OnReceivedData(int bytes_read) {
@@ -567,7 +565,7 @@ class RequestProxy : public net::URLRequest::Delegate,
if (request->status().is_success()) {
ResourceResponseInfo info;
PopulateResponseInfo(request, &info);
OnReceivedResponse(info, false);
OnReceivedResponse(info);
AsyncReadData(); // start reading
} else {
Done();
@@ -745,9 +743,7 @@ class SyncRequestProxy : public RequestProxy {
result_->url = new_url;
}
virtual void OnReceivedResponse(
const ResourceResponseInfo& info,
bool content_filtered) {
virtual void OnReceivedResponse(const ResourceResponseInfo& info) {
*static_cast<ResourceResponseInfo*>(result_) = info;
}