mirror of
https://bitbucket.org/chromiumembedded/cef
synced 2024-12-14 02:24:03 +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
108 lines
3.6 KiB
C++
108 lines
3.6 KiB
C++
// Copyright (c) 2014 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 this first to avoid type conflicts with CEF headers.
|
|
#include "tests/unittests/chromium_includes.h"
|
|
|
|
#include "tests/unittests/routing_test_handler.h"
|
|
#include "tests/cefclient/client_app.h"
|
|
|
|
namespace {
|
|
|
|
void SetRouterConfig(CefMessageRouterConfig& config) {
|
|
config.js_query_function = "testQuery";
|
|
config.js_cancel_function = "testQueryCancel";
|
|
}
|
|
|
|
// Handle the renderer side of the routing implementation.
|
|
class RoutingRenderDelegate : public ClientApp::RenderDelegate {
|
|
public:
|
|
RoutingRenderDelegate() {}
|
|
|
|
virtual void OnWebKitInitialized(CefRefPtr<ClientApp> app) OVERRIDE {
|
|
// Create the renderer-side router for query handling.
|
|
CefMessageRouterConfig config;
|
|
SetRouterConfig(config);
|
|
message_router_ = CefMessageRouterRendererSide::Create(config);
|
|
}
|
|
|
|
virtual void OnContextCreated(CefRefPtr<ClientApp> app,
|
|
CefRefPtr<CefBrowser> browser,
|
|
CefRefPtr<CefFrame> frame,
|
|
CefRefPtr<CefV8Context> context) OVERRIDE {
|
|
message_router_->OnContextCreated(browser, frame, context);
|
|
}
|
|
|
|
virtual void OnContextReleased(CefRefPtr<ClientApp> app,
|
|
CefRefPtr<CefBrowser> browser,
|
|
CefRefPtr<CefFrame> frame,
|
|
CefRefPtr<CefV8Context> context) OVERRIDE {
|
|
message_router_->OnContextReleased(browser, frame, context);
|
|
}
|
|
|
|
virtual bool OnProcessMessageReceived(
|
|
CefRefPtr<ClientApp> app,
|
|
CefRefPtr<CefBrowser> browser,
|
|
CefProcessId source_process,
|
|
CefRefPtr<CefProcessMessage> message) OVERRIDE {
|
|
return message_router_->OnProcessMessageReceived(
|
|
browser, source_process, message);
|
|
}
|
|
|
|
private:
|
|
CefRefPtr<CefMessageRouterRendererSide> message_router_;
|
|
|
|
IMPLEMENT_REFCOUNTING(RoutingRenderDelegate);
|
|
};
|
|
|
|
} // namespace
|
|
|
|
RoutingTestHandler::RoutingTestHandler() {
|
|
}
|
|
|
|
void RoutingTestHandler::OnAfterCreated(CefRefPtr<CefBrowser> browser) {
|
|
if (!message_router_) {
|
|
// Create the browser-side router for query handling.
|
|
CefMessageRouterConfig config;
|
|
SetRouterConfig(config);
|
|
message_router_ = CefMessageRouterBrowserSide::Create(config);
|
|
message_router_->AddHandler(this, false);
|
|
}
|
|
TestHandler::OnAfterCreated(browser);
|
|
}
|
|
|
|
void RoutingTestHandler::OnBeforeClose(CefRefPtr<CefBrowser> browser) {
|
|
message_router_->OnBeforeClose(browser);
|
|
TestHandler::OnBeforeClose(browser);
|
|
}
|
|
|
|
void RoutingTestHandler::OnRenderProcessTerminated(
|
|
CefRefPtr<CefBrowser> browser,
|
|
TerminationStatus status) {
|
|
message_router_->OnRenderProcessTerminated(browser);
|
|
}
|
|
|
|
bool RoutingTestHandler::OnBeforeBrowse(CefRefPtr<CefBrowser> browser,
|
|
CefRefPtr<CefFrame> frame,
|
|
CefRefPtr<CefRequest> request,
|
|
bool is_redirect) {
|
|
message_router_->OnBeforeBrowse(browser, frame);
|
|
return false;
|
|
}
|
|
|
|
bool RoutingTestHandler::OnProcessMessageReceived(
|
|
CefRefPtr<CefBrowser> browser,
|
|
CefProcessId source_process,
|
|
CefRefPtr<CefProcessMessage> message) {
|
|
return message_router_->OnProcessMessageReceived(
|
|
browser, source_process, message);
|
|
}
|
|
|
|
// Entry point for creating the test delegate.
|
|
// Called from client_app_delegates.cc.
|
|
void CreateRoutingTestHandlerDelegate(
|
|
ClientApp::RenderDelegateSet& delegates) {
|
|
delegates.insert(new RoutingRenderDelegate);
|
|
}
|