bcarrella
/
cef
mirror of https://bitbucket.org/chromiumembedded/cef
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Pass the |redirectUrl| parameter to GetResponseHeaders() instead of ProcessRequest() (issue #414). 

git-svn-id: https://chromiumembedded.googlecode.com/svn/trunk@362 5089003a-bbd8-11dd-ad1f-f1f9622dbc98
This commit is contained in:
Marshall Greenblatt 2011-11-07 22:23:51 +00:00
parent ae5371dd09
commit 8e45560a02
9 changed files with 42 additions and 46 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
include/cef.h
View File

@ -2679,13 +2679,10 @@ public:
// Begin processing the request. To handle the request return true and call
// HeadersAvailable() once the response header information is available
// (HeadersAvailable() can also be called from inside this method if header
// information is available immediately). To redirect the request to a new
// URL set |redirectUrl| to the new URL and return true. To cancel the request
// return false.
// information is available immediately). To cancel the request return false.
///
/*--cef()--*/
virtual bool ProcessRequest(CefRefPtr<CefRequest> request,
CefString& redirectUrl,
CefRefPtr<CefSchemeHandlerCallback> callback) =0;
///
@ -2695,11 +2692,13 @@ public:
// to a positive value and ReadResponse() will be called until it returns
// false or the specified number of bytes have been read. Use the |response|
// object to set the mime type, http status code and other optional header
// values.
// values. To redirect the request to a new URL set |redirectUrl| to the new
// URL.
///
/*--cef()--*/
virtual void GetResponseHeaders(CefRefPtr<CefResponse> response,
int64& response_length) =0;
int64& response_length,
CefString& redirectUrl) =0;
///
// Read response data. If data is available immediately copy up to

13
include/cef_capi.h
View File

@ -2462,12 +2462,11 @@ typedef struct _cef_scheme_handler_t
// Begin processing the request. To handle the request return true (1) and
// call headers_available() once the response header information is available
// (headers_available() can also be called from inside this function if header
// information is available immediately). To redirect the request to a new URL
// set |redirectUrl| to the new URL and return true (1). To cancel the request
// return false (0).
// information is available immediately). To cancel the request return false
// (0).
///
int (CEF_CALLBACK *process_request)(struct _cef_scheme_handler_t* self,
struct _cef_request_t* request, cef_string_t* redirectUrl,
struct _cef_request_t* request,
struct _cef_scheme_handler_callback_t* callback);
///
@ -2477,10 +2476,12 @@ typedef struct _cef_scheme_handler_t
// a positive value and read_response() will be called until it returns false
// (0) or the specified number of bytes have been read. Use the |response|
// object to set the mime type, http status code and other optional header
// values.
// values. To redirect the request to a new URL set |redirectUrl| to the new
// URL.
///
void (CEF_CALLBACK *get_response_headers)(struct _cef_scheme_handler_t* self,
struct _cef_response_t* response, int64* response_length);
struct _cef_response_t* response, int64* response_length,
cef_string_t* redirectUrl);
///
// Read response data. If data is available immediately copy up to

4
libcef/browser_devtools_scheme_handler.cc
View File

