diff options
| author | Ben Murdoch <benm@google.com> | 2011-05-05 14:36:32 +0100 |
|---|---|---|
| committer | Ben Murdoch <benm@google.com> | 2011-05-10 15:38:30 +0100 |
| commit | f05b935882198ccf7d81675736e3aeb089c5113a (patch) | |
| tree | 4ea0ca838d9ef1b15cf17ddb3928efb427c7e5a1 /WebCore/page/Settings.cpp | |
| parent | 60fbdcc62bced8db2cb1fd233cc4d1e4ea17db1b (diff) | |
| download | external_webkit-f05b935882198ccf7d81675736e3aeb089c5113a.zip external_webkit-f05b935882198ccf7d81675736e3aeb089c5113a.tar.gz external_webkit-f05b935882198ccf7d81675736e3aeb089c5113a.tar.bz2 | |
Merge WebKit at r74534: Initial merge by git.
Change-Id: I6ccd1154fa1b19c2ec2a66878eb675738735f1eb
Diffstat (limited to 'WebCore/page/Settings.cpp')
| -rw-r--r-- | WebCore/page/Settings.cpp | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/WebCore/page/Settings.cpp b/WebCore/page/Settings.cpp index d150033..8b174be 100644 --- a/WebCore/page/Settings.cpp +++ b/WebCore/page/Settings.cpp @@ -172,10 +172,11 @@ Settings::Settings(Page* page) , m_loadDeferringEnabled(true) , m_tiledBackingStoreEnabled(false) , m_paginateDuringLayoutEnabled(false) - , m_dnsPrefetchingEnabled(true) + , m_dnsPrefetchingEnabled(false) #if ENABLE(FULLSCREEN_API) , m_fullScreenAPIEnabled(false) #endif + , m_asynchronousSpellCheckingEnabled(false) , m_memoryInfoEnabled(false) , m_interactiveFormValidation(false) , m_usePreHTML5ParserQuirks(false) @@ -759,7 +760,11 @@ void Settings::setUsesEncodingDetector(bool usesEncodingDetector) void Settings::setDNSPrefetchingEnabled(bool dnsPrefetchingEnabled) { + if (m_dnsPrefetchingEnabled == dnsPrefetchingEnabled) + return; + m_dnsPrefetchingEnabled = dnsPrefetchingEnabled; + m_page->dnsPrefetchingStateChanged(); } void Settings::setAllowScriptsToCloseWindows(bool allowScriptsToCloseWindows) |