From 0987e47d4ed34231164bcc1e344d4ed618af9be3 Mon Sep 17 00:00:00 2001 From: Eunmi Lee Date: Thu, 21 Mar 2013 20:33:05 +0900 Subject: [PATCH] [Arrange Tizen Local Patch] Remove viewWidth and viewHeight from Setting(Preferences). [Title] Remove viewWidth and viewHeight from Setting(Preferences). [Issue#] N/A [Problem] viewWidth and viewHeight is not used anymore. [Cause] The codes which use them was removed. [Solution] Remove viewWidth and viewHeight from Setting(Preferences). Change-Id: Ifec68ed3bffcde7050c7d45a7eb459f4428472a5 --- Source/WebCore/page/Settings.cpp | 4 ---- Source/WebCore/page/Settings.h | 12 ------------ Source/WebKit2/Shared/WebPreferencesStore.cpp | 3 --- Source/WebKit2/Shared/WebPreferencesStore.h | 6 ------ Source/WebKit2/UIProcess/API/efl/ewk_view.cpp | 9 +-------- Source/WebKit2/WebProcess/WebPage/efl/WebPageEfl.cpp | 2 -- 6 files changed, 1 insertion(+), 35 deletions(-) diff --git a/Source/WebCore/page/Settings.cpp b/Source/WebCore/page/Settings.cpp index 6e9076f..7035cd2 100755 --- a/Source/WebCore/page/Settings.cpp +++ b/Source/WebCore/page/Settings.cpp @@ -302,10 +302,6 @@ Settings::Settings(Page* page) , m_applyPageScaleFactorInCompositor(false) , m_loadsImagesAutomaticallyTimer(this, &Settings::loadsImagesAutomaticallyTimerFired) , m_incrementalRenderingSuppressionTimeoutInSeconds(defaultIncrementalRenderingSuppressionTimeoutInSeconds) -#if ENABLE(TIZEN_PREFERENCE) - , m_viewWidth(480) - , m_viewHeight(800) -#endif #if ENABLE(TIZEN_LOAD_REMOTE_IMAGES) , m_loadRemoteImagesTimer(this, &Settings::loadRemoteImagesTimerFired) , m_loadRemoteImages(true) diff --git a/Source/WebCore/page/Settings.h b/Source/WebCore/page/Settings.h index 3bc6eff..2fab6af 100755 --- a/Source/WebCore/page/Settings.h +++ b/Source/WebCore/page/Settings.h @@ -487,14 +487,6 @@ namespace WebCore { void setCrossOriginCheckInGetMatchedCSSRulesDisabled(bool flag) { m_crossOriginCheckInGetMatchedCSSRulesDisabled = flag; } bool crossOriginCheckInGetMatchedCSSRulesDisabled() const { return m_crossOriginCheckInGetMatchedCSSRulesDisabled; } -#if ENABLE(TIZEN_PREFERENCE) - void setViewWidth(int width) { m_viewWidth = width; } - int viewWidth() const { return m_viewWidth; } - - void setViewHeight(int height) { m_viewHeight = height; } - int viewHeight() const { return m_viewHeight; } -#endif - #if ENABLE(TIZEN_LOAD_REMOTE_IMAGES) void setLoadRemoteImages(bool loadRemoteImages); bool loadRemoteImages() { return m_loadRemoteImages; } @@ -843,10 +835,6 @@ namespace WebCore { #if USE(JSC) static bool gShouldRespectPriorityInCSSAttributeSetters; #endif -#if ENABLE(TIZEN_PREFERENCE) - int m_viewWidth; - int m_viewHeight; -#endif #if ENABLE(TIZEN_LOAD_REMOTE_IMAGES) Timer m_loadRemoteImagesTimer; void loadRemoteImagesTimerFired(Timer*); diff --git a/Source/WebKit2/Shared/WebPreferencesStore.cpp b/Source/WebKit2/Shared/WebPreferencesStore.cpp index 8559b85..fb8d0c8 100755 --- a/Source/WebKit2/Shared/WebPreferencesStore.cpp +++ b/Source/WebKit2/Shared/WebPreferencesStore.cpp @@ -130,9 +130,6 @@ uint32_t defaultValueForKey(const String& key) if (defaults.isEmpty()) { #define DEFINE_UINT32_DEFAULTS(KeyUpper, KeyLower, TypeName, Type, DefaultValue) defaults.set(WebPreferencesKey::KeyLower##Key(), DefaultValue); FOR_EACH_WEBKIT_UINT32_PREFERENCE(DEFINE_UINT32_DEFAULTS) -#if ENABLE(TIZEN_PREFERENCE) - FOR_EACH_WEBKIT_TIZEN_UINT32_PREFERENCE(DEFINE_UINT32_DEFAULTS) -#endif #undef DEFINE_UINT32_DEFAULTS } diff --git a/Source/WebKit2/Shared/WebPreferencesStore.h b/Source/WebKit2/Shared/WebPreferencesStore.h index f828494..b148ddc 100755 --- a/Source/WebKit2/Shared/WebPreferencesStore.h +++ b/Source/WebKit2/Shared/WebPreferencesStore.h @@ -232,11 +232,6 @@ namespace WebKit { macro(DefaultViewLevel, defaultViewLevel, Double, double, 1.0) \ \ -#define FOR_EACH_WEBKIT_TIZEN_UINT32_PREFERENCE(macro) \ - macro(ViewWidth, viewWidth, UInt32, uint32_t, 480) \ - macro(ViewHeight, viewHeight, UInt32, uint32_t, 800) \ - \ - #define FOR_EACH_WEBKIT_PREFERENCE(macro) \ FOR_EACH_WEBKIT_BOOL_PREFERENCE(macro) \ FOR_EACH_WEBKIT_DOUBLE_PREFERENCE(macro) \ @@ -244,7 +239,6 @@ namespace WebKit { FOR_EACH_WEBKIT_STRING_PREFERENCE(macro) \ FOR_EACH_WEBKIT_TIZEN_BOOL_PREFERENCE(macro) \ FOR_EACH_WEBKIT_TIZEN_DOUBLE_PREFERENCE(macro) \ - FOR_EACH_WEBKIT_TIZEN_UINT32_PREFERENCE(macro) \ \ #else diff --git a/Source/WebKit2/UIProcess/API/efl/ewk_view.cpp b/Source/WebKit2/UIProcess/API/efl/ewk_view.cpp index 9f3ae26..a77cf46 100755 --- a/Source/WebKit2/UIProcess/API/efl/ewk_view.cpp +++ b/Source/WebKit2/UIProcess/API/efl/ewk_view.cpp @@ -150,7 +150,7 @@ #include "ewk_user_media_private.h" #endif -#if ENABLE(TIZEN_PREFERENCE) +#if ENABLE(TIZEN_RUNTIME_BACKEND_SELECTION) #include "WebPageGroup.h" #include "WebPreferences.h" #endif @@ -1370,13 +1370,6 @@ static void _ewk_view_smart_resize(Evas_Object* ewkView, Evas_Coord width, Evas_ #endif priv->pageClient->displayViewport(); #endif - -#if ENABLE(TIZEN_PREFERENCE) - if (priv && priv->pageClient->page()) { - priv->pageClient->page()->pageGroup()->preferences()->setViewWidth(width); - priv->pageClient->page()->pageGroup()->preferences()->setViewHeight(height); - } -#endif #endif // #if OS(TIZEN) smartData->changed.size = true; diff --git a/Source/WebKit2/WebProcess/WebPage/efl/WebPageEfl.cpp b/Source/WebKit2/WebProcess/WebPage/efl/WebPageEfl.cpp index 8e1a7ca..9254da9 100755 --- a/Source/WebKit2/WebProcess/WebPage/efl/WebPageEfl.cpp +++ b/Source/WebKit2/WebProcess/WebPage/efl/WebPageEfl.cpp @@ -167,8 +167,6 @@ void WebPage::platformPreferencesDidChange(const WebPreferencesStore& store) { Settings* settings = m_page->settings(); settings->setInteractiveFormValidationEnabled(store.getBoolValueForKey(WebPreferencesKey::interactiveFormValidationEnabledKey())); - settings->setViewWidth(store.getUInt32ValueForKey(WebPreferencesKey::viewWidthKey())); - settings->setViewHeight(store.getUInt32ValueForKey(WebPreferencesKey::viewHeightKey())); settings->setUsesEncodingDetector(store.getBoolValueForKey(WebPreferencesKey::usesEncodingDetectorKey())); #if ENABLE(TIZEN_LOAD_REMOTE_IMAGES) settings->setLoadRemoteImages(store.getBoolValueForKey(WebPreferencesKey::loadRemoteImagesKey())); -- 2.7.4