1 files changed, 10 insertions, 5 deletions

diff --git a/WebCore/page/Settings.h b/WebCore/page/Settings.h
index b0a964d..7a65eaa 100644
--- a/WebCore/page/Settings.h
+++ b/WebCore/page/Settings.h
@@ -228,7 +228,7 @@ namespace WebCore {
         void setDOMPasteAllowed(bool);
         bool isDOMPasteAllowed() const { return m_isDOMPasteAllowed; }
         
-        void setMinDOMTimerInterval(double); // Interval specified in seconds.
+        static void setMinDOMTimerInterval(double); // Interval specified in seconds.
         
         void setUsesPageCache(bool);
         bool usesPageCache() const { return m_usesPageCache; }
@@ -309,9 +309,6 @@ namespace WebCore {
         void setLocalStorageDatabasePath(const String&);
         const String& localStorageDatabasePath() const { return m_localStorageDatabasePath; }
 
-        void setFileSystemRootPath(const String&);
-        const String& fileSystemRootPath() const { return m_fileSystemRootPath; }
-
         void setApplicationChromeMode(bool);
         bool inApplicationChromeMode() const { return m_inApplicationChromeMode; }
 
@@ -398,10 +395,15 @@ namespace WebCore {
         void setUsePreHTML5ParserQuirks(bool flag) { m_usePreHTML5ParserQuirks = flag; }
         bool usePreHTML5ParserQuirks() const { return m_usePreHTML5ParserQuirks; }
 
+<<<<<<< HEAD
 #if ENABLE(WEB_AUTOFILL)
         void setAutoFillEnabled(bool flag) { m_autoFillEnabled = flag; }
         bool autoFillEnabled() { return m_autoFillEnabled; }
 #endif
+=======
+        void setHyperlinkAuditingEnabled(bool flag) { m_hyperlinkAuditingEnabled = flag; }
+        bool hyperlinkAuditingEnabled() const { return m_hyperlinkAuditingEnabled; }
+>>>>>>> webkit.org at r68651
 
     private:
         Page* m_page;
@@ -409,7 +411,6 @@ namespace WebCore {
         String m_defaultTextEncodingName;
         String m_ftpDirectoryTemplatePath;
         String m_localStorageDatabasePath;
-        String m_fileSystemRootPath;
         KURL m_userStyleSheetLocation;
         AtomicString m_standardFontFamily;
         AtomicString m_fixedFontFamily;
@@ -528,12 +529,16 @@ namespace WebCore {
         bool m_memoryInfoEnabled: 1;
         bool m_interactiveFormValidation: 1;
         bool m_usePreHTML5ParserQuirks: 1;
+<<<<<<< HEAD
 #ifdef ANDROID_PLUGINS
         bool m_pluginsOnDemand : 1;
 #endif
 #if ENABLE(WEB_AUTOFILL)
         bool m_autoFillEnabled: 1;
 #endif
+=======
+        bool m_hyperlinkAuditingEnabled : 1;
+>>>>>>> webkit.org at r68651
 
 #if USE(SAFARI_THEME)
         static bool gShouldPaintNativeControls;