diff options
| author | mnaganov@chromium.org <mnaganov@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-01-19 09:57:17 +0000 |
|---|---|---|
| committer | mnaganov@chromium.org <mnaganov@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-01-19 09:57:17 +0000 |
| commit | df4db7c65c887d994d2cd5fb288e33201bd7e8c7 (patch) | |
| tree | 6579945bacef4cbee023d30e65f111c9d621f0ab /webkit | |
| parent | b202844f617cce3b15381dbc9cf0deb4425e5d46 (diff) | |
| download | chromium_src-df4db7c65c887d994d2cd5fb288e33201bd7e8c7.zip chromium_src-df4db7c65c887d994d2cd5fb288e33201bd7e8c7.tar.gz chromium_src-df4db7c65c887d994d2cd5fb288e33201bd7e8c7.tar.bz2 | |
Add a per-tab preference to match WebSettings::images_enabled.
kWebKitLoadsImagesAutomatically isn't enough. In plain WebKit one must also set
a flag in CachedResourceLoader. In Chrome this loader class isn't used, and
image loading control is done via ChromeRenderViewObserver.
R=bauerb@chromium.org
TBR=darin@chromium.org
Review URL: https://chromiumcodereview.appspot.com/9255018
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@118276 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit')
| -rw-r--r-- | webkit/glue/webpreferences.cc | 4 | ||||
| -rw-r--r-- | webkit/glue/webpreferences.h | 3 |
2 files changed, 5 insertions, 2 deletions
diff --git a/webkit/glue/webpreferences.cc b/webkit/glue/webpreferences.cc index 5d067de..9aba421 100644 --- a/webkit/glue/webpreferences.cc +++ b/webkit/glue/webpreferences.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2011 The Chromium Authors. All rights reserved. +// Copyright (c) 2012 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. @@ -42,6 +42,7 @@ WebPreferences::WebPreferences() web_security_enabled(true), javascript_can_open_windows_automatically(true), loads_images_automatically(true), + images_enabled(true), plugins_enabled(true), dom_paste_enabled(false), // enables execCommand("paste") developer_extras_enabled(false), // Requires extra work by embedder @@ -190,6 +191,7 @@ void WebPreferences::Apply(WebView* web_view) const { settings->setJavaScriptCanOpenWindowsAutomatically( javascript_can_open_windows_automatically); settings->setLoadsImagesAutomatically(loads_images_automatically); + settings->setImagesEnabled(images_enabled); settings->setPluginsEnabled(plugins_enabled); settings->setDOMPasteAllowed(dom_paste_enabled); settings->setDeveloperExtrasEnabled(developer_extras_enabled); diff --git a/webkit/glue/webpreferences.h b/webkit/glue/webpreferences.h index 48fb8d9..8e8c23f 100644 --- a/webkit/glue/webpreferences.h +++ b/webkit/glue/webpreferences.h @@ -1,4 +1,4 @@ -// Copyright (c) 2011 The Chromium Authors. All rights reserved. +// Copyright (c) 2012 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. // @@ -49,6 +49,7 @@ struct WEBKIT_GLUE_EXPORT WebPreferences { bool web_security_enabled; bool javascript_can_open_windows_automatically; bool loads_images_automatically; + bool images_enabled; bool plugins_enabled; bool dom_paste_enabled; bool developer_extras_enabled; |