Merge WebKit at r71558: Initial merge by git.

[android-x86/external-webkit.git] / WebKit / gtk / webkit / webkitwebsettings.cpp

diff --git a/WebKit/gtk/webkit/webkitwebsettings.cpp b/WebKit/gtk/webkit/webkitwebsettings.cpp
index cd59bdb..2661b82 100644 (file)
--- a/WebKit/gtk/webkit/webkitwebsettings.cpp
+++ b/WebKit/gtk/webkit/webkitwebsettings.cpp
@@ -689,6 +689,7 @@ static void webkit_web_settings_class_init(WebKitWebSettingsClass* klass)
 
     COMPILE_ASSERT(static_cast<int>(WEBKIT_EDITING_BEHAVIOR_MAC) == static_cast<int>(WebCore::EditingMacBehavior), editing_behavior_type_mac_match);
     COMPILE_ASSERT(static_cast<int>(WEBKIT_EDITING_BEHAVIOR_WINDOWS) == static_cast<int>(WebCore::EditingWindowsBehavior), editing_behavior_type_windows_match);
+    COMPILE_ASSERT(static_cast<int>(WEBKIT_EDITING_BEHAVIOR_UNIX) == static_cast<int>(WebCore::EditingUnixBehavior), editing_behavior_type_unix_match);
 
     /**
     * WebKitWebSettings:editing-behavior
@@ -713,7 +714,7 @@ static void webkit_web_settings_class_init(WebKitWebSettingsClass* klass)
                                                       _("Editing behavior"),
                                                       _("The behavior mode to use in editing mode"),
                                                       WEBKIT_TYPE_EDITING_BEHAVIOR,
-                                                      WEBKIT_EDITING_BEHAVIOR_MAC,
+                                                      WEBKIT_EDITING_BEHAVIOR_UNIX,
                                                       flags));
 
     /**