[epiphany] ephy-window: move event state and button checks earlier
- From: Claudio Saavedra <csaavedra src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [epiphany] ephy-window: move event state and button checks earlier
- Date: Thu, 6 Mar 2014 13:32:06 +0000 (UTC)
commit 285916fabe13ff8e4b74701e5efde46831877fc1
Author: Claudio Saavedra <csaavedra igalia com>
Date: Thu Mar 6 14:42:55 2014 +0200
ephy-window: move event state and button checks earlier
Micro-optimization
https://bugzilla.gnome.org/show_bug.cgi?id=725818
src/ephy-window.c | 19 ++++++-------------
1 files changed, 6 insertions(+), 13 deletions(-)
---
diff --git a/src/ephy-window.c b/src/ephy-window.c
index eb97e94..9a3204c 100644
--- a/src/ephy-window.c
+++ b/src/ephy-window.c
@@ -1851,11 +1851,6 @@ save_target_uri (EphyWindow *window,
char *location = NULL;
gboolean retval = FALSE;
- if (!(event->state & GDK_SHIFT_MASK))
- {
- return FALSE;
- }
-
g_object_get (hit_test_result, "context", &context, NULL);
LOG ("ephy_window_dom_mouse_click_cb: button %d, context %d, modifier %d (%d:%d)",
@@ -1905,17 +1900,15 @@ ephy_window_dom_mouse_click_cb (WebKitWebView *view,
WebKitHitTestResult *hit_test_result;
gboolean handled = FALSE;
- hit_test_result = g_object_ref (window->priv->hit_test_result);
-
- switch (event->button)
+ /* Since we're only dealing with shift+click, we can do these
+ checks early. */
+ if (!(event->state & GDK_SHIFT_MASK) || event->button != GDK_BUTTON_PRIMARY)
{
- case GDK_BUTTON_PRIMARY:
- handled = save_target_uri (window, view, event, hit_test_result);
- break;
- default:
- break;
+ return FALSE;
}
+ hit_test_result = g_object_ref (window->priv->hit_test_result);
+ handled = save_target_uri (window, view, event, hit_test_result);
g_object_unref (hit_test_result);
return handled;
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]