diff options
| author | sadrul@chromium.org <sadrul@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-08-01 15:57:42 +0000 |
|---|---|---|
| committer | sadrul@chromium.org <sadrul@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-08-01 15:57:42 +0000 |
| commit | 9f6fd113acdaa29934a96a0b5450fb0eda6e215d (patch) | |
| tree | e5c92b9833dcee9d00db523d04545c11cad28e28 | |
| parent | 31eac5b5a5025e025b12d3719461f785848c55bb (diff) | |
| download | chromium_src-9f6fd113acdaa29934a96a0b5450fb0eda6e215d.zip chromium_src-9f6fd113acdaa29934a96a0b5450fb0eda6e215d.tar.gz chromium_src-9f6fd113acdaa29934a96a0b5450fb0eda6e215d.tar.bz2 | |
aura-flash: Fix a crash when touching a fullscreen flash window.
BUG=136446
Review URL: https://chromiumcodereview.appspot.com/10821071
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@149424 0039d316-1c4b-4281-b951-d872f2087c98
| -rw-r--r-- | content/browser/renderer_host/render_widget_host_view_aura.cc | 2 |
1 files changed, 1 insertions, 1 deletions
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 a7fa7b4..2739078 100644 --- a/content/browser/renderer_host/render_widget_host_view_aura.cc +++ b/content/browser/renderer_host/render_widget_host_view_aura.cc @@ -1304,7 +1304,7 @@ ui::GestureStatus RenderWidgetHostViewAura::OnGestureEvent( } RenderViewHostDelegate* delegate = NULL; - if (popup_type_ == WebKit::WebPopupTypeNone) + if (popup_type_ == WebKit::WebPopupTypeNone && !is_fullscreen_) delegate = RenderViewHost::From(host_)->GetDelegate(); if (delegate && event->type() == ui::ET_GESTURE_BEGIN && event->details().touch_points() == 1) { |