- Revision
- 133761
- Author
- commit-qu...@webkit.org
- Date
- 2012-11-07 08:04:03 -0800 (Wed, 07 Nov 2012)
Log Message
[EFL][WK2] Add ewk_settings_preferred_minimum_contents_width_get/set API
https://bugs.webkit.org/show_bug.cgi?id=101467
Patch by Mikhail Pozdnyakov <mikhail.pozdnya...@intel.com> on 2012-11-07
Reviewed by Kenneth Rohde Christiansen.
Source/WebKit2:
Added ewk_settings_preferred_minimum_contents_width_get/set API which is used for setting/getting
of default minimum contents width for non viewport meta element sites.
* UIProcess/API/efl/ewk_settings.cpp:
(ewk_settings_preferred_minimum_contents_width_set):
(ewk_settings_preferred_minimum_contents_width_get):
* UIProcess/API/efl/ewk_settings.h:
* UIProcess/API/efl/tests/test_ewk2_settings.cpp:
(TEST_F):
Tools:
Added ewk_settings_preferred_minimum_contents_width_get/set API which is used for setting/getting
of default minimum contents width for non viewport meta element sites.
Set default minimum contents width to '0' for MiniBrowser as it should behave like desktop browser.
* MiniBrowser/efl/main.c:
(window_create):
Modified Paths
Diff
Modified: trunk/Source/WebKit2/ChangeLog (133760 => 133761)
--- trunk/Source/WebKit2/ChangeLog 2012-11-07 15:16:38 UTC (rev 133760)
+++ trunk/Source/WebKit2/ChangeLog 2012-11-07 16:04:03 UTC (rev 133761)
@@ -1,3 +1,20 @@
+2012-11-07 Mikhail Pozdnyakov <mikhail.pozdnya...@intel.com>
+
+ [EFL][WK2] Add ewk_settings_preferred_minimum_contents_width_get/set API
+ https://bugs.webkit.org/show_bug.cgi?id=101467
+
+ Reviewed by Kenneth Rohde Christiansen.
+
+ Added ewk_settings_preferred_minimum_contents_width_get/set API which is used for setting/getting
+ of default minimum contents width for non viewport meta element sites.
+
+ * UIProcess/API/efl/ewk_settings.cpp:
+ (ewk_settings_preferred_minimum_contents_width_set):
+ (ewk_settings_preferred_minimum_contents_width_get):
+ * UIProcess/API/efl/ewk_settings.h:
+ * UIProcess/API/efl/tests/test_ewk2_settings.cpp:
+ (TEST_F):
+
2012-11-07 Yael Aharon <yael.aha...@intel.com>
[EFL][WK2][AC] Avoid creating an empty surface
Modified: trunk/Source/WebKit2/UIProcess/API/efl/ewk_settings.cpp (133760 => 133761)
--- trunk/Source/WebKit2/UIProcess/API/efl/ewk_settings.cpp 2012-11-07 15:16:38 UTC (rev 133760)
+++ trunk/Source/WebKit2/UIProcess/API/efl/ewk_settings.cpp 2012-11-07 16:04:03 UTC (rev 133761)
@@ -286,3 +286,19 @@
return settings->preferences()->usesEncodingDetector();
}
+
+Eina_Bool ewk_settings_preferred_minimum_contents_width_set(Ewk_Settings *settings, unsigned width)
+{
+ EINA_SAFETY_ON_NULL_RETURN_VAL(settings, false);
+
+ settings->preferences()->setLayoutFallbackWidth(width);
+
+ return true;
+}
+
+unsigned ewk_settings_preferred_minimum_contents_width_get(const Ewk_Settings *settings)
+{
+ EINA_SAFETY_ON_NULL_RETURN_VAL(settings, false);
+
+ return settings->preferences()->layoutFallbackWidth();
+}
Modified: trunk/Source/WebKit2/UIProcess/API/efl/ewk_settings.h (133760 => 133761)
--- trunk/Source/WebKit2/UIProcess/API/efl/ewk_settings.h 2012-11-07 15:16:38 UTC (rev 133760)
+++ trunk/Source/WebKit2/UIProcess/API/efl/ewk_settings.h 2012-11-07 16:04:03 UTC (rev 133761)
@@ -321,6 +321,30 @@
*/
EAPI Eina_Bool ewk_settings_encoding_detector_enabled_get(const Ewk_Settings *settings);
+/**
+ * Sets preferred minimum contents width which is used as default minimum contents width
+ * for non viewport meta element sites.
+ *
+ * By default, preferred minimum contents width is equal to @c 980.
+ *
+ * @param settings settings object to set the encoding detector
+ * @param enable @c EINA_TRUE to enable the encoding detector,
+ * @c EINA_FALSE to disable
+ *
+ * @return @c EINA_TRUE on success or @c EINA_FALSE on failure
+ */
+EAPI Eina_Bool ewk_settings_preferred_minimum_contents_width_set(Ewk_Settings *settings, unsigned width);
+
+/**
+ * Returns preferred minimum contents width or @c 0 on failure.
+ *
+ * @param settings settings object to query preferred minimum contents width
+ *
+ * @return preferred minimum contents width
+ * @c 0 on failure
+ */
+EAPI unsigned ewk_settings_preferred_minimum_contents_width_get(const Ewk_Settings *settings);
+
#ifdef __cplusplus
}
#endif
Modified: trunk/Source/WebKit2/UIProcess/API/efl/tests/test_ewk2_settings.cpp (133760 => 133761)
--- trunk/Source/WebKit2/UIProcess/API/efl/tests/test_ewk2_settings.cpp 2012-11-07 15:16:38 UTC (rev 133760)
+++ trunk/Source/WebKit2/UIProcess/API/efl/tests/test_ewk2_settings.cpp 2012-11-07 16:04:03 UTC (rev 133761)
@@ -171,3 +171,14 @@
ASSERT_TRUE(ewk_settings_encoding_detector_enabled_set(settings, false));
ASSERT_FALSE(ewk_settings_encoding_detector_enabled_get(settings));
}
+
+TEST_F(EWK2UnitTestBase, ewk_settings_preferred_minimum_contents_width)
+{
+ Ewk_Settings* settings = ewk_view_settings_get(webView());
+
+ // 980 by default.
+ ASSERT_EQ(980, ewk_settings_preferred_minimum_contents_width_get(settings));
+
+ ASSERT_TRUE(ewk_settings_preferred_minimum_contents_width_set(settings, 0));
+ ASSERT_EQ(0, ewk_settings_preferred_minimum_contents_width_get(settings));
+}
Modified: trunk/Tools/ChangeLog (133760 => 133761)
--- trunk/Tools/ChangeLog 2012-11-07 15:16:38 UTC (rev 133760)
+++ trunk/Tools/ChangeLog 2012-11-07 16:04:03 UTC (rev 133761)
@@ -1,3 +1,17 @@
+2012-11-07 Mikhail Pozdnyakov <mikhail.pozdnya...@intel.com>
+
+ [EFL][WK2] Add ewk_settings_preferred_minimum_contents_width_get/set API
+ https://bugs.webkit.org/show_bug.cgi?id=101467
+
+ Reviewed by Kenneth Rohde Christiansen.
+
+ Added ewk_settings_preferred_minimum_contents_width_get/set API which is used for setting/getting
+ of default minimum contents width for non viewport meta element sites.
+ Set default minimum contents width to '0' for MiniBrowser as it should behave like desktop browser.
+
+ * MiniBrowser/efl/main.c:
+ (window_create):
+
2012-11-07 Thiago Marcos P. Santos <thiago.san...@intel.com>
[EFL] Add EFL to garden-o-matic
Modified: trunk/Tools/MiniBrowser/efl/main.c (133760 => 133761)
--- trunk/Tools/MiniBrowser/efl/main.c 2012-11-07 15:16:38 UTC (rev 133760)
+++ trunk/Tools/MiniBrowser/efl/main.c 2012-11-07 16:04:03 UTC (rev 133761)
@@ -935,6 +935,7 @@
ewk_settings_file_access_from_file_urls_allowed_set(settings, EINA_TRUE);
ewk_settings_frame_flattening_enabled_set(settings, frame_flattening_enabled);
ewk_settings_developer_extras_enabled_set(settings, EINA_TRUE);
+ ewk_settings_preferred_minimum_contents_width_set(settings, 0);
evas_object_smart_callback_add(app_data->webview, "authentication,request", on_authentication_request, app_data);
evas_object_smart_callback_add(app_data->webview, "close,window", on_close_window, app_data);
