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

libcef: Update due to underlying chromium changes.

Browse Source 
- Add the appcache project dependency and related changes.
- SSL code structure changes in browser_request_context.cc.

git-svn-id: https://chromiumembedded.googlecode.com/svn/trunk@41 5089003a-bbd8-11dd-ad1f-f1f9622dbc98
This commit is contained in:
Marshall Greenblatt
2009-08-25 16:35:18 +00:00
parent d7c54d6514
commit d8b1d13a74
9 changed files with 503 additions and 94 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
libcef/browser_resource_loader_bridge.cc
View File

@@ -54,8 +54,8 @@
#include "net/proxy/proxy_service.h"
#include "net/url_request/url_request.h"
#include "webkit/api/public/WebFrame.h"
#include "webkit/appcache/appcache_interfaces.h"
#include "webkit/glue/resource_loader_bridge.h"
#include "webkit/glue/webappcachecontext.h"
#include "webkit/glue/webview.h"
using webkit_glue::ResourceLoaderBridge;
@@ -109,7 +109,7 @@ struct RequestParams {
GURL referrer;
std::string headers;
int load_flags;
int app_cache_context_id;
int appcache_host_id;
scoped_refptr<net::UploadData> upload;
};
@@ -475,7 +475,8 @@ class RequestProxy : public URLRequest::Delegate,
info->request_time = request->request_time();
info->response_time = request->response_time();
info->headers = request->response_headers();
info->app_cache_id = WebAppCacheContext::kNoAppCacheId;
info->appcache_id = appcache::kNoCacheId;
// TODO(michaeln): info->appcache_manifest_url = GURL();
request->GetMimeType(&info->mime_type);
request->GetCharset(&info->charset);
info->content_length = request->GetExpectedContentSize();
@@ -572,7 +573,7 @@ class ResourceLoaderBridgeImpl : public ResourceLoaderBridge {
const GURL& referrer,
const std::string& headers,
int load_flags,
int app_cache_context_id)
int appcache_host_id)
: browser_(browser),
params_(new RequestParams),
proxy_(NULL) {
@@ -582,7 +583,7 @@ class ResourceLoaderBridgeImpl : public ResourceLoaderBridge {
params_->referrer = referrer;
params_->headers = headers;
params_->load_flags = load_flags;
params_->app_cache_context_id = app_cache_context_id;
params_->appcache_host_id = appcache_host_id;
}
virtual ~ResourceLoaderBridgeImpl() {
@@ -718,13 +719,13 @@ ResourceLoaderBridge* ResourceLoaderBridge::Create(
int load_flags,
int requestor_pid,
ResourceType::Type request_type,
int app_cache_context_id,
int appcache_host_id,
int routing_id) {
CefRefPtr<CefBrowser> browser = _Context->GetBrowserByID(routing_id);
return new ResourceLoaderBridgeImpl(browser, method, url,
first_party_for_cookies,
referrer, headers, load_flags,
app_cache_context_id);
appcache_host_id);
}
// Issue the proxy resolve request on the io thread, and wait