summaryrefslogtreecommitdiffstats
path: root/Source
diff options
context:
space:
mode:
authorTeng-Hui Zhu <ztenghui@google.com>2012-02-01 16:01:26 -0800
committerAndroid (Google) Code Review <android-gerrit@google.com>2012-02-01 16:01:26 -0800
commit48e41606c3269bf95715549315880f6017027be0 (patch)
treee921e39bc50b7e61cb4c23aa75d336b09fe67790 /Source
parent3ae2dce4826cc4fc412ccd49ab68bb775c31e6c4 (diff)
parentb63752ec4203caed474196849226a76c55f06714 (diff)
downloadexternal_webkit-48e41606c3269bf95715549315880f6017027be0.zip
external_webkit-48e41606c3269bf95715549315880f6017027be0.tar.gz
external_webkit-48e41606c3269bf95715549315880f6017027be0.tar.bz2
Merge "Video: make sure the click is from user gesture."
Diffstat (limited to 'Source')
-rw-r--r--Source/WebCore/html/HTMLMediaElement.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/Source/WebCore/html/HTMLMediaElement.cpp b/Source/WebCore/html/HTMLMediaElement.cpp
index ae0571c..5cd2ddd 100644
--- a/Source/WebCore/html/HTMLMediaElement.cpp
+++ b/Source/WebCore/html/HTMLMediaElement.cpp
@@ -2429,7 +2429,7 @@ void HTMLMediaElement::defaultEventHandler(Event* event)
// This allows user to click the video area to toggle play/pause state.
if (event->type() == eventNames().clickEvent
&& !hasEventListeners(eventNames().clickEvent)) {
- m_userGestureInitiated = true;
+ m_userGestureInitiated = processingUserGesture();
togglePlayState();
}
#endif