Title: [136637] trunk/Source/WebKit2
- Revision
- 136637
- Author
- commit-qu...@webkit.org
- Date
- 2012-12-04 21:20:58 -0800 (Tue, 04 Dec 2012)
Log Message
[EFL][WK2] Add APIs to get/set default font size.
https://bugs.webkit.org/show_bug.cgi?id=101921
Patch by Yuni Jeong <yhnet.j...@samsung.com> on 2012-12-04
Reviewed by Gyuyoung Kim.
Add setting APIs for default font size and a unit test.
* UIProcess/API/efl/ewk_settings.cpp:
(ewk_settings_default_font_size_set):
(ewk_settings_default_font_size_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 (136636 => 136637)
--- trunk/Source/WebKit2/ChangeLog 2012-12-05 05:18:55 UTC (rev 136636)
+++ trunk/Source/WebKit2/ChangeLog 2012-12-05 05:20:58 UTC (rev 136637)
@@ -1,3 +1,19 @@
+2012-12-04 Yuni Jeong <yhnet.j...@samsung.com>
+
+ [EFL][WK2] Add APIs to get/set default font size.
+ https://bugs.webkit.org/show_bug.cgi?id=101921
+
+ Reviewed by Gyuyoung Kim.
+
+ Add setting APIs for default font size and a unit test.
+
+ * UIProcess/API/efl/ewk_settings.cpp:
+ (ewk_settings_default_font_size_set):
+ (ewk_settings_default_font_size_get):
+ * UIProcess/API/efl/ewk_settings.h:
+ * UIProcess/API/efl/tests/test_ewk2_settings.cpp:
+ (TEST_F):
+
2012-12-04 Anders Carlsson <ander...@apple.com>
Remove #ifs that are always true
Modified: trunk/Source/WebKit2/UIProcess/API/efl/ewk_settings.cpp (136636 => 136637)
--- trunk/Source/WebKit2/UIProcess/API/efl/ewk_settings.cpp 2012-12-05 05:18:55 UTC (rev 136636)
+++ trunk/Source/WebKit2/UIProcess/API/efl/ewk_settings.cpp 2012-12-05 05:20:58 UTC (rev 136637)
@@ -364,3 +364,19 @@
return settings->preferences()->pluginsEnabled();
}
+
+Eina_Bool ewk_settings_default_font_size_set(Ewk_Settings* settings, int size)
+{
+ EINA_SAFETY_ON_NULL_RETURN_VAL(settings, false);
+
+ settings->preferences()->setDefaultFontSize(size);
+
+ return true;
+}
+
+int ewk_settings_default_font_size_get(const Ewk_Settings* settings)
+{
+ EINA_SAFETY_ON_NULL_RETURN_VAL(settings, 0);
+
+ return settings->preferences()->defaultFontSize();
+}
Modified: trunk/Source/WebKit2/UIProcess/API/efl/ewk_settings.h (136636 => 136637)
--- trunk/Source/WebKit2/UIProcess/API/efl/ewk_settings.h 2012-12-05 05:18:55 UTC (rev 136636)
+++ trunk/Source/WebKit2/UIProcess/API/efl/ewk_settings.h 2012-12-05 05:20:58 UTC (rev 136637)
@@ -447,6 +447,27 @@
*/
EAPI Eina_Bool ewk_settings_plugins_enabled_get(const Ewk_Settings *settings);
+/**
+ * Sets the default font size.
+ *
+ * By default, the default font size is @c 16.
+ *
+ * @param settings settings object to set the default font size
+ * @param size a new default font size to set
+ *
+ * @return @c EINA_TRUE on success or @c EINA_FALSE on failure
+ */
+EAPI Eina_Bool ewk_settings_default_font_size_set(Ewk_Settings *settings, int size);
+
+/**
+ * Returns the default font size.
+ *
+ * @param settings settings object to get the default font size
+ *
+ * @return @c the default font size or @c 0 on failure
+ */
+EAPI int ewk_settings_default_font_size_get(const Ewk_Settings *settings);
+
#ifdef __cplusplus
}
#endif
Modified: trunk/Source/WebKit2/UIProcess/API/efl/tests/test_ewk2_settings.cpp (136636 => 136637)
--- trunk/Source/WebKit2/UIProcess/API/efl/tests/test_ewk2_settings.cpp 2012-12-05 05:18:55 UTC (rev 136636)
+++ trunk/Source/WebKit2/UIProcess/API/efl/tests/test_ewk2_settings.cpp 2012-12-05 05:20:58 UTC (rev 136637)
@@ -235,3 +235,17 @@
ASSERT_TRUE(ewk_settings_plugins_enabled_set(settings, false));
ASSERT_FALSE(ewk_settings_plugins_enabled_get(settings));
}
+
+TEST_F(EWK2UnitTestBase, ewk_settings_default_font_size)
+{
+ Ewk_Settings* settings = ewk_view_settings_get(webView());
+
+ // 16 by default.
+ ASSERT_EQ(16, ewk_settings_default_font_size_get(settings));
+
+ ASSERT_TRUE(ewk_settings_default_font_size_set(settings, 10));
+ ASSERT_EQ(10, ewk_settings_default_font_size_get(settings));
+
+ ASSERT_TRUE(ewk_settings_default_font_size_set(settings, 20));
+ ASSERT_EQ(20, ewk_settings_default_font_size_get(settings));
+}
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
http://lists.webkit.org/mailman/listinfo/webkit-changes
