bcarrella/cef
1
0
Fork 0
mirror of https://bitbucket.org/chromiumembedded/cef synced 2025-02-02 20:26:59 +01:00
Code Issues Packages Projects Releases Wiki Activity

Linux: Fix window destruction crash.

Browse Source 
git-svn-id: https://chromiumembedded.googlecode.com/svn/trunk@449 5089003a-bbd8-11dd-ad1f-f1f9622dbc98
This commit is contained in:
Marshall Greenblatt 2011-12-31 00:57:52 +00:00
parent 8d6c760bbd
commit 3d734d9f90
4 changed files with 17 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
libcef/browser_impl.cc
View File

@ -786,8 +786,11 @@ void CefBrowserImpl::UIT_DestroyBrowser()
} }
// Clean up anything associated with the WebViewHost widget. // Clean up anything associated with the WebViewHost widget.
UIT_GetWebViewHost()->webwidget()->close(); if (webviewhost_.get()) {
webviewhost_.reset(); if (webviewhost_->webwidget())
webviewhost_->webwidget()->close();
webviewhost_.reset();
}
// Remove the reference to the window handle. // Remove the reference to the window handle.
UIT_ClearMainWndHandle(); UIT_ClearMainWndHandle();

17
libcef/browser_impl_gtk.cc
View File

@ -18,6 +18,14 @@
using WebKit::WebRect; using WebKit::WebRect;
using WebKit::WebSize; using WebKit::WebSize;
namespace {
void window_destroyed(GtkWidget* widget, CefBrowserImpl* browser) {
browser->UIT_DestroyBrowser();
}
} // namespace
void CefBrowserImpl::ParentWindowWillClose() void CefBrowserImpl::ParentWindowWillClose()
{ {
// TODO(port): Implement this method if necessary. // TODO(port): Implement this method if necessary.
@ -89,6 +97,8 @@ bool CefBrowserImpl::UIT_CreateBrowser(const CefString& url)
dev_tools_agent_->SetWebView(webviewhost_->webview()); dev_tools_agent_->SetWebView(webviewhost_->webview());
window_info_.m_Widget = webviewhost_->view_handle(); window_info_.m_Widget = webviewhost_->view_handle();
g_signal_connect(G_OBJECT(window_info_.m_Widget), "destroy",
G_CALLBACK(window_destroyed), this);
Unlock(); Unlock();
@ -181,11 +191,8 @@ int CefBrowserImpl::UIT_GetPagesCount(WebKit::WebFrame* frame)
// static // static
void CefBrowserImpl::UIT_CloseView(gfx::NativeView view) void CefBrowserImpl::UIT_CloseView(gfx::NativeView view)
{ {
GtkWidget* window = GtkWidget* window = gtk_widget_get_toplevel(GTK_WIDGET(view));
gtk_widget_get_parent(gtk_widget_get_parent(GTK_WIDGET(view))); gtk_widget_destroy(window);
MessageLoop::current()->PostTask(FROM_HERE, NewRunnableFunction(
&gtk_widget_destroy, GTK_WIDGET(window)));
} }
// static // static

1
libcef/webwidget_host.h
View File

@ -194,7 +194,6 @@ class WebWidgetHost {
// --------------------------------------------------------------------------- // ---------------------------------------------------------------------------
static gfx::NativeView CreateWidget(gfx::NativeView parent_view, static gfx::NativeView CreateWidget(gfx::NativeView parent_view,
WebWidgetHost* host); WebWidgetHost* host);
void WindowDestroyed();
void Resize(const gfx::Size& size); void Resize(const gfx::Size& size);
virtual void KeyEvent(GdkEventKey* event); virtual void KeyEvent(GdkEventKey* event);
#endif #endif

16
libcef/webwidget_host_gtk.cc
View File

@ -84,8 +84,6 @@ class WebWidgetHostGtkWidget {
G_CALLBACK(&HandleConfigure), host); G_CALLBACK(&HandleConfigure), host);
g_signal_connect(widget, "expose-event", g_signal_connect(widget, "expose-event",
G_CALLBACK(&HandleExpose), host); G_CALLBACK(&HandleExpose), host);
g_signal_connect(widget, "destroy",
G_CALLBACK(&HandleDestroy), host);
g_signal_connect(widget, "key-press-event", g_signal_connect(widget, "key-press-event",
G_CALLBACK(&HandleKeyPress), host); G_CALLBACK(&HandleKeyPress), host);
g_signal_connect(widget, "key-release-event", g_signal_connect(widget, "key-release-event",
@ -154,16 +152,6 @@ class WebWidgetHostGtkWidget {
return FALSE; return FALSE;
} }
// The GdkWindow was destroyed.
static gboolean HandleDestroy(GtkWidget* widget, void* unused) {
// The associated WebWidgetHost instance may have already been destroyed.
WebWidgetHost* host = static_cast<WebWidgetHost*>(
g_object_get_data(G_OBJECT(widget), kWebWidgetHostKey));
if (host)
host->WindowDestroyed();
return FALSE;
}
// Keyboard key pressed. // Keyboard key pressed.
static gboolean HandleKeyPress(GtkWidget* widget, static gboolean HandleKeyPress(GtkWidget* widget,
GdkEventKey* event, GdkEventKey* event,
@ -455,10 +443,6 @@ void WebWidgetHost::PaintRect(const gfx::Rect& rect) {
set_painting(false); set_painting(false);
} }
void WebWidgetHost::WindowDestroyed() {
delete this;
}
void WebWidgetHost::SendKeyEvent(cef_key_type_t type, int key, int modifiers, void WebWidgetHost::SendKeyEvent(cef_key_type_t type, int key, int modifiers,
bool sysChar, bool imeChar) bool sysChar, bool imeChar)
{ {