summaryrefslogtreecommitdiffstats
path: root/WebCore/page/Settings.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'WebCore/page/Settings.cpp')
-rw-r--r--WebCore/page/Settings.cpp10
1 files changed, 10 insertions, 0 deletions
diff --git a/WebCore/page/Settings.cpp b/WebCore/page/Settings.cpp
index 503b938..d7bba08 100644
--- a/WebCore/page/Settings.cpp
+++ b/WebCore/page/Settings.cpp
@@ -145,11 +145,16 @@ Settings::Settings(Page* page)
, m_loadDeferringEnabled(true)
, m_tiledBackingStoreEnabled(false)
, m_html5ParserEnabled(true)
+ , m_html5TreeBuilderEnabled(false) // Will be deleted soon, do not use.
, m_paginateDuringLayoutEnabled(false)
+<<<<<<< HEAD
#ifdef ANDROID_PLUGINS
, m_pluginsOnDemand(false)
#endif
+=======
+ , m_dnsPrefetchingEnabled(true)
+>>>>>>> webkit.org at r62496
{
// A Frame may not have been created yet, so we initialize the AtomicString
// hash before trying to use it.
@@ -723,6 +728,11 @@ void Settings::setUsesEncodingDetector(bool usesEncodingDetector)
m_usesEncodingDetector = usesEncodingDetector;
}
+void Settings::setDNSPrefetchingEnabled(bool dnsPrefetchingEnabled)
+{
+ m_dnsPrefetchingEnabled = dnsPrefetchingEnabled;
+}
+
void Settings::setAllowScriptsToCloseWindows(bool allowScriptsToCloseWindows)
{
m_allowScriptsToCloseWindows = allowScriptsToCloseWindows;