diff options
| author | Simon Hausmann <simon.hausmann@nokia.com> | 2012-05-11 09:43:24 +0200 |
|---|---|---|
| committer | Simon Hausmann <simon.hausmann@nokia.com> | 2012-05-11 09:43:24 +0200 |
| commit | 1b914638db989aaa98631a1c1e02c7b2d44805d8 (patch) | |
| tree | 87f4fd2c7b38db320079a5de8877890d2ca3c485 /Source/WebKit/gtk/webkit/webkitwebview.cpp | |
| parent | 2cf6c8816a73e0132bd8fa3b509d62d7c51b6e47 (diff) | |
| download | qtwebkit-1b914638db989aaa98631a1c1e02c7b2d44805d8.tar.gz | |
Imported WebKit commit 9a52e27980f47e8b0d8f8b7cc0fd7b5741bceb92 (http://svn.webkit.org/repository/webkit/trunk@116736)
New snapshot to include QDeclarative* -> QQml* build fixes
Diffstat (limited to 'Source/WebKit/gtk/webkit/webkitwebview.cpp')
| -rw-r--r-- | Source/WebKit/gtk/webkit/webkitwebview.cpp | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/Source/WebKit/gtk/webkit/webkitwebview.cpp b/Source/WebKit/gtk/webkit/webkitwebview.cpp index 80e2fc3a3..300ea8c99 100644 --- a/Source/WebKit/gtk/webkit/webkitwebview.cpp +++ b/Source/WebKit/gtk/webkit/webkitwebview.cpp @@ -3334,6 +3334,8 @@ static void webkit_web_view_update_settings(WebKitWebView* webView) coreSettings->setJavaEnabled(settingsPrivate->enableJavaApplet); coreSettings->setHyperlinkAuditingEnabled(settingsPrivate->enableHyperlinkAuditing); coreSettings->setDNSPrefetchingEnabled(settingsPrivate->enableDNSPrefetching); + coreSettings->setMediaPlaybackRequiresUserGesture(settingsPrivate->mediaPlaybackRequiresUserGesture); + coreSettings->setMediaPlaybackAllowsInline(settingsPrivate->mediaPlaybackAllowsInline); #if ENABLE(SQL_DATABASE) AbstractDatabase::setIsAvailable(settingsPrivate->enableHTML5Database); @@ -3475,6 +3477,10 @@ static void webkit_web_view_settings_notify(WebKitWebSettings* webSettings, GPar settings->setJavaEnabled(g_value_get_boolean(&value)); else if (name == g_intern_string("enable-hyperlink-auditing")) settings->setHyperlinkAuditingEnabled(g_value_get_boolean(&value)); + else if (name == g_intern_string("media-playback-requires-user-gesture")) + settings->setMediaPlaybackRequiresUserGesture(g_value_get_boolean(&value)); + else if (name == g_intern_string("media-playback-allows-inline")) + settings->setMediaPlaybackAllowsInline(g_value_get_boolean(&value)); #if ENABLE(SPELLCHECK) else if (name == g_intern_string("spell-checking-languages")) { |