Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(849)

Unified Diff: content/browser/renderer_host/render_widget_host_view_aura.cc

Issue 10796111: touch: Fix a crash when touching a date-picker. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 8 years, 5 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/browser/renderer_host/render_widget_host_view_aura.cc
diff --git a/content/browser/renderer_host/render_widget_host_view_aura.cc b/content/browser/renderer_host/render_widget_host_view_aura.cc
index b07295f4e1549820e695b99cd6fe48e5da19b3bf..cc774c16aa769ba8b7a3a06a4e4f77d91562017b 100644
--- a/content/browser/renderer_host/render_widget_host_view_aura.cc
+++ b/content/browser/renderer_host/render_widget_host_view_aura.cc
@@ -1149,8 +1149,10 @@ ui::GestureStatus RenderWidgetHostViewAura::OnGestureEvent(
return ui::GESTURE_STATUS_CONSUMED;
}
- RenderViewHostDelegate* delegate = RenderViewHost::From(host_)->GetDelegate();
- if (event->type() == ui::ET_GESTURE_BEGIN &&
+ RenderViewHostDelegate* delegate = NULL;
+ if (popup_type_ == WebKit::WebPopupTypeNone)
+ delegate = RenderViewHost::From(host_)->GetDelegate();
+ if (delegate && event->type() == ui::ET_GESTURE_BEGIN &&
event->details().touch_points() == 1) {
delegate->HandleGestureBegin();
}
@@ -1176,7 +1178,7 @@ ui::GestureStatus RenderWidgetHostViewAura::OnGestureEvent(
}
}
- if (event->type() == ui::ET_GESTURE_END &&
+ if (delegate && event->type() == ui::ET_GESTURE_END &&
event->details().touch_points() == 1) {
delegate->HandleGestureEnd();
}
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698