@ -30,7 +30,6 @@ public:
}
virtual bool ProcessRequest(CefRefPtr<CefRequest> request,
CefString& redirectUrl,
CefRefPtr<CefSchemeHandlerCallback> callback)
OVERRIDE
{
@ -39,7 +38,8 @@ public:
}
virtual void GetResponseHeaders(CefRefPtr<CefResponse> response,
int64& response_length) OVERRIDE
int64& response_length,
CefString& redirectUrl) OVERRIDE
{
response_length = size_;

16
libcef/scheme_impl.cc
View File

@ -126,21 +126,15 @@ public:
callback_ = new Callback(this);
CefRefPtr<CefRequest> req(CefRequest::CreateRequest());
CefString redirectUrl;
// Populate the request data.
static_cast<CefRequestImpl*>(req.get())->Set(request());
// Handler can decide whether to process the request.
bool rv = handler_->ProcessRequest(req, redirectUrl, callback_.get());
bool rv = handler_->ProcessRequest(req, callback_.get());
if (!rv) {
// Cancel the request.
NotifyStartError(URLRequestStatus(URLRequestStatus::FAILED, ERR_ABORTED));
} else if (!redirectUrl.empty()) {
// Treat the request as a redirect.
std::string redirectUrlStr = redirectUrl;
redirect_url_ = GURL(redirectUrlStr);
NotifyHeadersComplete();
}
return;
@ -253,8 +247,14 @@ private:
response_ = new CefResponseImpl();
remaining_bytes_ = 0;
CefString redirectUrl;
// Get header information from the handler.
handler_->GetResponseHeaders(response_, remaining_bytes_);
handler_->GetResponseHeaders(response_, remaining_bytes_, redirectUrl);
if (!redirectUrl.empty()) {
std::string redirectUrlStr = redirectUrl;
redirect_url_ = GURL(redirectUrlStr);
}
if (remaining_bytes_ > 0)
set_expected_content_size(remaining_bytes_);

16
libcef_dll/cpptoc/scheme_handler_cpptoc.cc
View File

@ -20,32 +20,32 @@
int CEF_CALLBACK scheme_handler_process_request(
struct _cef_scheme_handler_t* self, cef_request_t* request,
cef_string_t* redirectUrl, cef_scheme_handler_callback_t* callback)
cef_scheme_handler_callback_t* callback)
{
DCHECK(self);
DCHECK(request);
DCHECK(redirectUrl);
if(!self || !request || !redirectUrl)
if(!self || !request)
return 0;
CefString redirectUrlStr(redirectUrl);
return CefSchemeHandlerCppToC::Get(self)->ProcessRequest(
CefRequestCToCpp::Wrap(request), redirectUrlStr,
CefRequestCToCpp::Wrap(request),
CefSchemeHandlerCallbackCToCpp::Wrap(callback));
}
void CEF_CALLBACK scheme_handler_get_response_headers(
struct _cef_scheme_handler_t* self, cef_response_t* response,
int64* response_length)
int64* response_length, cef_string_t* redirectUrl)
{
DCHECK(self);
DCHECK(response);
DCHECK(response_length);
if (!self || !response || !response_length)
DCHECK(redirectUrl);
if (!self || !response || !response_length || !redirectUrl)
return;
CefString redirectUrlStr(redirectUrl);
CefSchemeHandlerCppToC::Get(self)->GetResponseHeaders(
CefResponseCToCpp::Wrap(response), *response_length);
CefResponseCToCpp::Wrap(response), *response_length, redirectUrlStr);
}
int CEF_CALLBACK scheme_handler_read_response(

7
libcef_dll/ctocpp/scheme_handler_ctocpp.cc
View File

@ -19,24 +19,23 @@
// VIRTUAL METHODS - Body may be edited by hand.
bool CefSchemeHandlerCToCpp::ProcessRequest(CefRefPtr<CefRequest> request,
CefString& redirectUrl, CefRefPtr<CefSchemeHandlerCallback> callback)
CefRefPtr<CefSchemeHandlerCallback> callback)
{
if(CEF_MEMBER_MISSING(struct_, process_request))
return false;
return struct_->process_request(struct_, CefRequestCppToC::Wrap(request),
redirectUrl.GetWritableStruct(),
CefSchemeHandlerCallbackCppToC::Wrap(callback)) ? true : false;
}
void CefSchemeHandlerCToCpp::GetResponseHeaders(CefRefPtr<CefResponse> response,
int64& response_length)
int64& response_length, CefString& redirectUrl)
{
if (CEF_MEMBER_MISSING(struct_, get_response_headers))
return;
struct_->get_response_headers(struct_, CefResponseCppToC::Wrap(response),
&response_length);
&response_length, redirectUrl.GetWritableStruct());
}
bool CefSchemeHandlerCToCpp::ReadResponse(void* data_out, int bytes_to_read,

3
libcef_dll/ctocpp/scheme_handler_ctocpp.h
View File

@ -34,10 +34,9 @@ public:
// CefSchemeHandler methods
virtual bool ProcessRequest(CefRefPtr<CefRequest> request,
CefString& redirectUrl,
CefRefPtr<CefSchemeHandlerCallback> callback) OVERRIDE;
virtual void GetResponseHeaders(CefRefPtr<CefResponse> response,
int64& response_length) OVERRIDE;
int64& response_length, CefString& redirectUrl) OVERRIDE;
virtual bool ReadResponse(void* data_out, int bytes_to_read, int& bytes_read,
CefRefPtr<CefSchemeHandlerCallback> callback) OVERRIDE;
virtual void Cancel() OVERRIDE;

4
tests/cefclient/scheme_test.cpp
View File

@ -20,7 +20,6 @@ public:
ClientSchemeHandler() : offset_(0) {}
virtual bool ProcessRequest(CefRefPtr<CefRequest> request,
CefString& redirectUrl,
CefRefPtr<CefSchemeHandlerCallback> callback)
OVERRIDE
{
@ -88,7 +87,8 @@ public:
}
virtual void GetResponseHeaders(CefRefPtr<CefResponse> response,
int64& response_length) OVERRIDE
int64& response_length,
CefString& redirectUrl) OVERRIDE
{
REQUIRE_IO_THREAD();

12
tests/unittests/scheme_handler_unittest.cc
View File

@ -170,7 +170,6 @@ public:
: test_results_(tr), offset_(0), is_sub_(false), has_delayed_(false) {}
virtual bool ProcessRequest(CefRefPtr<CefRequest> request,
CefString& redirectUrl,
CefRefPtr<CefSchemeHandlerCallback> callback)
OVERRIDE
{
@ -192,13 +191,9 @@ public:
test_results_->got_request.yes();
if (!test_results_->redirect_url.empty()) {
redirectUrl = test_results_->redirect_url;
return true; // don't call Continue() for URL redirects.
} else if (!test_results_->html.empty()) {
if (!test_results_->html.empty())
handled = true;
}
}
if (handled) {
if (test_results_->delay > 0) {
@ -219,7 +214,8 @@ public:
}
virtual void GetResponseHeaders(CefRefPtr<CefResponse> response,
int64& response_length) OVERRIDE
int64& response_length,
CefString& redirectUrl) OVERRIDE
{
if (is_sub_) {
response->SetStatus(test_results_->sub_status_code);
@ -237,6 +233,8 @@ public:
response->SetMimeType("text/html");
response_length = test_results_->sub_html.size();
}
} else if (!test_results_->redirect_url.empty()) {
redirectUrl = test_results_->redirect_url;
} else {
response->SetStatus(test_results_->status_code);