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 85305.

Browse Source 
- Use the angle library for GL support (issue #136).
- Add a workaround for the SyncRequestProxy deadlock problem (issue #192).

git-svn-id: https://chromiumembedded.googlecode.com/svn/trunk@233 5089003a-bbd8-11dd-ad1f-f1f9622dbc98
This commit is contained in:
Marshall Greenblatt
2011-05-16 16:56:12 +00:00
parent 2c0f941830
commit abfc77abd1
30 changed files with 256 additions and 173 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
libcef/browser_resource_loader_bridge.cc
View File

@ -50,9 +50,6 @@
#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/synchronization/waitable_event.h"
#include "base/time.h"
#include "base/timer.h"
@ -80,6 +77,10 @@
#include "webkit/fileapi/file_system_url_request_job.h"
#include "webkit/glue/resource_loader_bridge.h"
#if defined(OS_MACOSX) || defined(OS_WIN)
#include "crypto/nss_util.h"
#endif
using net::HttpResponseHeaders;
using net::StaticCookiePolicy;
using net::URLRequestStatus;
@ -243,7 +244,7 @@ class RequestProxy : public net::URLRequest::Delegate,
this, &RequestProxy::AsyncCancel));
}
peer_->OnReceivedData(buf_copy.get(), bytes_read);
peer_->OnReceivedData(buf_copy.get(), bytes_read, -1);
}
void NotifyDownloadedData(int bytes_read) {
@ -622,6 +623,32 @@ class RequestProxy : public net::URLRequest::Delegate,
request->ContinueDespiteLastError();
}
virtual bool CanGetCookies(net::URLRequest* request) {
StaticCookiePolicy::Type policy_type =
_Context->request_context()->AcceptAllCookies() ?
StaticCookiePolicy::ALLOW_ALL_COOKIES :
StaticCookiePolicy::BLOCK_SETTING_THIRD_PARTY_COOKIES;
StaticCookiePolicy policy(policy_type);
int rv = policy.CanGetCookies(
request->url(), request->first_party_for_cookies());
return rv == net::OK;
}
virtual bool CanSetCookie(net::URLRequest* request,
const std::string& cookie_line,
net::CookieOptions* options) {
StaticCookiePolicy::Type policy_type =
_Context->request_context()->AcceptAllCookies() ?
StaticCookiePolicy::ALLOW_ALL_COOKIES :
StaticCookiePolicy::BLOCK_SETTING_THIRD_PARTY_COOKIES;
StaticCookiePolicy policy(policy_type);
int rv = policy.CanSetCookie(
request->url(), request->first_party_for_cookies(), cookie_line);
return rv == net::OK;
}
virtual void OnReadCompleted(net::URLRequest* request, int bytes_read) {
if (request->status().is_success() && bytes_read > 0) {
OnReceivedData(bytes_read);