diff options
Diffstat (limited to 'Source/WebKit2/UIProcess/API/efl/ewk_settings.cpp')
| -rw-r--r-- | Source/WebKit2/UIProcess/API/efl/ewk_settings.cpp | 186 |
1 files changed, 78 insertions, 108 deletions
diff --git a/Source/WebKit2/UIProcess/API/efl/ewk_settings.cpp b/Source/WebKit2/UIProcess/API/efl/ewk_settings.cpp index 7f7c49467..21b4bba09 100644 --- a/Source/WebKit2/UIProcess/API/efl/ewk_settings.cpp +++ b/Source/WebKit2/UIProcess/API/efl/ewk_settings.cpp @@ -27,61 +27,24 @@ #include "config.h" #include "ewk_settings.h" -#include "EwkViewImpl.h" +#include "EwkView.h" #include "ewk_settings_private.h" #include <WebKit2/WebPageGroup.h> #include <WebKit2/WebPageProxy.h> #include <WebKit2/WebPreferences.h> -#if ENABLE(SPELLCHECK) -#include "WKTextChecker.h" -#include "ewk_text_checker_private.h" -#include <Ecore.h> -#include <wtf/Vector.h> -#include <wtf/text/CString.h> -#endif - using namespace WebKit; const WebKit::WebPreferences* EwkSettings::preferences() const { - return m_viewImpl->page()->pageGroup()->preferences(); + return m_view->page()->pageGroup()->preferences(); } WebKit::WebPreferences* EwkSettings::preferences() { - return m_viewImpl->page()->pageGroup()->preferences(); -} - -#if ENABLE(SPELLCHECK) -static struct { - bool isContinuousSpellCheckingEnabled : 1; - Vector<String> spellCheckingLanguages; - Ewk_Settings_Continuous_Spell_Checking_Change_Cb onContinuousSpellChecking; -} ewkTextCheckerSettings = { false, Vector<String>(), 0 }; - -static Eina_Bool onContinuousSpellCheckingIdler(void*) -{ - if (ewkTextCheckerSettings.onContinuousSpellChecking) - ewkTextCheckerSettings.onContinuousSpellChecking(ewkTextCheckerSettings.isContinuousSpellCheckingEnabled); - - return ECORE_CALLBACK_CANCEL; -} - -static Eina_Bool spellCheckingLanguagesSetUpdate(void*) -{ - // FIXME: Consider to delegate calling of this method in WebProcess to do not delay/block UIProcess. - Ewk_Text_Checker::updateSpellCheckingLanguages(ewkTextCheckerSettings.spellCheckingLanguages); - return ECORE_CALLBACK_CANCEL; + return m_view->page()->pageGroup()->preferences(); } -static void spellCheckingLanguagesSet(const Vector<String>& newLanguages) -{ - ewkTextCheckerSettings.spellCheckingLanguages = newLanguages; - ecore_idler_add(spellCheckingLanguagesSetUpdate, 0); -} -#endif // ENABLE(SPELLCHECK) - Eina_Bool ewk_settings_fullscreen_enabled_set(Ewk_Settings* settings, Eina_Bool enable) { #if ENABLE(FULLSCREEN_API) @@ -89,6 +52,8 @@ Eina_Bool ewk_settings_fullscreen_enabled_set(Ewk_Settings* settings, Eina_Bool settings->preferences()->setFullScreenEnabled(enable); return true; #else + UNUSED_PARAM(settings); + UNUSED_PARAM(enable); return false; #endif } @@ -99,6 +64,7 @@ Eina_Bool ewk_settings_fullscreen_enabled_get(const Ewk_Settings* settings) EINA_SAFETY_ON_NULL_RETURN_VAL(settings, false); return settings->preferences()->fullScreenEnabled(); #else + UNUSED_PARAM(settings); return false; #endif } @@ -199,152 +165,156 @@ Eina_Bool ewk_settings_dns_prefetching_enabled_get(const Ewk_Settings* settings) return settings->preferences()->dnsPrefetchingEnabled(); } -void ewk_settings_continuous_spell_checking_change_cb_set(Ewk_Settings_Continuous_Spell_Checking_Change_Cb callback) +Eina_Bool ewk_settings_encoding_detector_enabled_set(Ewk_Settings* settings, Eina_Bool enable) { -#if ENABLE(SPELLCHECK) - ewkTextCheckerSettings.onContinuousSpellChecking = callback; -#endif + EINA_SAFETY_ON_NULL_RETURN_VAL(settings, false); + + settings->preferences()->setUsesEncodingDetector(enable); + + return true; } -Eina_Bool ewk_settings_continuous_spell_checking_enabled_get() +Eina_Bool ewk_settings_encoding_detector_enabled_get(const Ewk_Settings* settings) { -#if ENABLE(SPELLCHECK) - return ewkTextCheckerSettings.isContinuousSpellCheckingEnabled; -#else - return false; -#endif + EINA_SAFETY_ON_NULL_RETURN_VAL(settings, false); + + return settings->preferences()->usesEncodingDetector(); } -void ewk_settings_continuous_spell_checking_enabled_set(Eina_Bool enable) +Eina_Bool ewk_settings_preferred_minimum_contents_width_set(Ewk_Settings *settings, unsigned width) { -#if ENABLE(SPELLCHECK) - enable = !!enable; - if (ewkTextCheckerSettings.isContinuousSpellCheckingEnabled != enable) { - ewkTextCheckerSettings.isContinuousSpellCheckingEnabled = enable; + EINA_SAFETY_ON_NULL_RETURN_VAL(settings, false); - WKTextCheckerContinuousSpellCheckingEnabledStateChanged(enable); + settings->preferences()->setLayoutFallbackWidth(width); - // Sets the default language if user didn't specify any. - if (enable && !Ewk_Text_Checker::hasDictionary()) - spellCheckingLanguagesSet(Vector<String>()); + return true; +} - if (ewkTextCheckerSettings.onContinuousSpellChecking) - ecore_idler_add(onContinuousSpellCheckingIdler, 0); - } -#endif +unsigned ewk_settings_preferred_minimum_contents_width_get(const Ewk_Settings *settings) +{ + EINA_SAFETY_ON_NULL_RETURN_VAL(settings, false); + + return settings->preferences()->layoutFallbackWidth(); } -Eina_List* ewk_settings_spell_checking_available_languages_get() +Eina_Bool ewk_settings_offline_web_application_cache_enabled_set(Ewk_Settings* settings, Eina_Bool enable) { - Eina_List* listOflanguages = 0; -#if ENABLE(SPELLCHECK) - const Vector<String>& languages = Ewk_Text_Checker::availableSpellCheckingLanguages(); - size_t numberOfLanuages = languages.size(); + EINA_SAFETY_ON_NULL_RETURN_VAL(settings, false); + settings->preferences()->setOfflineWebApplicationCacheEnabled(enable); - for (size_t i = 0; i < numberOfLanuages; ++i) - listOflanguages = eina_list_append(listOflanguages, eina_stringshare_add(languages[i].utf8().data())); -#endif - return listOflanguages; + return true; } -void ewk_settings_spell_checking_languages_set(const char* languages) +Eina_Bool ewk_settings_offline_web_application_cache_enabled_get(const Ewk_Settings* settings) { -#if ENABLE(SPELLCHECK) - Vector<String> newLanguages; - String::fromUTF8(languages).split(',', newLanguages); + EINA_SAFETY_ON_NULL_RETURN_VAL(settings, false); - spellCheckingLanguagesSet(newLanguages); -#endif + return settings->preferences()->offlineWebApplicationCacheEnabled(); } -Eina_List* ewk_settings_spell_checking_languages_get() +Eina_Bool ewk_settings_scripts_can_open_windows_set(Ewk_Settings* settings, Eina_Bool enable) { - Eina_List* listOflanguages = 0; -#if ENABLE(SPELLCHECK) - Vector<String> languages = Ewk_Text_Checker::loadedSpellCheckingLanguages(); - size_t numberOfLanuages = languages.size(); + EINA_SAFETY_ON_NULL_RETURN_VAL(settings, false); + settings->preferences()->setJavaScriptCanOpenWindowsAutomatically(enable); + + return true; +} - for (size_t i = 0; i < numberOfLanuages; ++i) - listOflanguages = eina_list_append(listOflanguages, eina_stringshare_add(languages[i].utf8().data())); +Eina_Bool ewk_settings_scripts_can_open_windows_get(const Ewk_Settings* settings) +{ + EINA_SAFETY_ON_NULL_RETURN_VAL(settings, false); -#endif - return listOflanguages; + return settings->preferences()->javaScriptCanOpenWindowsAutomatically(); } -Eina_Bool ewk_settings_encoding_detector_enabled_set(Ewk_Settings* settings, Eina_Bool enable) +Eina_Bool ewk_settings_local_storage_enabled_set(Ewk_Settings* settings, Eina_Bool enable) { EINA_SAFETY_ON_NULL_RETURN_VAL(settings, false); - settings->preferences()->setUsesEncodingDetector(enable); + settings->preferences()->setLocalStorageEnabled(enable); return true; } -Eina_Bool ewk_settings_encoding_detector_enabled_get(const Ewk_Settings* settings) +Eina_Bool ewk_settings_local_storage_enabled_get(const Ewk_Settings* settings) { EINA_SAFETY_ON_NULL_RETURN_VAL(settings, false); - return settings->preferences()->usesEncodingDetector(); + return settings->preferences()->localStorageEnabled(); } -Eina_Bool ewk_settings_preferred_minimum_contents_width_set(Ewk_Settings *settings, unsigned width) +Eina_Bool ewk_settings_plugins_enabled_set(Ewk_Settings* settings, Eina_Bool enable) { EINA_SAFETY_ON_NULL_RETURN_VAL(settings, false); - settings->preferences()->setLayoutFallbackWidth(width); + settings->preferences()->setPluginsEnabled(enable); return true; } -unsigned ewk_settings_preferred_minimum_contents_width_get(const Ewk_Settings *settings) +Eina_Bool ewk_settings_plugins_enabled_get(const Ewk_Settings* settings) { EINA_SAFETY_ON_NULL_RETURN_VAL(settings, false); - return settings->preferences()->layoutFallbackWidth(); + return settings->preferences()->pluginsEnabled(); } -Eina_Bool ewk_settings_offline_web_application_cache_enabled_set(Ewk_Settings* settings, Eina_Bool enable) +Eina_Bool ewk_settings_default_font_size_set(Ewk_Settings* settings, int size) { EINA_SAFETY_ON_NULL_RETURN_VAL(settings, false); - settings->preferences()->setOfflineWebApplicationCacheEnabled(enable); + + settings->preferences()->setDefaultFontSize(size); return true; } -Eina_Bool ewk_settings_offline_web_application_cache_enabled_get(const Ewk_Settings* settings) +int ewk_settings_default_font_size_get(const Ewk_Settings* settings) { - EINA_SAFETY_ON_NULL_RETURN_VAL(settings, false); + EINA_SAFETY_ON_NULL_RETURN_VAL(settings, 0); - return settings->preferences()->offlineWebApplicationCacheEnabled(); + return settings->preferences()->defaultFontSize(); } -Eina_Bool ewk_settings_scripts_can_open_windows_set(Ewk_Settings* settings, Eina_Bool enable) +Eina_Bool ewk_settings_private_browsing_enabled_set(Ewk_Settings* settings, Eina_Bool enable) { EINA_SAFETY_ON_NULL_RETURN_VAL(settings, false); - settings->preferences()->setJavaScriptCanOpenWindowsAutomatically(enable); + + settings->preferences()->setPrivateBrowsingEnabled(enable); return true; } -Eina_Bool ewk_settings_scripts_can_open_windows_get(const Ewk_Settings* settings) +Eina_Bool ewk_settings_private_browsing_enabled_get(const Ewk_Settings* settings) { EINA_SAFETY_ON_NULL_RETURN_VAL(settings, false); - return settings->preferences()->javaScriptCanOpenWindowsAutomatically(); + return settings->preferences()->privateBrowsingEnabled(); } -Eina_Bool ewk_settings_local_storage_enabled_set(Ewk_Settings* settings, Eina_Bool enable) +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()->setLocalStorageEnabled(enable); + settings->preferences()->setTextAutosizingEnabled(enable); return true; +#else + UNUSED_PARAM(settings); + UNUSED_PARAM(enable); + return false; +#endif } -Eina_Bool ewk_settings_local_storage_enabled_get(const Ewk_Settings* settings) +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()->localStorageEnabled(); + return settings->preferences()->textAutosizingEnabled(); +#else + UNUSED_PARAM(settings); + return false; +#endif } + |