Commit 9f6fd113 authored by sadrul@chromium.org's avatar sadrul@chromium.org

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
parent 31eac5b5
...@@ -1304,7 +1304,7 @@ ui::GestureStatus RenderWidgetHostViewAura::OnGestureEvent( ...@@ -1304,7 +1304,7 @@ ui::GestureStatus RenderWidgetHostViewAura::OnGestureEvent(
} }
RenderViewHostDelegate* delegate = NULL; RenderViewHostDelegate* delegate = NULL;
if (popup_type_ == WebKit::WebPopupTypeNone) if (popup_type_ == WebKit::WebPopupTypeNone && !is_fullscreen_)
delegate = RenderViewHost::From(host_)->GetDelegate(); delegate = RenderViewHost::From(host_)->GetDelegate();
if (delegate && event->type() == ui::ET_GESTURE_BEGIN && if (delegate && event->type() == ui::ET_GESTURE_BEGIN &&
event->details().touch_points() == 1) { event->details().touch_points() == 1) {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment