diff options
| author | Simon Hausmann <simon.hausmann@digia.com> | 2012-11-22 09:09:45 +0100 |
|---|---|---|
| committer | Simon Hausmann <simon.hausmann@digia.com> | 2012-11-22 09:10:13 +0100 |
| commit | 470286ecfe79d59df14944e5b5d34630fc739391 (patch) | |
| tree | 43983212872e06cebefd2ae474418fa2908ca54c /Source/WebKit/gtk/webkit/webkitwebview.cpp | |
| parent | 23037105e948c2065da5a937d3a2396b0ff45c1e (diff) | |
| download | qtwebkit-470286ecfe79d59df14944e5b5d34630fc739391.tar.gz | |
Imported WebKit commit e89504fa9195b2063b2530961d4b73dd08de3242 (http://svn.webkit.org/repository/webkit/trunk@135485)
Change-Id: I03774e5ac79721c13ffa30d152537a74d0b12e66
Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
Diffstat (limited to 'Source/WebKit/gtk/webkit/webkitwebview.cpp')
| -rw-r--r-- | Source/WebKit/gtk/webkit/webkitwebview.cpp | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/Source/WebKit/gtk/webkit/webkitwebview.cpp b/Source/WebKit/gtk/webkit/webkitwebview.cpp index 5ac04842d..cb203ac29 100644 --- a/Source/WebKit/gtk/webkit/webkitwebview.cpp +++ b/Source/WebKit/gtk/webkit/webkitwebview.cpp @@ -3401,6 +3401,8 @@ static void webkit_web_view_update_settings(WebKitWebView* webView) coreSettings->setDNSPrefetchingEnabled(settingsPrivate->enableDNSPrefetching); coreSettings->setMediaPlaybackRequiresUserGesture(settingsPrivate->mediaPlaybackRequiresUserGesture); coreSettings->setMediaPlaybackAllowsInline(settingsPrivate->mediaPlaybackAllowsInline); + coreSettings->setAllowDisplayOfInsecureContent(settingsPrivate->enableDisplayOfInsecureContent); + coreSettings->setAllowRunningOfInsecureContent(settingsPrivate->enableRunningOfInsecureContent); #if ENABLE(SQL_DATABASE) AbstractDatabase::setIsAvailable(settingsPrivate->enableHTML5Database); |