Modified: trunk/Source/WebKit2/Shared/WebPreferencesStore.h (94416 => 94417)
--- trunk/Source/WebKit2/Shared/WebPreferencesStore.h 2011-09-02 14:05:43 UTC (rev 94416)
+++ trunk/Source/WebKit2/Shared/WebPreferencesStore.h 2011-09-02 14:09:27 UTC (rev 94417)
@@ -42,6 +42,12 @@
#define DEFAULT_WEBKIT_AVFOUNDATION_ENABLED true
#endif
+#if PLATFORM(GTK)
+#define DEFAULT_WEBKIT_TABSTOLINKS_ENABLED true
+#else
+#define DEFAULT_WEBKIT_TABSTOLINKS_ENABLED false
+#endif
+
#define FOR_EACH_WEBKIT_BOOL_PREFERENCE(macro) \
macro(_javascript_Enabled, _javascript_Enabled, Bool, bool, true) \
macro(LoadsImagesAutomatically, loadsImagesAutomatically, Bool, bool, true) \
@@ -66,7 +72,7 @@
macro(CompositingRepaintCountersVisible, compositingRepaintCountersVisible, Bool, bool, false) \
macro(WebGLEnabled, webGLEnabled, Bool, bool, false) \
macro(ForceFTPDirectoryListings, forceFTPDirectoryListings, Bool, bool, false) \
- macro(TabsToLinks, tabsToLinks, Bool, bool, false) \
+ macro(TabsToLinks, tabsToLinks, Bool, bool, DEFAULT_WEBKIT_TABSTOLINKS_ENABLED) \
macro(DNSPrefetchingEnabled, dnsPrefetchingEnabled, Bool, bool, false) \
macro(WebArchiveDebugModeEnabled, webArchiveDebugModeEnabled, Bool, bool, false) \
macro(LocalFileContentSniffingEnabled, localFileContentSniffingEnabled, Bool, bool, false) \
@@ -168,7 +174,7 @@
#define DECLARE_KEY_GETTERS(KeyUpper, KeyLower, TypeName, Type, DefaultValue) const String& KeyLower##Key();
- FOR_EACH_WEBKIT_PREFERENCE(DECLARE_KEY_GETTERS)
+FOR_EACH_WEBKIT_PREFERENCE(DECLARE_KEY_GETTERS)
#undef DECLARE_KEY_GETTERS
@@ -177,7 +183,7 @@
struct WebPreferencesStore {
WebPreferencesStore();
- void encode(CoreIPC::ArgumentEncoder* encoder) const;
+ void encode(CoreIPC::ArgumentEncoder*) const;
static bool decode(CoreIPC::ArgumentDecoder*, WebPreferencesStore&);
// NOTE: The getters in this class have non-standard names to aid in the use of the preference macros.