bcarrella/cef
1
0
Fork 0
mirror of https://bitbucket.org/chromiumembedded/cef synced 2025-02-18 13:10:42 +01:00
Code Issues Packages Projects Releases Wiki Activity

Return timing information for custom requests to avoid crash in WebKit (issue #1259).

Browse Source 
git-svn-id: https://chromiumembedded.googlecode.com/svn/trunk@1763 5089003a-bbd8-11dd-ad1f-f1f9622dbc98
This commit is contained in:
Marshall Greenblatt 2014-07-10 17:37:40 +00:00
parent 8313963a27
commit 49fa439594
2 changed files with 18 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
libcef/browser/resource_request_job.cc
View File

@ -164,6 +164,7 @@ CefResourceRequestJob::~CefResourceRequestJob() {
void CefResourceRequestJob::Start() { void CefResourceRequestJob::Start() {
CEF_REQUIRE_IOT(); CEF_REQUIRE_IOT();
request_start_time_ = base::Time::Now();
cef_request_ = CefRequest::Create(); cef_request_ = CefRequest::Create();
// Populate the request data. // Populate the request data.
@ -285,6 +286,16 @@ void CefResourceRequestJob::GetResponseInfo(net::HttpResponseInfo* info) {
info->headers = GetResponseHeaders(); info->headers = GetResponseHeaders();
} }
void CefResourceRequestJob::GetLoadTimingInfo(
net::LoadTimingInfo* load_timing_info) const {
// If haven't made it far enough to receive any headers, don't return
// anything. This makes for more consistent behavior in the case of errors.
if (!response_ || receive_headers_end_.is_null())
return;
load_timing_info->request_start_time = request_start_time_;
load_timing_info->receive_headers_end = receive_headers_end_;
}
bool CefResourceRequestJob::GetResponseCookies( bool CefResourceRequestJob::GetResponseCookies(
std::vector<std::string>* cookies) { std::vector<std::string>* cookies) {
CEF_REQUIRE_IOT(); CEF_REQUIRE_IOT();
@ -349,6 +360,7 @@ void CefResourceRequestJob::SendHeaders() {
// Get header information from the handler. // Get header information from the handler.
handler_->GetResponseHeaders(response_, remaining_bytes_, redirectUrl); handler_->GetResponseHeaders(response_, remaining_bytes_, redirectUrl);
receive_headers_end_ = base::TimeTicks::Now();
if (!redirectUrl.empty()) { if (!redirectUrl.empty()) {
std::string redirectUrlStr = redirectUrl; std::string redirectUrlStr = redirectUrl;
redirect_url_ = GURL(redirectUrlStr); redirect_url_ = GURL(redirectUrlStr);

6
libcef/browser/resource_request_job.h
View File

@ -36,6 +36,8 @@ class CefResourceRequestJob : public net::URLRequestJob {
virtual bool ReadRawData(net::IOBuffer* dest, int dest_size, int* bytes_read) virtual bool ReadRawData(net::IOBuffer* dest, int dest_size, int* bytes_read)
OVERRIDE; OVERRIDE;
virtual void GetResponseInfo(net::HttpResponseInfo* info) OVERRIDE; virtual void GetResponseInfo(net::HttpResponseInfo* info) OVERRIDE;
virtual void GetLoadTimingInfo(
net::LoadTimingInfo* load_timing_info) const OVERRIDE;
virtual bool GetResponseCookies(std::vector<std::string>* cookies) OVERRIDE; virtual bool GetResponseCookies(std::vector<std::string>* cookies) OVERRIDE;
virtual bool IsRedirectResponse(GURL* location, int* http_status_code) virtual bool IsRedirectResponse(GURL* location, int* http_status_code)
OVERRIDE; OVERRIDE;
@ -69,6 +71,10 @@ class CefResourceRequestJob : public net::URLRequestJob {
scoped_refptr<net::HttpResponseHeaders> response_headers_; scoped_refptr<net::HttpResponseHeaders> response_headers_;
std::vector<std::string> response_cookies_; std::vector<std::string> response_cookies_;
size_t response_cookies_save_index_; size_t response_cookies_save_index_;
base::Time request_start_time_;
base::TimeTicks receive_headers_end_;
// Must be the last member.
base::WeakPtrFactory<CefResourceRequestJob> weak_factory_; base::WeakPtrFactory<CefResourceRequestJob> weak_factory_;
friend class CefResourceRequestJobCallback; friend class CefResourceRequestJobCallback;