diff options
author | tschmelcher@chromium.org <tschmelcher@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-01-24 21:25:58 +0000 |
---|---|---|
committer | tschmelcher@chromium.org <tschmelcher@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-01-24 21:25:58 +0000 |
commit | 09e16d8e29b9751ad3d91f269dd3d66f4dc368d1 (patch) | |
tree | e3ec84924c7fbf4cd1eef140d193b874bbd70b05 /o3d | |
parent | 70c209d8418a49a809eddab94b8816d47a93bfd8 (diff) | |
download | chromium_src-09e16d8e29b9751ad3d91f269dd3d66f4dc368d1.zip chromium_src-09e16d8e29b9751ad3d91f269dd3d66f4dc368d1.tar.gz chromium_src-09e16d8e29b9751ad3d91f269dd3d66f4dc368d1.tar.bz2 |
Add HANDLE_CRASHES to Linux callback functions, since they are plugin entry points too. This makes no difference right now because we currently don't gate Linux crash uploading on HANDLE_CRASHES, but once we change that we'll want these in all the right places.
TEST=loaded O2D on Linux, verified it works
BUG=none
Review URL: http://codereview.chromium.org/6348018
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@72388 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'o3d')
-rw-r--r-- | o3d/plugin/linux/main_linux.cc | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/o3d/plugin/linux/main_linux.cc b/o3d/plugin/linux/main_linux.cc index 767dad7..05f5f26 100644 --- a/o3d/plugin/linux/main_linux.cc +++ b/o3d/plugin/linux/main_linux.cc @@ -77,6 +77,7 @@ static void DrawPlugin(PluginObject *obj) { // Xt support functions void LinuxTimer(XtPointer data, XtIntervalId* id) { + HANDLE_CRASHES; PluginObject *obj = static_cast<PluginObject *>(data); DCHECK(obj->xt_interval_ == *id); obj->client()->Tick(); @@ -97,6 +98,7 @@ void LinuxExposeHandler(Widget w, XtPointer user_data, XEvent *event, Boolean *cont) { + HANDLE_CRASHES; PluginObject *obj = static_cast<PluginObject *>(user_data); if (event->type != Expose) return; DrawPlugin(obj); @@ -252,6 +254,7 @@ void LinuxKeyHandler(Widget w, XtPointer user_data, XEvent *xevent, Boolean *cont) { + HANDLE_CRASHES; PluginObject *obj = static_cast<PluginObject *>(user_data); XKeyEvent *key_event = &xevent->xkey; Event::Type type; @@ -291,6 +294,7 @@ void LinuxMouseButtonHandler(Widget w, XtPointer user_data, XEvent *xevent, Boolean *cont) { + HANDLE_CRASHES; PluginObject *obj = static_cast<PluginObject *>(user_data); XButtonEvent *button_event = &xevent->xbutton; Event::Type type; @@ -349,6 +353,7 @@ void LinuxMouseMoveHandler(Widget w, XtPointer user_data, XEvent *xevent, Boolean *cont) { + HANDLE_CRASHES; PluginObject *obj = static_cast<PluginObject *>(user_data); if (xevent->type != MotionNotify) return; @@ -366,6 +371,7 @@ void LinuxEnterLeaveHandler(Widget w, XtPointer user_data, XEvent *xevent, Boolean *cont) { + HANDLE_CRASHES; PluginObject *obj = static_cast<PluginObject *>(user_data); switch (xevent->type) { case EnterNotify: @@ -553,6 +559,7 @@ static gboolean GtkHandleScroll(GtkWidget *widget, static gboolean GtkEventCallback(GtkWidget *widget, GdkEvent *event, gpointer user_data) { + HANDLE_CRASHES; PluginObject *obj = static_cast<PluginObject *>(user_data); DLOG_ASSERT(widget == obj->gtk_event_source_); switch (event->type) { @@ -587,6 +594,7 @@ static gboolean GtkEventCallback(GtkWidget *widget, static gboolean GtkConfigureEventCallback(GtkWidget *widget, GdkEventConfigure *configure_event, gpointer user_data) { + HANDLE_CRASHES; PluginObject *obj = static_cast<PluginObject *>(user_data); return obj->OnGtkConfigure(widget, configure_event); } @@ -594,11 +602,13 @@ static gboolean GtkConfigureEventCallback(GtkWidget *widget, static gboolean GtkDeleteEventCallback(GtkWidget *widget, GdkEvent *event, gpointer user_data) { + HANDLE_CRASHES; PluginObject *obj = static_cast<PluginObject *>(user_data); return obj->OnGtkDelete(widget, event); } static gboolean GtkTimeoutCallback(gpointer user_data) { + HANDLE_CRASHES; PluginObject *obj = static_cast<PluginObject *>(user_data); obj->draw_ = true; obj->client()->Tick(); |