mirror of
https://bitbucket.org/chromiumembedded/cef
synced 2025-06-05 21:39:12 +02:00
Introduce the use of Chromium types (issue #1336).
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
This commit is contained in:
@@ -218,7 +218,7 @@ void ClientHandler::OnAddressChange(CefRefPtr<CefBrowser> browser,
|
||||
const CefString& url) {
|
||||
CEF_REQUIRE_UI_THREAD();
|
||||
|
||||
if (browser_id_ == browser->GetIdentifier() && frame->IsMain()) {
|
||||
if (GetBrowserId() == browser->GetIdentifier() && frame->IsMain()) {
|
||||
// Set the edit window text
|
||||
std::string urlStr(url);
|
||||
gtk_entry_set_text(GTK_ENTRY(edit_handle_), urlStr.c_str());
|
||||
@@ -283,6 +283,8 @@ bool ClientHandler::OnJSDialog(CefRefPtr<CefBrowser> browser,
|
||||
const CefString& default_prompt_text,
|
||||
CefRefPtr<CefJSDialogCallback> callback,
|
||||
bool& suppress_message) {
|
||||
CEF_REQUIRE_UI_THREAD();
|
||||
|
||||
GtkButtonsType buttons = GTK_BUTTONS_NONE;
|
||||
GtkMessageType gtk_message_type = GTK_MESSAGE_OTHER;
|
||||
std::string title;
|
||||
@@ -359,6 +361,8 @@ bool ClientHandler::OnBeforeUnloadDialog(
|
||||
const CefString& message_text,
|
||||
bool is_reload,
|
||||
CefRefPtr<CefJSDialogCallback> callback) {
|
||||
CEF_REQUIRE_UI_THREAD();
|
||||
|
||||
const std::string& new_message_text =
|
||||
message_text.ToString() + "\n\nIs it OK to leave/reload this page?";
|
||||
bool suppress_message = false;
|
||||
@@ -368,6 +372,8 @@ bool ClientHandler::OnBeforeUnloadDialog(
|
||||
}
|
||||
|
||||
void ClientHandler::OnResetDialogState(CefRefPtr<CefBrowser> browser) {
|
||||
CEF_REQUIRE_UI_THREAD();
|
||||
|
||||
if (!gtk_dialog_)
|
||||
return;
|
||||
gtk_widget_destroy(gtk_dialog_);
|
||||
@@ -379,6 +385,8 @@ void ClientHandler::OnResetDialogState(CefRefPtr<CefBrowser> browser) {
|
||||
void ClientHandler::OnDialogResponse(GtkDialog* dialog,
|
||||
gint response_id,
|
||||
ClientHandler* handler) {
|
||||
CEF_REQUIRE_UI_THREAD();
|
||||
|
||||
DCHECK_EQ(dialog, GTK_DIALOG(handler->gtk_dialog_));
|
||||
switch (response_id) {
|
||||
case GTK_RESPONSE_OK:
|
||||
@@ -400,6 +408,8 @@ void ClientHandler::SendNotification(NotificationType type) {
|
||||
}
|
||||
|
||||
void ClientHandler::SetLoading(bool isLoading) {
|
||||
CEF_REQUIRE_UI_THREAD();
|
||||
|
||||
if (isLoading)
|
||||
gtk_widget_set_sensitive(GTK_WIDGET(stop_handle_), true);
|
||||
else
|
||||
@@ -407,6 +417,8 @@ void ClientHandler::SetLoading(bool isLoading) {
|
||||
}
|
||||
|
||||
void ClientHandler::SetNavState(bool canGoBack, bool canGoForward) {
|
||||
CEF_REQUIRE_UI_THREAD();
|
||||
|
||||
if (canGoBack)
|
||||
gtk_widget_set_sensitive(GTK_WIDGET(back_handle_), true);
|
||||
else
|
||||
@@ -421,4 +433,3 @@ void ClientHandler::SetNavState(bool canGoBack, bool canGoForward) {
|
||||
std::string ClientHandler::GetDownloadPath(const std::string& file_name) {
|
||||
return std::string();
|
||||
}
|
||||
|
||||
|
Reference in New Issue
Block a user