1 files changed, 7 insertions, 0 deletions
diff --git a/WebCore/page/Settings.h b/WebCore/page/Settings.h
index 5f567c2..9b76517 100644
--- a/WebCore/page/Settings.h
+++ b/WebCore/page/Settings.h
@@ -374,6 +374,9 @@ namespace WebCore {
         void setTiledBackingStoreEnabled(bool);
         bool tiledBackingStoreEnabled() const { return m_tiledBackingStoreEnabled; }
 
+        void setHTML5ParserEnabled(bool flag) { m_html5ParserEnabled = flag; }
+        bool html5ParserEnabled() const { return m_html5ParserEnabled; }
+
     private:
         Page* m_page;
         
@@ -490,9 +493,13 @@ namespace WebCore {
         bool m_webGLEnabled : 1;
         bool m_loadDeferringEnabled : 1;
         bool m_tiledBackingStoreEnabled : 1;
+<<<<<<< HEAD
 #ifdef ANDROID_PLUGINS
         bool m_pluginsOnDemand : 1;
 #endif
+=======
+        bool m_html5ParserEnabled: 1;
+>>>>>>> webkit.org at r60074
 
 #if USE(SAFARI_THEME)
         static bool gShouldPaintNativeControls;