From 44aec492c32cd73459f5634d89a12cd3bcb24e43 Mon Sep 17 00:00:00 2001 From: Changhyup Jwa Date: Fri, 4 Oct 2013 18:36:34 +0900 Subject: [PATCH] Revert "Fix the problem that the screen of the application does not rotation automatically." This reverts commit 963e7f2dde53aad71e766f37975f17f6a5aff09c. Change-Id: I51c3ef9ad8b2d4e4a00d9ca919ce0b4059274b1c --- Source/WebKit2/UIProcess/API/efl/PageClientImpl.cpp | 9 --------- Source/WebKit2/UIProcess/API/efl/PageClientImpl.h | 4 ---- Source/WebKit2/UIProcess/API/efl/ewk_view.cpp | 15 --------------- 3 files changed, 28 deletions(-) diff --git a/Source/WebKit2/UIProcess/API/efl/PageClientImpl.cpp b/Source/WebKit2/UIProcess/API/efl/PageClientImpl.cpp index 784a077..b306e20 100755 --- a/Source/WebKit2/UIProcess/API/efl/PageClientImpl.cpp +++ b/Source/WebKit2/UIProcess/API/efl/PageClientImpl.cpp @@ -100,7 +100,6 @@ PageClientImpl::PageClientImpl(EwkViewImpl* viewImpl) , m_scrollPositionBeforePageRendered(IntPoint()) #endif , m_isVisible(true) - , m_deferUpdateViewportSize(false) , m_isScrollableLayerFocused(false) , m_isScrollableNodeFocused(false) #if ENABLE(TIZEN_WEBKIT2_TILED_AC_SHARED_PLATFORM_SURFACE_BACKUP_IMAGE) @@ -193,14 +192,6 @@ void PageClientImpl::updateViewportSize(const IntSize& viewportSize, const int a #if ENABLE(TIZEN_DLOG_SUPPORT) TIZEN_LOGI(" view size: [%d, %d], angle: [%d]", viewportSize.width(), viewportSize.height(), angle); #endif -#if ENABLE(TIZEN_WEBKIT2_VIEW_VISIBILITY) - if (m_deferUpdateViewportSize) { - m_visibleContentRect.setSize(viewportSize); - m_viewImpl->page()->setViewportSize(viewportSize); - m_deferUpdateViewportSize = false; - return; - } -#endif // update viewport size of webkit m_visibleContentRect.setSize(viewportSize); diff --git a/Source/WebKit2/UIProcess/API/efl/PageClientImpl.h b/Source/WebKit2/UIProcess/API/efl/PageClientImpl.h index 2d09a97..311fc18 100755 --- a/Source/WebKit2/UIProcess/API/efl/PageClientImpl.h +++ b/Source/WebKit2/UIProcess/API/efl/PageClientImpl.h @@ -207,9 +207,6 @@ public: #if ENABLE(TIZEN_WEBKIT2_VIEW_VISIBILITY) - void setDeferUpdateViewportSize(bool b) { m_deferUpdateViewportSize = b; } - bool deferUpdateViewportSize() const { return m_deferUpdateViewportSize; } - bool isVisible() const { return m_isVisible; } void setIsVisible(bool isVisible); #endif @@ -455,7 +452,6 @@ protected: bool m_suspendResource; bool m_suspendRequested; bool m_isVisible; - bool m_deferUpdateViewportSize; bool m_isScrollableLayerFocused; bool m_isScrollableNodeFocused; diff --git a/Source/WebKit2/UIProcess/API/efl/ewk_view.cpp b/Source/WebKit2/UIProcess/API/efl/ewk_view.cpp index 9cca291..4f3a6b3 100755 --- a/Source/WebKit2/UIProcess/API/efl/ewk_view.cpp +++ b/Source/WebKit2/UIProcess/API/efl/ewk_view.cpp @@ -929,17 +929,8 @@ static void _ewk_view_smart_resize(Evas_Object* ewkView, Evas_Coord width, Evas_ #if ENABLE(TIZEN_WEBKIT2_TILED_AC) evas_object_image_native_surface_set(smartData->image, 0); -#if ENABLE(TIZEN_WEBKIT2_VIEW_VISIBILITY) - if (impl->pageClient->isVisible()) { - Ecore_Evas* ee = ecore_evas_ecore_evas_get(smartData->base.evas); - impl->pageClient->updateViewportSize(IntSize(width, height), ecore_evas_rotation_get(ee)); - } else - impl->pageClient->setDeferUpdateViewportSize(true); -#else Ecore_Evas* ee = ecore_evas_ecore_evas_get(smartData->base.evas); impl->pageClient->updateViewportSize(IntSize(width, height), ecore_evas_rotation_get(ee)); -#endif - #if ENABLE(TIZEN_RUNTIME_BACKEND_SELECTION) if (!ewk_view_is_opengl_backend(ewkView)) _ewk_view_composite(smartData); @@ -1009,12 +1000,6 @@ static void _ewk_view_smart_calculate(Evas_Object* ewkView) #endif #if ENABLE(TIZEN_WEBKIT2_TILED_BACKING_STORE) && !ENABLE(TIZEN_WEBKIT2_EFL_WTR) Ecore_Evas* ee = ecore_evas_ecore_evas_get(smartData->base.evas); - int newAngle = ecore_evas_rotation_get(ee); -#if ENABLE(TIZEN_WEBKIT2_VIEW_VISIBILITY) - if (impl->pageClient->deferUpdateViewportSize()) { - impl->pageClient->updateViewportSize(IntSize(width, height), newAngle); - } -#endif impl->pageClient->updateVisibleContentRectSize(IntSize(width, height)); if (ewk_view_is_opengl_backend(ewkView)) impl->pageClient->displayViewport(); -- 2.7.4