Current legacy font size mode support added.

Issue : CBWEBVIEW-174
        Font size on editing mode is not changed.

        This commit is a follow-up for f0cf3481 and 0fa07a7 (chromium-ewk) commits.

        Without correct legacy font size mode manipulation possibility,
        the FontSizeCSS editor command does not work fully properly,
        e.g. when in email application user sets
        text font size to 12px and then selects the text again,
        the rich text toolbar will show 2px instead of 12, that is legacy (not pixel) font size value.

Solution : Migrate required implementation from tizen webkit2.

Change-Id: I3cd42256c24f771704ec7307a84ddc43075ca8a3

Conflicts:

	src/third_party/WebKit/Source/core/editing/EditingStyle.cpp
	src/third_party/WebKit/Source/core/frame/Settings.h

Conflicts:

	src/content/public/common/common_param_traits_macros.h
	src/content/renderer/web_preferences.cc
	src/third_party/WebKit/Source/core/editing/EditingStyle.cpp
	src/webkit/common/webpreferences.cc
	src/webkit/common/webpreferences.h

diff --git a/tizen_src/impl/API/ewk_settings_private.cc b/tizen_src/impl/API/ewk_settings_private.cc
index bb4a3028e7c294c39524625fde520d1670dce04d..5bbf8615ad3c42c43ff076fe65385646d56c1ff0 100644 (file)
--- a/tizen_src/impl/API/ewk_settings_private.cc
+++ b/tizen_src/impl/API/ewk_settings_private.cc
@@ -7,3 +7,7 @@ void Ewk_Settings::setSpdyEnabled(bool flag)
   net::HttpStreamFactory::set_spdy_enabled(flag);
 }
 
+void Ewk_Settings::setCurrentLegacyFontSizeMode(tizen_webview::Legacy_Font_Size_Mode mode) {
+    m_currentLegacyFontSizeMode = mode;
+    m_preferences.current_legacy_font_size_mode = static_cast<webkit_glue::LegacyFontSizeMode>(mode);
+}
\ No newline at end of file

diff --git a/tizen_src/impl/API/ewk_settings_private.h b/tizen_src/impl/API/ewk_settings_private.h
index 81e513c5169b911ff94119b6b72aadac3b56dd40..434bf2f1e5bf050a3dda88a45241fdc5a19d6b18 100644 (file)
--- a/tizen_src/impl/API/ewk_settings_private.h
+++ b/tizen_src/impl/API/ewk_settings_private.h
@@ -76,9 +76,7 @@ class Ewk_Settings {
     bool textZoomEnabled() const { return m_textZoomEnabled; }
     void setLoadRemoteImages(bool loadRemoteImages) { m_loadRemoteImages = loadRemoteImages; }
     bool loadRemoteImages() const { return m_loadRemoteImages; }
-    void setCurrentLegacyFontSizeMode(tizen_webview::Legacy_Font_Size_Mode mode) {
-        m_currentLegacyFontSizeMode = mode;
-    }
+    void setCurrentLegacyFontSizeMode(tizen_webview::Legacy_Font_Size_Mode mode);
     tizen_webview::Legacy_Font_Size_Mode currentLegacyFontSizeMode() const { return m_currentLegacyFontSizeMode; }
     void setPasteImageUriEnabled(bool enable) { m_pasteImageUriEnabled = enable; }
     bool pasteImageUriEnabled() const {return m_pasteImageUriEnabled;}