Title: [136941] trunk/Source/WebKit2
- Revision
- 136941
- Author
- [email protected]
- Date
- 2012-12-07 02:47:51 -0800 (Fri, 07 Dec 2012)
Log Message
[EFL][WK2] Add ewk_settings APIs for text autosizing
https://bugs.webkit.org/show_bug.cgi?id=103342
Patch by Jaehun Lim <[email protected]> on 2012-12-07
Reviewed by Kenneth Rohde Christiansen.
Add ewk_settings_text_autosizing_enabled_get / set() functions.
Text autosizing is disabled by default.
* UIProcess/API/efl/ewk_settings.cpp:
(ewk_settings_text_autosizing_enabled_set):
(ewk_settings_text_autosizing_enabled_get):
* UIProcess/API/efl/ewk_settings.h:
* UIProcess/API/efl/tests/test_ewk2_settings.cpp:
(TEST_F):
Modified Paths
Diff
Modified: trunk/Source/WebKit2/ChangeLog (136940 => 136941)
--- trunk/Source/WebKit2/ChangeLog 2012-12-07 10:22:06 UTC (rev 136940)
+++ trunk/Source/WebKit2/ChangeLog 2012-12-07 10:47:51 UTC (rev 136941)
@@ -1,3 +1,20 @@
+2012-12-07 Jaehun Lim <[email protected]>
+
+ [EFL][WK2] Add ewk_settings APIs for text autosizing
+ https://bugs.webkit.org/show_bug.cgi?id=103342
+
+ Reviewed by Kenneth Rohde Christiansen.
+
+ Add ewk_settings_text_autosizing_enabled_get / set() functions.
+ Text autosizing is disabled by default.
+
+ * UIProcess/API/efl/ewk_settings.cpp:
+ (ewk_settings_text_autosizing_enabled_set):
+ (ewk_settings_text_autosizing_enabled_get):
+ * UIProcess/API/efl/ewk_settings.h:
+ * UIProcess/API/efl/tests/test_ewk2_settings.cpp:
+ (TEST_F):
+
2012-12-06 Rick Byers <[email protected]>
CSS cursor property should support webkit-image-set
Modified: trunk/Source/WebKit2/UIProcess/API/efl/ewk_settings.cpp (136940 => 136941)
--- trunk/Source/WebKit2/UIProcess/API/efl/ewk_settings.cpp 2012-12-07 10:22:06 UTC (rev 136940)
+++ trunk/Source/WebKit2/UIProcess/API/efl/ewk_settings.cpp 2012-12-07 10:47:51 UTC (rev 136941)
@@ -396,3 +396,31 @@
return settings->preferences()->privateBrowsingEnabled();
}
+
+Eina_Bool ewk_settings_text_autosizing_enabled_set(Ewk_Settings* settings, Eina_Bool enable)
+{
+#if ENABLE(TEXT_AUTOSIZING)
+ EINA_SAFETY_ON_NULL_RETURN_VAL(settings, false);
+
+ settings->preferences()->setTextAutosizingEnabled(enable);
+
+ return true;
+#else
+ UNUSED_PARAM(settings);
+ UNUSED_PARAM(enable);
+ return false;
+#endif
+}
+
+Eina_Bool ewk_settings_text_autosizing_enabled_get(const Ewk_Settings* settings)
+{
+#if ENABLE(TEXT_AUTOSIZING)
+ EINA_SAFETY_ON_NULL_RETURN_VAL(settings, false);
+
+ return settings->preferences()->textAutosizingEnabled();
+#else
+ UNUSED_PARAM(settings);
+ return false;
+#endif
+}
+
Modified: trunk/Source/WebKit2/UIProcess/API/efl/ewk_settings.h (136940 => 136941)
--- trunk/Source/WebKit2/UIProcess/API/efl/ewk_settings.h 2012-12-07 10:22:06 UTC (rev 136940)
+++ trunk/Source/WebKit2/UIProcess/API/efl/ewk_settings.h 2012-12-07 10:47:51 UTC (rev 136941)
@@ -494,6 +494,34 @@
*/
EAPI Eina_Bool ewk_settings_private_browsing_enabled_get(const Ewk_Settings *settings);
+/**
+ * Enables/disables text autosizing.
+ *
+ * By default, the text autosizing is disabled.
+ *
+ * @param settings settings object to set the text autosizing
+ * @param enable @c EINA_TRUE to enable the text autosizing
+ * @c EINA_FALSE to disable
+ *
+ * @return @c EINA_TRUE on success or @c EINA_FALSE on failure
+ *
+ * @see ewk_settings_text_autosizing_enabled_get()
+ */
+EAPI Eina_Bool ewk_settings_text_autosizing_enabled_set(Ewk_Settings *settings, Eina_Bool enable);
+
+/**
+ * Returns whether the text autosizing is enabled.
+ *
+ * The text autosizing is a feature which adjusts the font size of text in wide
+ * columns, and makes text more legible.
+ *
+ * @param settings settings object to query whether text autosizing is enabled
+ *
+ * @return @c EINA_TRUE if the text autosizing is enabled
+ * @c EINA_FALSE if not or on failure
+ */
+EAPI Eina_Bool ewk_settings_text_autosizing_enabled_get(const Ewk_Settings *settings);
+
#ifdef __cplusplus
}
#endif
Modified: trunk/Source/WebKit2/UIProcess/API/efl/tests/test_ewk2_settings.cpp (136940 => 136941)
--- trunk/Source/WebKit2/UIProcess/API/efl/tests/test_ewk2_settings.cpp 2012-12-07 10:22:06 UTC (rev 136940)
+++ trunk/Source/WebKit2/UIProcess/API/efl/tests/test_ewk2_settings.cpp 2012-12-07 10:47:51 UTC (rev 136941)
@@ -263,3 +263,27 @@
ASSERT_TRUE(ewk_settings_private_browsing_enabled_set(settings, false));
ASSERT_FALSE(ewk_settings_private_browsing_enabled_get(settings));
}
+
+TEST_F(EWK2UnitTestBase, ewk_settings_text_autosizing_enabled)
+{
+ Ewk_Settings* settings = ewk_view_settings_get(webView());
+
+#if ENABLE(TEXT_AUTOSIZING)
+ // Text autosizing should be disabled by default.
+ ASSERT_FALSE(ewk_settings_text_autosizing_enabled_get(settings));
+
+ ASSERT_TRUE(ewk_settings_text_autosizing_enabled_set(settings, false));
+ ASSERT_FALSE(ewk_settings_text_autosizing_enabled_get(settings));
+
+ ASSERT_TRUE(ewk_settings_text_autosizing_enabled_set(settings, true));
+ ASSERT_TRUE(ewk_settings_text_autosizing_enabled_get(settings));
+#else
+ ASSERT_FALSE(ewk_settings_text_autosizing_enabled_get(settings));
+
+ ASSERT_FALSE(ewk_settings_text_autosizing_enabled_set(settings, false));
+ ASSERT_FALSE(ewk_settings_text_autosizing_enabled_get(settings));
+
+ ASSERT_FALSE(ewk_settings_text_autosizing_enabled_set(settings, true));
+ ASSERT_FALSE(ewk_settings_text_autosizing_enabled_get(settings));
+#endif
+}
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo/webkit-changes
