mirror of
https://bitbucket.org/chromiumembedded/cef
synced 2025-01-01 12:29:39 +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
112 lines
3.0 KiB
C++
112 lines
3.0 KiB
C++
// Copyright (c) 2013 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 "cefsimple/simple_handler.h"
|
|
|
|
#include <sstream>
|
|
#include <string>
|
|
|
|
#include "include/base/cef_bind.h"
|
|
#include "include/cef_app.h"
|
|
#include "include/wrapper/cef_closure_task.h"
|
|
#include "include/wrapper/cef_helpers.h"
|
|
|
|
namespace {
|
|
|
|
SimpleHandler* g_instance = NULL;
|
|
|
|
} // namespace
|
|
|
|
SimpleHandler::SimpleHandler()
|
|
: is_closing_(false) {
|
|
DCHECK(!g_instance);
|
|
g_instance = this;
|
|
}
|
|
|
|
SimpleHandler::~SimpleHandler() {
|
|
g_instance = NULL;
|
|
}
|
|
|
|
// static
|
|
SimpleHandler* SimpleHandler::GetInstance() {
|
|
return g_instance;
|
|
}
|
|
|
|
void SimpleHandler::OnAfterCreated(CefRefPtr<CefBrowser> browser) {
|
|
CEF_REQUIRE_UI_THREAD();
|
|
|
|
// Add to the list of existing browsers.
|
|
browser_list_.push_back(browser);
|
|
}
|
|
|
|
bool SimpleHandler::DoClose(CefRefPtr<CefBrowser> browser) {
|
|
CEF_REQUIRE_UI_THREAD();
|
|
|
|
// Closing the main window requires special handling. See the DoClose()
|
|
// documentation in the CEF header for a detailed destription of this
|
|
// process.
|
|
if (browser_list_.size() == 1) {
|
|
// Set a flag to indicate that the window close should be allowed.
|
|
is_closing_ = true;
|
|
}
|
|
|
|
// Allow the close. For windowed browsers this will result in the OS close
|
|
// event being sent.
|
|
return false;
|
|
}
|
|
|
|
void SimpleHandler::OnBeforeClose(CefRefPtr<CefBrowser> browser) {
|
|
CEF_REQUIRE_UI_THREAD();
|
|
|
|
// Remove from the list of existing browsers.
|
|
BrowserList::iterator bit = browser_list_.begin();
|
|
for (; bit != browser_list_.end(); ++bit) {
|
|
if ((*bit)->IsSame(browser)) {
|
|
browser_list_.erase(bit);
|
|
break;
|
|
}
|
|
}
|
|
|
|
if (browser_list_.empty()) {
|
|
// All browser windows have closed. Quit the application message loop.
|
|
CefQuitMessageLoop();
|
|
}
|
|
}
|
|
|
|
void SimpleHandler::OnLoadError(CefRefPtr<CefBrowser> browser,
|
|
CefRefPtr<CefFrame> frame,
|
|
ErrorCode errorCode,
|
|
const CefString& errorText,
|
|
const CefString& failedUrl) {
|
|
CEF_REQUIRE_UI_THREAD();
|
|
|
|
// Don't display an error for downloaded files.
|
|
if (errorCode == ERR_ABORTED)
|
|
return;
|
|
|
|
// Display a load error message.
|
|
std::stringstream ss;
|
|
ss << "<html><body bgcolor=\"white\">"
|
|
"<h2>Failed to load URL " << std::string(failedUrl) <<
|
|
" with error " << std::string(errorText) << " (" << errorCode <<
|
|
").</h2></body></html>";
|
|
frame->LoadString(ss.str(), failedUrl);
|
|
}
|
|
|
|
void SimpleHandler::CloseAllBrowsers(bool force_close) {
|
|
if (!CefCurrentlyOn(TID_UI)) {
|
|
// Execute on the UI thread.
|
|
CefPostTask(TID_UI,
|
|
base::Bind(&SimpleHandler::CloseAllBrowsers, this, force_close));
|
|
return;
|
|
}
|
|
|
|
if (browser_list_.empty())
|
|
return;
|
|
|
|
BrowserList::const_iterator it = browser_list_.begin();
|
|
for (; it != browser_list_.end(); ++it)
|
|
(*it)->GetHost()->CloseBrowser(force_close);
|
|
}
|