mirror of
https://bitbucket.org/chromiumembedded/cef
synced 2025-06-05 21:39:12 +02:00
Linux: Fix window destruction crash.
git-svn-id: https://chromiumembedded.googlecode.com/svn/trunk@449 5089003a-bbd8-11dd-ad1f-f1f9622dbc98
This commit is contained in:
@ -18,6 +18,14 @@
|
||||
using WebKit::WebRect;
|
||||
using WebKit::WebSize;
|
||||
|
||||
namespace {
|
||||
|
||||
void window_destroyed(GtkWidget* widget, CefBrowserImpl* browser) {
|
||||
browser->UIT_DestroyBrowser();
|
||||
}
|
||||
|
||||
} // namespace
|
||||
|
||||
void CefBrowserImpl::ParentWindowWillClose()
|
||||
{
|
||||
// TODO(port): Implement this method if necessary.
|
||||
@ -89,6 +97,8 @@ bool CefBrowserImpl::UIT_CreateBrowser(const CefString& url)
|
||||
dev_tools_agent_->SetWebView(webviewhost_->webview());
|
||||
|
||||
window_info_.m_Widget = webviewhost_->view_handle();
|
||||
g_signal_connect(G_OBJECT(window_info_.m_Widget), "destroy",
|
||||
G_CALLBACK(window_destroyed), this);
|
||||
|
||||
Unlock();
|
||||
|
||||
@ -181,11 +191,8 @@ int CefBrowserImpl::UIT_GetPagesCount(WebKit::WebFrame* frame)
|
||||
// static
|
||||
void CefBrowserImpl::UIT_CloseView(gfx::NativeView view)
|
||||
{
|
||||
GtkWidget* window =
|
||||
gtk_widget_get_parent(gtk_widget_get_parent(GTK_WIDGET(view)));
|
||||
|
||||
MessageLoop::current()->PostTask(FROM_HERE, NewRunnableFunction(
|
||||
>k_widget_destroy, GTK_WIDGET(window)));
|
||||
GtkWidget* window = gtk_widget_get_toplevel(GTK_WIDGET(view));
|
||||
gtk_widget_destroy(window);
|
||||
}
|
||||
|
||||
// static
|
||||
|
Reference in New Issue
Block a user