summaryrefslogtreecommitdiffstats
path: root/Source/WebCore/page
diff options
context:
space:
mode:
authorTeng-Hui Zhu <ztenghui@google.com>2012-07-18 15:39:53 -0700
committerTeng-Hui Zhu <ztenghui@google.com>2012-07-18 15:53:28 -0700
commitad46784d9075ff6d1e11cd2be47a6169761b0eeb (patch)
tree64006c7367e689eb4a4e66fe8500348b1fca1fa1 /Source/WebCore/page
parentd12967fd535d36a592841c6c4bb112bd94092b3c (diff)
downloadexternal_webkit-ad46784d9075ff6d1e11cd2be47a6169761b0eeb.zip
external_webkit-ad46784d9075ff6d1e11cd2be47a6169761b0eeb.tar.gz
external_webkit-ad46784d9075ff6d1e11cd2be47a6169761b0eeb.tar.bz2
add webSetting API to allow media play without user gesture
bug:6806306 This also include partial change from webkit. http://trac.webkit.org/changeset/91232 Framework change: https://android-git.corp.google.com/g/#/c/208569/ Change-Id: I1a843472c0ce3b01bcad3b7c3c12c93702f2970c
Diffstat (limited to 'Source/WebCore/page')
-rw-r--r--Source/WebCore/page/Settings.cpp2
-rw-r--r--Source/WebCore/page/Settings.h8
2 files changed, 10 insertions, 0 deletions
diff --git a/Source/WebCore/page/Settings.cpp b/Source/WebCore/page/Settings.cpp
index f668f3e..79e38d1 100644
--- a/Source/WebCore/page/Settings.cpp
+++ b/Source/WebCore/page/Settings.cpp
@@ -201,6 +201,8 @@ Settings::Settings(Page* page)
#else
, m_passwordEchoEnabled(false)
#endif
+ , m_mediaPlaybackRequiresUserGesture(false)
+ , m_mediaPlaybackAllowsInline(true)
{
// A Frame may not have been created yet, so we initialize the AtomicString
// hash before trying to use it.
diff --git a/Source/WebCore/page/Settings.h b/Source/WebCore/page/Settings.h
index 2cf7715..84828ab 100644
--- a/Source/WebCore/page/Settings.h
+++ b/Source/WebCore/page/Settings.h
@@ -479,6 +479,12 @@ namespace WebCore {
bool blockNetworkImage() const { return m_blockNetworkImage; }
#endif
+ void setMediaPlaybackRequiresUserGesture(bool flag) { m_mediaPlaybackRequiresUserGesture = flag; };
+ bool mediaPlaybackRequiresUserGesture() const { return m_mediaPlaybackRequiresUserGesture; }
+
+ void setMediaPlaybackAllowsInline(bool flag) { m_mediaPlaybackAllowsInline = flag; };
+ bool mediaPlaybackAllowsInline() const { return m_mediaPlaybackAllowsInline; }
+
private:
Page* m_page;
@@ -633,6 +639,8 @@ namespace WebCore {
#ifdef ANDROID_PLUGINS
bool m_pluginsOnDemand : 1;
#endif
+ bool m_mediaPlaybackRequiresUserGesture : 1;
+ bool m_mediaPlaybackAllowsInline : 1;
bool m_passwordEchoEnabled : 1;
#if USE(SAFARI_THEME)