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

- Add support for returning an HTTP status code from HandleBeforeResourceLoad and custom scheme handlers via the CefResponse class (issue #202).

Browse Source 
- Add unit tests for custom scheme handlers (issue #221).
- Fix reversed enable/disable of stop and reload buttons in cefclient.

git-svn-id: https://chromiumembedded.googlecode.com/svn/trunk@222 5089003a-bbd8-11dd-ad1f-f1f9622dbc98
This commit is contained in:
Marshall Greenblatt
2011-04-21 16:46:16 +00:00
parent f9c9c9318c
commit f18083e5df
25 changed files with 654 additions and 69 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
libcef/scheme_impl.cc
View File

@ -10,6 +10,7 @@
#include "net/base/completion_callback.h"
#include "net/base/io_buffer.h"
#include "net/base/upload_data.h"
#include "net/http/http_response_headers.h"
#include "net/http/http_util.h"
#include "net/url_request/url_request.h"
#include "net/url_request/url_request_filter.h"
@ -19,6 +20,7 @@
#include "tracker.h"
#include "cef_context.h"
#include "request_impl.h"
#include "response_impl.h"
#include <map>
@ -61,6 +63,7 @@ public:
handler_->Cancel();
// Continue asynchronously.
DCHECK(!async_resolver_);
response_ = new CefResponseImpl();
async_resolver_ = new AsyncResolver(this);
CefThread::PostTask(CefThread::IO, FROM_HERE, NewRunnableMethod(
async_resolver_.get(), &AsyncResolver::Resolve, url_));
@ -116,6 +119,14 @@ public:
}
}
virtual void GetResponseInfo(net::HttpResponseInfo* info) {
CefResponseImpl* responseImpl =
static_cast<CefResponseImpl*>(response_.get());
scoped_refptr<net::HttpResponseHeaders> headers(
new net::HttpResponseHeaders(responseImpl->GenerateResponseLine()));
info->headers = headers;
}
virtual bool IsRedirectResponse(GURL* location, int* http_status_code)
{
return false;
@ -125,7 +136,7 @@ public:
{
DCHECK(request_);
// call handler to get mime type
*mime_type = mime_type_;
*mime_type = response_->GetMimeType();
return true;
}
@ -134,7 +145,7 @@ public:
}
CefRefPtr<CefSchemeHandler> handler_;
std::string mime_type_;
CefRefPtr<CefResponse> response_;
int response_length_;
protected:
@ -178,15 +189,13 @@ private:
static_cast<CefRequestImpl*>(req.get())->Set(owner_->request());
owner_->handler_->Cancel();
CefString mime_type;
int response_length = 0;
// handler should complete content generation in ProcessRequest
bool res = owner_->handler_->ProcessRequest(req, mime_type,
bool res = owner_->handler_->ProcessRequest(req, owner_->response_,
&response_length);
if (res) {
owner_->mime_type_ = mime_type;
if (res)
owner_->response_length_ = response_length;
}
//////////////////////////////////////////////////////////////////////////
if (owner_loop_) {
owner_loop_->PostTask(FROM_HERE, NewRunnableMethod(