Merge revision 449-452 changes:

- Linux: Fix window destruction crash.
- Linux: Fix cefclient shutdown crash.
- Remove WebURLRequestTest.CANCEL test with WUR_STATE_LOADING due to flakiness.
- Linux: Initialize the 'proxy_type' variable to make the compiler happy.

git-svn-id: https://chromiumembedded.googlecode.com/svn/branches/963@454 5089003a-bbd8-11dd-ad1f-f1f9622dbc98
This commit is contained in:
Marshall Greenblatt
2012-01-03 18:07:21 +00:00
parent 912baa9f49
commit 58c8cfcd0a
7 changed files with 24 additions and 31 deletions

View File

@@ -84,8 +84,6 @@ class WebWidgetHostGtkWidget {
G_CALLBACK(&HandleConfigure), host);
g_signal_connect(widget, "expose-event",
G_CALLBACK(&HandleExpose), host);
g_signal_connect(widget, "destroy",
G_CALLBACK(&HandleDestroy), host);
g_signal_connect(widget, "key-press-event",
G_CALLBACK(&HandleKeyPress), host);
g_signal_connect(widget, "key-release-event",
@@ -154,16 +152,6 @@ class WebWidgetHostGtkWidget {
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.
static gboolean HandleKeyPress(GtkWidget* widget,
GdkEventKey* event,
@@ -455,10 +443,6 @@ void WebWidgetHost::PaintRect(const gfx::Rect& rect) {
set_painting(false);
}
void WebWidgetHost::WindowDestroyed() {
delete this;
}
void WebWidgetHost::SendKeyEvent(cef_key_type_t type, int key, int modifiers,
bool sysChar, bool imeChar)
{