mirror of
https://bitbucket.org/chromiumembedded/cef
synced 2025-01-16 11:51:47 +01:00
122397acfc
Changes to the CEF public API: - Add base::Bind, base::Callback, base::Lock, base::WeakPtr, scoped_refptr, scoped_ptr and supporting types. - Add include/wrapper/cef_closure_task.h helpers for converting a base::Closure to a CefTask. - Change CefRefPtr to extend scoped_refptr. -- Change CefBase method signatures to match RefCountedThreadSafeBase. - Change IMPLEMENT_REFCOUNTING to use base::AtomicRefCount*. -- Remove the CefAtomic* functions. -- IMPLEMENT_REFCOUNTING now enforces via a compile-time error that the correct class name was passed to the macro. - Change IMPLEMENT_LOCKING to use base::Lock. -- Remove the CefCriticalSection class. -- Deprecate the IMPLEMENT_LOCKING macro. -- base::Lock will DCHECK() in Debug builds if lock usage is reentrant. - Move include/internal/cef_tuple.h to include/base/cef_tuple.h. - Allow an empty |callback| parameter passed to CefBeginTracing. Changes to the CEF implementation: - Fix incorrect names passed to the IMPLEMENT_REFCOUNTING macro. - Fix instances of reentrant locking in the CefXmlObject and CefRequest implementations. - Remove use of the IMPLEMENT_LOCKING macro. Changes to cef_unittests: - Add tests/unittests/chromium_includes.h and always include it first from unit test .cc files to avoid name conflicts with Chromium types. - Fix wrong header include ordering. - Remove use of the IMPLEMENT_LOCKING macro. Changes to cefclient and cefsimple: - Use base::Bind and cef_closure_task.h instead of NewCefRunnable*. - Remove use of the IMPEMENT_LOCKING macro. - Fix incorrect/unnecessary locking. - Add additional runtime thread checks. - Windows: Perform actions on the UI thread instead of the main thread when running in multi-threaded-message-loop mode to avoid excessive locking. git-svn-id: https://chromiumembedded.googlecode.com/svn/trunk@1769 5089003a-bbd8-11dd-ad1f-f1f9622dbc98
164 lines
4.8 KiB
C++
164 lines
4.8 KiB
C++
// Copyright (c) 2012 The Chromium Embedded Framework Authors. All rights
|
|
// reserved. Use of this source code is governed by a BSD-style license that
|
|
// can be found in the LICENSE file.
|
|
|
|
#include "cefclient/scheme_test.h"
|
|
|
|
#include <algorithm>
|
|
#include <string>
|
|
|
|
#include "include/cef_browser.h"
|
|
#include "include/cef_callback.h"
|
|
#include "include/cef_frame.h"
|
|
#include "include/cef_resource_handler.h"
|
|
#include "include/cef_response.h"
|
|
#include "include/cef_request.h"
|
|
#include "include/cef_scheme.h"
|
|
#include "include/wrapper/cef_helpers.h"
|
|
#include "cefclient/resource_util.h"
|
|
#include "cefclient/string_util.h"
|
|
|
|
#if defined(OS_WIN)
|
|
#include "cefclient/resource.h"
|
|
#endif
|
|
|
|
namespace scheme_test {
|
|
|
|
namespace {
|
|
|
|
// Implementation of the schema handler for client:// requests.
|
|
class ClientSchemeHandler : public CefResourceHandler {
|
|
public:
|
|
ClientSchemeHandler() : offset_(0) {}
|
|
|
|
virtual bool ProcessRequest(CefRefPtr<CefRequest> request,
|
|
CefRefPtr<CefCallback> callback)
|
|
OVERRIDE {
|
|
CEF_REQUIRE_IO_THREAD();
|
|
|
|
bool handled = false;
|
|
|
|
std::string url = request->GetURL();
|
|
if (strstr(url.c_str(), "handler.html") != NULL) {
|
|
// Build the response html
|
|
data_ = "<html><head><title>Client Scheme Handler</title></head>"
|
|
"<body bgcolor=\"white\">"
|
|
"This contents of this page page are served by the "
|
|
"ClientSchemeHandler class handling the client:// protocol."
|
|
"<br/>You should see an image:"
|
|
"<br/><img src=\"client://tests/logo.png\"><pre>";
|
|
|
|
// Output a string representation of the request
|
|
std::string dump;
|
|
DumpRequestContents(request, dump);
|
|
data_.append(dump);
|
|
|
|
data_.append("</pre><br/>Try the test form:"
|
|
"<form method=\"POST\" action=\"handler.html\">"
|
|
"<input type=\"text\" name=\"field1\">"
|
|
"<input type=\"text\" name=\"field2\">"
|
|
"<input type=\"submit\">"
|
|
"</form></body></html>");
|
|
|
|
handled = true;
|
|
|
|
// Set the resulting mime type
|
|
mime_type_ = "text/html";
|
|
} else if (strstr(url.c_str(), "logo.png") != NULL) {
|
|
// Load the response image
|
|
if (LoadBinaryResource("logo.png", data_)) {
|
|
handled = true;
|
|
// Set the resulting mime type
|
|
mime_type_ = "image/png";
|
|
}
|
|
}
|
|
|
|
if (handled) {
|
|
// Indicate the headers are available.
|
|
callback->Continue();
|
|
return true;
|
|
}
|
|
|
|
return false;
|
|
}
|
|
|
|
virtual void GetResponseHeaders(CefRefPtr<CefResponse> response,
|
|
int64& response_length,
|
|
CefString& redirectUrl) OVERRIDE {
|
|
CEF_REQUIRE_IO_THREAD();
|
|
|
|
DCHECK(!data_.empty());
|
|
|
|
response->SetMimeType(mime_type_);
|
|
response->SetStatus(200);
|
|
|
|
// Set the resulting response length
|
|
response_length = data_.length();
|
|
}
|
|
|
|
virtual void Cancel() OVERRIDE {
|
|
CEF_REQUIRE_IO_THREAD();
|
|
}
|
|
|
|
virtual bool ReadResponse(void* data_out,
|
|
int bytes_to_read,
|
|
int& bytes_read,
|
|
CefRefPtr<CefCallback> callback)
|
|
OVERRIDE {
|
|
CEF_REQUIRE_IO_THREAD();
|
|
|
|
bool has_data = false;
|
|
bytes_read = 0;
|
|
|
|
if (offset_ < data_.length()) {
|
|
// Copy the next block of data into the buffer.
|
|
int transfer_size =
|
|
std::min(bytes_to_read, static_cast<int>(data_.length() - offset_));
|
|
memcpy(data_out, data_.c_str() + offset_, transfer_size);
|
|
offset_ += transfer_size;
|
|
|
|
bytes_read = transfer_size;
|
|
has_data = true;
|
|
}
|
|
|
|
return has_data;
|
|
}
|
|
|
|
private:
|
|
std::string data_;
|
|
std::string mime_type_;
|
|
size_t offset_;
|
|
|
|
IMPLEMENT_REFCOUNTING(ClientSchemeHandler);
|
|
};
|
|
|
|
// Implementation of the factory for for creating schema handlers.
|
|
class ClientSchemeHandlerFactory : public CefSchemeHandlerFactory {
|
|
public:
|
|
// Return a new scheme handler instance to handle the request.
|
|
virtual CefRefPtr<CefResourceHandler> Create(CefRefPtr<CefBrowser> browser,
|
|
CefRefPtr<CefFrame> frame,
|
|
const CefString& scheme_name,
|
|
CefRefPtr<CefRequest> request)
|
|
OVERRIDE {
|
|
CEF_REQUIRE_IO_THREAD();
|
|
return new ClientSchemeHandler();
|
|
}
|
|
|
|
IMPLEMENT_REFCOUNTING(ClientSchemeHandlerFactory);
|
|
};
|
|
|
|
} // namespace
|
|
|
|
void RegisterCustomSchemes(CefRefPtr<CefSchemeRegistrar> registrar,
|
|
std::vector<CefString>& cookiable_schemes) {
|
|
registrar->AddCustomScheme("client", true, false, false);
|
|
}
|
|
|
|
void InitTest() {
|
|
CefRegisterSchemeHandlerFactory("client", "tests",
|
|
new ClientSchemeHandlerFactory());
|
|
}
|
|
|
|
} // namespace scheme_test
|