https://bugs.webkit.org/show_bug.cgi?id=58292
Provide new setting to allow site icon loading despite disabling automatic image loading in general.
Reviewed by Sam Weinig.
Source/WebCore:
Test: http/tests/misc/favicon-loads-with-icon-loading-override.html
* WebCore.exp.in: Added export symbol
* loader/FrameLoader.cpp:
(WebCore::FrameLoader::startIconLoader): Check new setting before deciding that site icon images shouldn't be loaded.
* page/Settings.cpp:
(WebCore::Settings::Settings): Add initializer for new setting
(WebCore::Settings::setLoadsSiteIconsIgnoringImageLoadingSetting): Add setter for new setting.
* page/Settings.h: Explain nuances regarding loadsImagesAutomatically setting.
(WebCore::Settings::loadsSiteIconsIgnoringImageLoadingSetting): Added getter.
Source/WebKit/mac:
* WebView/WebPreferenceKeysPrivate.h: Add preference key.
* WebView/WebPreferences.mm:
(+[WebPreferences initialize]): Initialize to false.
(-[WebPreferences setLoadsSiteIconsIgnoringImageLoadingPreference:]): Added.
(-[WebPreferences loadsSiteIconsIgnoringImageLoadingPreference]): Added.
* WebView/WebPreferencesPrivate.h: Add setter/getter definitions.
* WebView/WebView.mm:
(-[WebView _preferencesChanged:]): Add to settings that get propagated upon changes.
Source/WebKit/win:
* Interfaces/IWebPreferencesPrivate.idl: Added prefs.
* Interfaces/WebKit.idl: Touch file to force autogeneration
* WebPreferenceKeysPrivate.h: Add preference key.
* WebPreferences.cpp:
(WebPreferences::initializeDefaultSettings): Initialize setting to false.
(WebPreferences::setLoadsSiteIconsIgnoringImageLoadingPreference): Added setter
(WebPreferences::loadsSiteIconsIgnoringImageLoadingPreference): Added getter
* WebPreferences.h:
* WebView.cpp:
(WebView::notifyPreferencesChanged): Add to settings that get propagated upon changes.
Source/WebKit2:
* Shared/WebPreferencesStore.h: Add macro for setting default value.
* UIProcess/API/C/WKPreferences.cpp:
(WKPreferencesSetLoadsSiteIconsIgnoringImageLoadingPreference): Added setter.
(WKPreferencesGetLoadsSiteIconsIgnoringImageLoadingPreference): Added getter.
* UIProcess/API/C/WKPreferences.h:
* WebProcess/WebPage/WebPage.cpp:
(WebKit::WebPage::updatePreferences): Add to list of WebCore settings that get propagated to WebKit preferences.
Tools:
* DumpRenderTree/mac/DumpRenderTree.mm:
(resetDefaultsToConsistentValues): Setting should be off for most tests. Reset to false.
LayoutTests:
* http/tests/misc/favicon-loads-with-icon-loading-override-expected.txt: Added.
* http/tests/misc/favicon-loads-with-icon-loading-override.html: Added.
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@83628 268f45cc-cd09-0410-ab3c-d52691b4dbfc
27 files changed
