diff options
Diffstat (limited to 'WebKit/win/WebPreferences.h')
| -rw-r--r-- | WebKit/win/WebPreferences.h | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/WebKit/win/WebPreferences.h b/WebKit/win/WebPreferences.h index 91bc558..179c66c 100644 --- a/WebKit/win/WebPreferences.h +++ b/WebKit/win/WebPreferences.h @@ -26,7 +26,8 @@ #ifndef WebPreferences_H #define WebPreferences_H -#include "WebKit.h" +#include "IWebPreferences.h" +#include "IWebPreferencesPrivate.h" #include <CoreFoundation/CoreFoundation.h> #include <WebCore/BString.h> #include <wtf/RetainPtr.h> @@ -315,8 +316,7 @@ public: HRESULT postPreferencesChangesNotification(); protected: - void setValueForKey(CFStringRef key, CFPropertyListRef value); - RetainPtr<CFPropertyListRef> valueForKey(CFStringRef key); + const void* valueForKey(CFStringRef key); BSTR stringValueForKey(CFStringRef key); int integerValueForKey(CFStringRef key); BOOL boolValueForKey(CFStringRef key); @@ -330,8 +330,8 @@ protected: static void initializeDefaultSettings(); void save(); void load(); - void migrateWebKitPreferencesToCFPreferences(); - void copyWebKitPreferencesToCFPreferences(CFDictionaryRef); + void migrateDefaultSettingsFromSafari3Beta(); + void removeValuesMatchingDefaultSettings(); protected: ULONG m_refCount; @@ -340,6 +340,9 @@ protected: bool m_autoSaves; bool m_automaticallyDetectsCacheModel; unsigned m_numWebViews; + + static CFDictionaryRef s_defaultSettings; + static WebPreferences* s_standardPreferences; }; #endif |