Modified: trunk/Source/WebKit2/ChangeLog (97473 => 97474)
--- trunk/Source/WebKit2/ChangeLog 2011-10-14 16:49:03 UTC (rev 97473)
+++ trunk/Source/WebKit2/ChangeLog 2011-10-14 17:04:23 UTC (rev 97474)
@@ -1,3 +1,20 @@
+2011-10-14 Nayan Kumar K <[email protected]>
+
+ [GTK] r97438: Inconsistent use of flattening vs flattering in function names/comments
+ https://bugs.webkit.org/show_bug.cgi?id=70092
+
+ Reviewed by Martin Robinson.
+
+ Fixes the miss-spelling of 'PROP_ENABLE_FRAME_FLATTENING' as 'PROP_ENABLE_FRAME_FLATTERING'
+ introduced with change set r97438.
+
+ * UIProcess/API/gtk/WebKitSettings.cpp:
+ (webKitSettingsSetProperty): Property name correction.
+ (webKitSettingsGetProperty): Property name correction.
+ (webkit_settings_class_init): Property name correction.
+ * UIProcess/API/gtk/tests/TestWebKitSettings.cpp:
+ (testWebKitSettings): Spelling correction.
+
2011-10-14 Gopal Raghavan <[email protected]>
[Qt] enable qmltests for qt5
Modified: trunk/Source/WebKit2/UIProcess/API/gtk/WebKitSettings.cpp (97473 => 97474)
--- trunk/Source/WebKit2/UIProcess/API/gtk/WebKitSettings.cpp 2011-10-14 16:49:03 UTC (rev 97473)
+++ trunk/Source/WebKit2/UIProcess/API/gtk/WebKitSettings.cpp 2011-10-14 17:04:23 UTC (rev 97474)
@@ -71,7 +71,7 @@
PROP_ENABLE_HTML5_LOCAL_STORAGE,
PROP_ENABLE_HTML5_DATABASE,
PROP_ENABLE_XSS_AUDITOR,
- PROP_ENABLE_FRAME_FLATTERING,
+ PROP_ENABLE_FRAME_FLATTENING,
PROP_ENABLE_PLUGINS,
PROP_ENABLE_JAVA,
PROP_JAVASCRIPT_CAN_OPEN_WINDOWS_AUTOMATICALLY,
@@ -104,7 +104,7 @@
case PROP_ENABLE_XSS_AUDITOR:
webkit_settings_set_enable_xss_auditor(settings, g_value_get_boolean(value));
break;
- case PROP_ENABLE_FRAME_FLATTERING:
+ case PROP_ENABLE_FRAME_FLATTENING:
webkit_settings_set_enable_frame_flattening(settings, g_value_get_boolean(value));
break;
case PROP_ENABLE_PLUGINS:
@@ -151,7 +151,7 @@
case PROP_ENABLE_XSS_AUDITOR:
g_value_set_boolean(value, webkit_settings_get_enable_xss_auditor(settings));
break;
- case PROP_ENABLE_FRAME_FLATTERING:
+ case PROP_ENABLE_FRAME_FLATTENING:
g_value_set_boolean(value, webkit_settings_get_enable_frame_flattening(settings));
break;
case PROP_ENABLE_PLUGINS:
@@ -313,7 +313,7 @@
*
*/
g_object_class_install_property(gObjectClass,
- PROP_ENABLE_FRAME_FLATTERING,
+ PROP_ENABLE_FRAME_FLATTENING,
g_param_spec_boolean("enable-frame-flattening",
_("Enable frame flattening"),
_("Whether to enable frame flattening."),
Modified: trunk/Source/WebKit2/UIProcess/API/gtk/tests/TestWebKitSettings.cpp (97473 => 97474)
--- trunk/Source/WebKit2/UIProcess/API/gtk/tests/TestWebKitSettings.cpp 2011-10-14 16:49:03 UTC (rev 97473)
+++ trunk/Source/WebKit2/UIProcess/API/gtk/tests/TestWebKitSettings.cpp 2011-10-14 17:04:23 UTC (rev 97474)
@@ -73,7 +73,7 @@
webkit_settings_set_enable_xss_auditor(settings, FALSE);
g_assert(!webkit_settings_get_enable_xss_auditor(settings));
- // Frame flattering is disabled by default.
+ // Frame flattening is disabled by default.
g_assert(!webkit_settings_get_enable_frame_flattening(settings));
webkit_settings_set_enable_frame_flattening(settings, TRUE);
g_assert(webkit_settings_get_enable_frame_flattening(settings));
