diff options
Diffstat (limited to 'WebCore/page/Settings.cpp')
| -rw-r--r-- | WebCore/page/Settings.cpp | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/WebCore/page/Settings.cpp b/WebCore/page/Settings.cpp index 58c9629..883875b 100644 --- a/WebCore/page/Settings.cpp +++ b/WebCore/page/Settings.cpp @@ -144,9 +144,13 @@ Settings::Settings(Page* page) , m_webGLEnabled(false) , m_loadDeferringEnabled(true) , m_tiledBackingStoreEnabled(false) +<<<<<<< HEAD #ifdef ANDROID_PLUGINS , m_pluginsOnDemand(false) #endif +======= + , m_html5ParserEnabled(false) +>>>>>>> webkit.org at r60074 { // A Frame may not have been created yet, so we initialize the AtomicString // hash before trying to use it. |