diff options
Diffstat (limited to 'WebCore/page/Settings.cpp')
| -rw-r--r-- | WebCore/page/Settings.cpp | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/WebCore/page/Settings.cpp b/WebCore/page/Settings.cpp index bca2c7b..95c4d21 100644 --- a/WebCore/page/Settings.cpp +++ b/WebCore/page/Settings.cpp @@ -148,13 +148,10 @@ Settings::Settings(Page* page) , m_html5TreeBuilderEnabled(false) // Will be deleted soon, do not use. , m_paginateDuringLayoutEnabled(false) , m_dnsPrefetchingEnabled(true) -<<<<<<< HEAD:WebCore/page/Settings.cpp + , m_memoryInfoEnabled(false) #ifdef ANDROID_PLUGINS , m_pluginsOnDemand(false) #endif -======= - , m_memoryInfoEnabled(false) ->>>>>>> webkit.org at r63859:WebCore/page/Settings.cpp { // A Frame may not have been created yet, so we initialize the AtomicString // hash before trying to use it. |