Changeset 161624 in webkit


Ignore:
Timestamp:
Jan 10, 2014 12:00:40 AM (10 years ago)
Author:
jinwoo7.song@samsung.com
Message:

[EFL][WK2] Add APIs for setting and getting the default text encoding name
https://bugs.webkit.org/show_bug.cgi?id=126736

Reviewed by Gyuyoung Kim.

Add APIs to set and get the default text encoding name.

  • UIProcess/API/efl/ewk_settings.cpp:

(ewk_settings_default_text_encoding_name_get):
(ewk_settings_default_text_encoding_name_set):

  • UIProcess/API/efl/ewk_settings.h:
  • UIProcess/API/efl/tests/test_ewk2_settings.cpp:

(TEST_F):

Location:
trunk/Source/WebKit2
Files:
4 edited

Legend:

Unmodified
Added
Removed
  • trunk/Source/WebKit2/ChangeLog

    r161610 r161624  
     12014-01-09  Jinwoo Song  <jinwoo7.song@samsung.com>
     2
     3        [EFL][WK2] Add APIs for setting and getting the default text encoding name
     4        https://bugs.webkit.org/show_bug.cgi?id=126736
     5
     6        Reviewed by Gyuyoung Kim.
     7
     8        Add APIs to set and get the default text encoding name.
     9
     10        * UIProcess/API/efl/ewk_settings.cpp:
     11        (ewk_settings_default_text_encoding_name_get):
     12        (ewk_settings_default_text_encoding_name_set):
     13        * UIProcess/API/efl/ewk_settings.h:
     14        * UIProcess/API/efl/tests/test_ewk2_settings.cpp:
     15        (TEST_F):
     16
    1172014-01-09  Simon Fraser  <simon.fraser@apple.com>
    218
  • trunk/Source/WebKit2/UIProcess/API/efl/ewk_settings.cpp

    r159996 r161624  
    175175}
    176176
     177const char* ewk_settings_default_text_encoding_name_get(const Ewk_Settings* settings)
     178{
     179    EINA_SAFETY_ON_NULL_RETURN_VAL(settings, 0);
     180
     181    WKEinaSharedString name = settings->preferences()->defaultTextEncodingName().utf8().data();
     182
     183    return name;
     184}
     185
     186Eina_Bool ewk_settings_default_text_encoding_name_set(Ewk_Settings* settings, const char* encoding)
     187{
     188    EINA_SAFETY_ON_NULL_RETURN_VAL(settings, false);
     189
     190    settings->preferences()->setDefaultTextEncodingName(String::fromUTF8(encoding));
     191
     192    return true;
     193}
     194
    177195Eina_Bool ewk_settings_encoding_detector_enabled_get(const Ewk_Settings* settings)
    178196{
  • trunk/Source/WebKit2/UIProcess/API/efl/ewk_settings.h

    r159996 r161624  
    235235
    236236/**
    237 * Returns whether the encoding detector is enabled or not.
     237 * Returns whether the encoding detector is enabled or not.
    238238 *
    239239 * @param settings settings object to query whether encoding detector is enabled
     
    243243 */
    244244EAPI Eina_Bool ewk_settings_encoding_detector_enabled_get(const Ewk_Settings *settings);
     245
     246/**
     247 * Sets the default text encoding name.
     248 *
     249 * @param settings settings object to set default text encoding name
     250 * @param encoding default text encoding name
     251 *
     252 * @return @c EINA_TRUE on success or @c EINA_FALSE on failure
     253 */
     254EAPI Eina_Bool ewk_settings_default_text_encoding_name_set(Ewk_Settings *settings, const char *encoding);
     255
     256/**
     257 * Gets the default text encoding name.
     258 *
     259 * The returned string is guaranteed to be stringshared.
     260 *
     261 * @param settings settings object to query default text encoding name
     262 *
     263 * @return default text encoding name
     264 */
     265EAPI const char *ewk_settings_default_text_encoding_name_get(const Ewk_Settings *settings);
    245266
    246267/**
  • trunk/Source/WebKit2/UIProcess/API/efl/tests/test_ewk2_settings.cpp

    r159996 r161624  
    170170}
    171171
     172TEST_F(EWK2UnitTestBase, ewk_settings_default_text_encoding_name)
     173{
     174    Ewk_Settings* settings = ewk_view_settings_get(webView());
     175
     176    // The default encoding name is ISO-8859-1.
     177    ASSERT_STREQ("ISO-8859-1", ewk_settings_default_text_encoding_name_get(settings));
     178
     179    ASSERT_TRUE(ewk_settings_default_text_encoding_name_set(settings, "UTF-8"));
     180    ASSERT_STREQ("UTF-8", ewk_settings_default_text_encoding_name_get(settings));
     181
     182    ASSERT_TRUE(ewk_settings_default_text_encoding_name_set(settings, "ISO-8859-1"));
     183    ASSERT_STREQ("ISO-8859-1", ewk_settings_default_text_encoding_name_get(settings));
     184}
     185
    172186TEST_F(EWK2UnitTestBase, ewk_settings_preferred_minimum_contents_width)
    173187{
Note: See TracChangeset for help on using the changeset viewer.