Revert "Block UI events not to be sent to the WebProcess while js popup is displayed."

This reverts commit b2d75c5b02f5c1a4b9196609d80e72b5294490ed

Change-Id: I10b0b697461930a04000ed1929a77041145514a8

diff --git a/Source/WebKit2/UIProcess/API/efl/ewk_view.cpp b/Source/WebKit2/UIProcess/API/efl/ewk_view.cpp
index cdbf605..7697b6e 100755 (executable)
--- a/Source/WebKit2/UIProcess/API/efl/ewk_view.cpp
+++ b/Source/WebKit2/UIProcess/API/efl/ewk_view.cpp
@@ -275,10 +275,6 @@ struct _Ewk_View_Private_Data {
         void* data;
     } orientationLock;
 #endif
-
-#if ENABLE(TIZEN_WEBKIT2_ROTATION_WHILE_JAVASCRIPT_POPUP)
-    bool isJavaScriptPopupStarted;
-#endif
 #endif // #if OS(TIZEN)
 };
 
@@ -461,11 +457,6 @@ static Eina_Bool _ewk_view_smart_mouse_wheel(Ewk_View_Smart_Data* smartData, con
 {
     EWK_VIEW_PRIV_GET_OR_RETURN(smartData, priv, false)
 
-#if ENABLE(TIZEN_WEBKIT2_ROTATION_WHILE_JAVASCRIPT_POPUP)
-    if (priv->isJavaScriptPopupStarted)
-        return false;
-#endif
-
     Evas_Point position = {smartData->view.x, smartData->view.y};
     priv->pageClient->page()->handleWheelEvent(NativeWebWheelEvent(wheelEvent, &position));
     return true;
@@ -477,11 +468,6 @@ void ewkViewHandleTouchEvent(Evas_Object* ewkView, Ewk_Touch_Event_Type type)
     Ewk_View_Smart_Data* smartData = static_cast<Ewk_View_Smart_Data*>(evas_object_smart_data_get(ewkView));
     EWK_VIEW_PRIV_GET_OR_RETURN(smartData, priv)
 
-#if ENABLE(TIZEN_WEBKIT2_ROTATION_WHILE_JAVASCRIPT_POPUP)
-    if (priv->isJavaScriptPopupStarted)
-        return;
-#endif
-
     Eina_List* points = 0;
     int count = evas_touch_point_list_count(smartData->base.evas);
     Ewk_Touch_Point* point;
@@ -505,11 +491,6 @@ static Eina_Bool _ewk_view_touch_animator(void *data)
     Ewk_View_Smart_Data* smartData = static_cast<Ewk_View_Smart_Data*>(data);
     EWK_VIEW_PRIV_GET_OR_RETURN(smartData, priv, false)
 
-#if ENABLE(TIZEN_WEBKIT2_ROTATION_WHILE_JAVASCRIPT_POPUP)
-    if (priv->isJavaScriptPopupStarted)
-        return false;
-#endif
-
     if (!priv->exceedTouchMoveThreshold && evas_touch_point_list_count(smartData->base.evas)) {
         Evas_Coord x, y;
         evas_touch_point_list_nth_xy_get(smartData->base.evas, 0, &x, &y);
@@ -530,11 +511,6 @@ static Eina_Bool _ewk_view_smart_mouse_down(Ewk_View_Smart_Data* smartData, cons
 {
     EWK_VIEW_PRIV_GET_OR_RETURN(smartData, priv, false)
 
-#if ENABLE(TIZEN_WEBKIT2_ROTATION_WHILE_JAVASCRIPT_POPUP)
-    if (priv->isJavaScriptPopupStarted)
-        return false;
-#endif
-
     Evas_Point position = {smartData->view.x, smartData->view.y};
     priv->pageClient->page()->handleMouseEvent(NativeWebMouseEvent(downEvent, &position));
     return true;
@@ -544,11 +520,6 @@ static Eina_Bool _ewk_view_smart_mouse_up(Ewk_View_Smart_Data* smartData, const
 {
     EWK_VIEW_PRIV_GET_OR_RETURN(smartData, priv, false)
 
-#if ENABLE(TIZEN_WEBKIT2_ROTATION_WHILE_JAVASCRIPT_POPUP)
-    if (priv->isJavaScriptPopupStarted)
-        return false;
-#endif
-
     Evas_Point position = {smartData->view.x, smartData->view.y};
     priv->pageClient->page()->handleMouseEvent(NativeWebMouseEvent(upEvent, &position));
     return true;
@@ -558,11 +529,6 @@ static Eina_Bool _ewk_view_smart_mouse_move(Ewk_View_Smart_Data* smartData, cons
 {
     EWK_VIEW_PRIV_GET_OR_RETURN(smartData, priv, false)
 
-#if ENABLE(TIZEN_WEBKIT2_ROTATION_WHILE_JAVASCRIPT_POPUP)
-    if (priv->isJavaScriptPopupStarted)
-        return false;
-#endif
-
     Evas_Point position = {smartData->view.x, smartData->view.y};
     priv->pageClient->page()->handleMouseEvent(NativeWebMouseEvent(moveEvent, &position));
     return true;
@@ -572,11 +538,6 @@ static Eina_Bool _ewk_view_smart_key_down(Ewk_View_Smart_Data* smartData, const
 {
     EWK_VIEW_PRIV_GET_OR_RETURN(smartData, priv, false)
 
-#if ENABLE(TIZEN_WEBKIT2_ROTATION_WHILE_JAVASCRIPT_POPUP)
-    if (priv->isJavaScriptPopupStarted)
-        return false;
-#endif
-
 #if ENABLE(TIZEN_ISF_PORT)
     Ecore_IMF_Event IMFEvent;
     ecore_imf_evas_event_key_down_wrap(const_cast<Evas_Event_Key_Down*>(downEvent), &IMFEvent.key_down);
@@ -594,11 +555,6 @@ static Eina_Bool _ewk_view_smart_key_up(Ewk_View_Smart_Data* smartData, const Ev
 {
     EWK_VIEW_PRIV_GET_OR_RETURN(smartData, priv, false)
 
-#if ENABLE(TIZEN_WEBKIT2_ROTATION_WHILE_JAVASCRIPT_POPUP)
-    if (priv->isJavaScriptPopupStarted)
-        return false;
-#endif
-
     priv->pageClient->page()->handleKeyboardEvent(NativeWebKeyboardEvent(upEvent));
     return true;
 }
@@ -637,11 +593,6 @@ static Eina_Bool _ewk_view_smart_gesture_start(Ewk_View_Smart_Data* smartData, c
 {
     EWK_VIEW_PRIV_GET_OR_RETURN(smartData, priv, false)
 
-#if ENABLE(TIZEN_WEBKIT2_ROTATION_WHILE_JAVASCRIPT_POPUP)
-    if (priv->isJavaScriptPopupStarted)
-        return false;
-#endif
-
     switch (event->type) {
     case EWK_GESTURE_TAP:
         priv->gestureClient->startTap(IntPoint(event->position.x, event->position.y));
@@ -673,11 +624,6 @@ static Eina_Bool _ewk_view_smart_gesture_end(Ewk_View_Smart_Data* smartData, con
 {
     EWK_VIEW_PRIV_GET_OR_RETURN(smartData, priv, false)
 
-#if ENABLE(TIZEN_WEBKIT2_ROTATION_WHILE_JAVASCRIPT_POPUP)
-    if (priv->isJavaScriptPopupStarted)
-        return false;
-#endif
-
     switch (event->type) {
     case EWK_GESTURE_TAP:
         if (event->count == 1)
@@ -709,11 +655,6 @@ static Eina_Bool _ewk_view_smart_gesture_move(Ewk_View_Smart_Data* smartData, co
 {
     EWK_VIEW_PRIV_GET_OR_RETURN(smartData, priv, false)
 
-#if ENABLE(TIZEN_WEBKIT2_ROTATION_WHILE_JAVASCRIPT_POPUP)
-    if (priv->isJavaScriptPopupStarted)
-        return false;
-#endif
-
     switch (event->type) {
     case EWK_GESTURE_PAN:
         priv->gestureClient->movePan(IntPoint(event->position.x, event->position.y));
@@ -824,13 +765,6 @@ static void _ewk_view_on_mouse_wheel(void* data, Evas* canvas, Evas_Object* ewkV
     Ewk_View_Smart_Data* smartData = static_cast<Ewk_View_Smart_Data*>(data);
     EINA_SAFETY_ON_NULL_RETURN(smartData->api);
     EINA_SAFETY_ON_NULL_RETURN(smartData->api->mouse_wheel);
-#if ENABLE(TIZEN_WEBKIT2_ROTATION_WHILE_JAVASCRIPT_POPUP)
-    EWK_VIEW_PRIV_GET_OR_RETURN(smartData, priv)
-
-    if (priv->isJavaScriptPopupStarted)
-        return;
-#endif
-
     smartData->api->mouse_wheel(smartData, wheelEvent);
 }
 
@@ -840,13 +774,6 @@ static void _ewk_view_on_mouse_down(void* data, Evas* canvas, Evas_Object* ewkVi
     Ewk_View_Smart_Data* smartData = static_cast<Ewk_View_Smart_Data*>(data);
     EINA_SAFETY_ON_NULL_RETURN(smartData->api);
     EINA_SAFETY_ON_NULL_RETURN(smartData->api->mouse_down);
-#if ENABLE(TIZEN_WEBKIT2_ROTATION_WHILE_JAVASCRIPT_POPUP)
-    EWK_VIEW_PRIV_GET_OR_RETURN(smartData, priv)
-
-    if (priv->isJavaScriptPopupStarted)
-        return;
-#endif
-
     smartData->api->mouse_down(smartData, downEvent);
 }
 
@@ -856,13 +783,6 @@ static void _ewk_view_on_mouse_up(void* data, Evas* canvas, Evas_Object* ewkView
     Evas_Event_Mouse_Up* upEvent = static_cast<Evas_Event_Mouse_Up*>(eventInfo);
     EINA_SAFETY_ON_NULL_RETURN(smartData->api);
     EINA_SAFETY_ON_NULL_RETURN(smartData->api->mouse_up);
-#if ENABLE(TIZEN_WEBKIT2_ROTATION_WHILE_JAVASCRIPT_POPUP)
-    EWK_VIEW_PRIV_GET_OR_RETURN(smartData, priv)
-
-    if (priv->isJavaScriptPopupStarted)
-        return;
-#endif
-
     smartData->api->mouse_up(smartData, upEvent);
 }
 
@@ -872,13 +792,6 @@ static void _ewk_view_on_mouse_move(void* data, Evas* canvas, Evas_Object* ewkVi
     Ewk_View_Smart_Data* smartData = static_cast<Ewk_View_Smart_Data*>(data);
     EINA_SAFETY_ON_NULL_RETURN(smartData->api);
     EINA_SAFETY_ON_NULL_RETURN(smartData->api->mouse_move);
-#if ENABLE(TIZEN_WEBKIT2_ROTATION_WHILE_JAVASCRIPT_POPUP)
-    EWK_VIEW_PRIV_GET_OR_RETURN(smartData, priv)
-
-    if (priv->isJavaScriptPopupStarted)
-        return;
-#endif
-
     smartData->api->mouse_move(smartData, moveEvent);
 }
 
@@ -889,13 +802,6 @@ static void _ewk_view_on_key_down(void* data, Evas* canvas, Evas_Object* ewkView
 
     EINA_SAFETY_ON_NULL_RETURN(smartData->api);
     EINA_SAFETY_ON_NULL_RETURN(smartData->api->key_down);
-#if ENABLE(TIZEN_WEBKIT2_ROTATION_WHILE_JAVASCRIPT_POPUP)
-    EWK_VIEW_PRIV_GET_OR_RETURN(smartData, priv)
-
-    if (priv->isJavaScriptPopupStarted)
-        return;
-#endif
-
     smartData->api->key_down(smartData, downEvent);
 }
 
@@ -905,13 +811,6 @@ static void _ewk_view_on_key_up(void* data, Evas* canvas, Evas_Object* ewkView,
     Ewk_View_Smart_Data* smartData = static_cast<Ewk_View_Smart_Data*>(data);
     EINA_SAFETY_ON_NULL_RETURN(smartData->api);
     EINA_SAFETY_ON_NULL_RETURN(smartData->api->key_up);
-#if ENABLE(TIZEN_WEBKIT2_ROTATION_WHILE_JAVASCRIPT_POPUP)
-    EWK_VIEW_PRIV_GET_OR_RETURN(smartData, priv)
-
-    if (priv->isJavaScriptPopupStarted)
-        return;
-#endif
-
     smartData->api->key_up(smartData, upEvent);
 }
 
@@ -946,11 +845,6 @@ static void _ewk_view_on_touch_down(void* data, Evas* canvas, Evas_Object* ewkVi
     EWK_VIEW_SD_GET_OR_RETURN(ewkView, smartData);
     EWK_VIEW_PRIV_GET_OR_RETURN(smartData, priv);
 
-#if ENABLE(TIZEN_WEBKIT2_ROTATION_WHILE_JAVASCRIPT_POPUP)
-    if (priv->isJavaScriptPopupStarted)
-        return;
-#endif
-
     // Start touchAnimator if current number of touch is one.
     if (evas_touch_point_list_count(smartData->base.evas) == 1) {
         priv->gestureRecognizer->initializeGesture();
@@ -970,11 +864,6 @@ static void _ewk_view_on_touch_up(void* data, Evas* canvas, Evas_Object* ewkView
     EWK_VIEW_SD_GET_OR_RETURN(ewkView, smartData);
     EWK_VIEW_PRIV_GET_OR_RETURN(smartData, priv);
 
-#if ENABLE(TIZEN_WEBKIT2_ROTATION_WHILE_JAVASCRIPT_POPUP)
-    if (priv->isJavaScriptPopupStarted)
-        return;
-#endif
-
     // Stop touchAnimator if current number of touch is one.
     if (evas_touch_point_list_count(smartData->base.evas) == 1 && priv->touchAnimator) {
         ecore_animator_del(priv->touchAnimator);
@@ -994,11 +883,6 @@ Eina_Bool _ewk_view_text_selection_down(Ewk_View_Smart_Data* smartData, int x, i
 {
     EWK_VIEW_PRIV_GET_OR_RETURN(smartData, priv, false);
 
-#if ENABLE(TIZEN_WEBKIT2_ROTATION_WHILE_JAVASCRIPT_POPUP)
-    if (priv->isJavaScriptPopupStarted)
-        return false;
-#endif
-
     IntPoint point(x, y);
     priv->pageClient->textSelectionDown(point, true);
 
@@ -1009,11 +893,6 @@ Eina_Bool _ewk_view_text_selection_move(Ewk_View_Smart_Data* smartData, int x, i
 {
     EWK_VIEW_PRIV_GET_OR_RETURN(smartData, priv, false);
 
-#if ENABLE(TIZEN_WEBKIT2_ROTATION_WHILE_JAVASCRIPT_POPUP)
-    if (priv->isJavaScriptPopupStarted)
-        return false;
-#endif
-
     IntPoint point(x, y);
     priv->pageClient->textSelectionMove(point, true);
 
@@ -1024,11 +903,6 @@ Eina_Bool _ewk_view_text_selection_up(Ewk_View_Smart_Data* smartData, int x, int
 {
     EWK_VIEW_PRIV_GET_OR_RETURN(smartData, priv, false);
 
-#if ENABLE(TIZEN_WEBKIT2_ROTATION_WHILE_JAVASCRIPT_POPUP)
-    if (priv->isJavaScriptPopupStarted)
-        return false;
-#endif
-
     IntPoint point(x, y);
     priv->pageClient->textSelectionUp(point);
 
@@ -1086,10 +960,6 @@ static Ewk_View_Private_Data* _ewk_view_priv_new(Ewk_View_Smart_Data* smartData)
 #if ENABLE(TIZEN_DATALIST_ELEMENT)
     priv->dataList = 0;
 #endif
-#if ENABLE(TIZEN_WEBKIT2_ROTATION_WHILE_JAVASCRIPT_POPUP)
-    priv->isJavaScriptPopupStarted = false;
-#endif
-
 
 #endif // #if OS(TIZEN)
 
@@ -3064,24 +2934,12 @@ bool ewkViewRunJavaScriptAlert(Evas_Object* ewkView, WKStringRef alertText)
     EWK_VIEW_PRIV_GET_OR_RETURN(smartData, priv, false);
     if (!priv->alertContext || !priv->alertContext->javascriptAlertCallback)
         return false;
-#if ENABLE(TIZEN_WEBKIT2_ROTATION_WHILE_JAVASCRIPT_POPUP)
-    if (priv->isJavaScriptPopupStarted)
-        return false;
-#endif
     EINA_SAFETY_ON_FALSE_RETURN_VAL(priv->alertContext->ewkView == ewkView, false);
 
     int length = WKStringGetMaximumUTF8CStringSize(alertText);
     OwnArrayPtr<char> alertTextBuffer = adoptArrayPtr(new char[length]);
     WKStringGetUTF8CString(alertText, alertTextBuffer.get(), length);
-#if ENABLE(TIZEN_WEBKIT2_ROTATION_WHILE_JAVASCRIPT_POPUP)
-    if (priv->alertContext->javascriptAlertCallback(priv->alertContext->ewkView, alertTextBuffer.get(), priv->alertContext->userData) == EINA_FALSE)
-        return false;
-
-    priv->isJavaScriptPopupStarted = true;
-    return true;
-#else
     return priv->alertContext->javascriptAlertCallback(priv->alertContext->ewkView, alertTextBuffer.get(), priv->alertContext->userData) == EINA_TRUE;
-#endif
 }
 
 bool ewkViewRunJavaScriptConfirm(Evas_Object* ewkView, WKStringRef message)
@@ -3090,24 +2948,12 @@ bool ewkViewRunJavaScriptConfirm(Evas_Object* ewkView, WKStringRef message)
     EWK_VIEW_PRIV_GET_OR_RETURN(smartData, priv, false);
     if (!priv->confirmContext || !priv->confirmContext->javascriptConfirmCallback)
         return false;
-#if ENABLE(TIZEN_WEBKIT2_ROTATION_WHILE_JAVASCRIPT_POPUP)
-    if (priv->isJavaScriptPopupStarted)
-        return false;
-#endif
     EINA_SAFETY_ON_FALSE_RETURN_VAL(priv->confirmContext->ewkView == ewkView, false);
 
     int length = WKStringGetMaximumUTF8CStringSize(message);
     OwnArrayPtr<char> messageBuffer = adoptArrayPtr(new char[length]);
     WKStringGetUTF8CString(message, messageBuffer.get(), length);
-#if ENABLE(TIZEN_WEBKIT2_ROTATION_WHILE_JAVASCRIPT_POPUP)
-    if (priv->confirmContext->javascriptConfirmCallback(priv->confirmContext->ewkView, messageBuffer.get(), priv->confirmContext->userData) == EINA_FALSE)
-        return false;
-
-    priv->isJavaScriptPopupStarted = true;
-    return true;
-#else
     return priv->confirmContext->javascriptConfirmCallback(priv->confirmContext->ewkView, messageBuffer.get(), priv->confirmContext->userData) == EINA_TRUE;
-#endif
 }
 
 bool ewkViewRunJavaScriptPrompt(Evas_Object* ewkView, WKStringRef message, WKStringRef defaultValue)
@@ -3116,10 +2962,6 @@ bool ewkViewRunJavaScriptPrompt(Evas_Object* ewkView, WKStringRef message, WKStr
     EWK_VIEW_PRIV_GET_OR_RETURN(smartData, priv, false);
     if (!priv->promptContext || !priv->promptContext->javascriptPromptCallback)
         return false;
-#if ENABLE(TIZEN_WEBKIT2_ROTATION_WHILE_JAVASCRIPT_POPUP)
-    if (priv->isJavaScriptPopupStarted)
-        return false;
-#endif
     EINA_SAFETY_ON_FALSE_RETURN_VAL(priv->promptContext->ewkView == ewkView, false);
 
     int length = WKStringGetMaximumUTF8CStringSize(message);
@@ -3128,15 +2970,7 @@ bool ewkViewRunJavaScriptPrompt(Evas_Object* ewkView, WKStringRef message, WKStr
     length = WKStringGetMaximumUTF8CStringSize(defaultValue);
     OwnArrayPtr<char> defaultValueBuffer = adoptArrayPtr(new char[length]);
     WKStringGetUTF8CString(defaultValue, defaultValueBuffer.get(), length);
-#if ENABLE(TIZEN_WEBKIT2_ROTATION_WHILE_JAVASCRIPT_POPUP)
-    if (priv->promptContext->javascriptPromptCallback(priv->promptContext->ewkView, messageBuffer.get(), defaultValueBuffer.get(), priv->promptContext->userData) == EINA_FALSE)
-        return false;
-
-    priv->isJavaScriptPopupStarted = true;
-    return true;
-#else
     return priv->promptContext->javascriptPromptCallback(priv->promptContext->ewkView, messageBuffer.get(), defaultValueBuffer.get(), priv->promptContext->userData) == EINA_TRUE;
-#endif
 }
 
 bool ewkViewRunOpenPanel(Evas_Object* ewkView, WKOpenPanelParametersRef parameters, WKOpenPanelResultListenerRef listener)
@@ -3198,10 +3032,6 @@ void ewk_view_javascript_alert_reply(Evas_Object* ewkView)
     EWK_VIEW_SD_GET_OR_RETURN(ewkView, smartData);
     EWK_VIEW_PRIV_GET_OR_RETURN(smartData, priv);
 
-#if ENABLE(TIZEN_WEBKIT2_ROTATION_WHILE_JAVASCRIPT_POPUP)
-    priv->isJavaScriptPopupStarted = false;
-#endif
-
     WKPageReplyJavaScriptAlert(toAPI(ewk_view_page_get(ewkView)));
 }
 
@@ -3222,10 +3052,6 @@ void ewk_view_javascript_confirm_reply(Evas_Object* ewkView, Eina_Bool result)
     EWK_VIEW_SD_GET_OR_RETURN(ewkView, smartData);
     EWK_VIEW_PRIV_GET_OR_RETURN(smartData, priv);
 
-#if ENABLE(TIZEN_WEBKIT2_ROTATION_WHILE_JAVASCRIPT_POPUP)
-    priv->isJavaScriptPopupStarted = false;
-#endif
-
     WKPageReplyJavaScriptConfirm(toAPI(ewk_view_page_get(ewkView)), result == EINA_TRUE);
 }
 
@@ -3246,10 +3072,6 @@ void ewk_view_javascript_prompt_reply(Evas_Object* ewkView, const char* result)
     EWK_VIEW_SD_GET_OR_RETURN(ewkView, smartData);
     EWK_VIEW_PRIV_GET_OR_RETURN(smartData, priv);
 
-#if ENABLE(TIZEN_WEBKIT2_ROTATION_WHILE_JAVASCRIPT_POPUP)
-    priv->isJavaScriptPopupStarted = false;
-#endif
-
     WKRetainPtr<WKStringRef> resultString(AdoptWK, WKStringCreateWithUTF8CString(result));
     WKPageReplyJavaScriptPrompt(toAPI(ewk_view_page_get(ewkView)), result ? resultString.get() : 0);
 }

diff --git a/Source/WebKit2/UIProcess/WebPageProxy.cpp b/Source/WebKit2/UIProcess/WebPageProxy.cpp
index 760d5dc..fd6b7fc 100755 (executable)
--- a/Source/WebKit2/UIProcess/WebPageProxy.cpp
+++ b/Source/WebKit2/UIProcess/WebPageProxy.cpp
@@ -1012,11 +1012,6 @@ void WebPageProxy::handleMouseEvent(const NativeWebMouseEvent& event)
     if (!isValid())
         return;
 
-#if ENABLE(TIZEN_WEBKIT2_ROTATION_WHILE_JAVASCRIPT_POPUP)
-    if (isWaitingForJavaScriptPopupReply())
-        return;
-#endif
-
     // NOTE: This does not start the responsiveness timer because mouse move should not indicate interaction.
     if (event.type() != WebEvent::MouseMove)
         process()->responsivenessTimer()->start();
@@ -1125,11 +1120,6 @@ void WebPageProxy::handleWheelEvent(const NativeWebWheelEvent& event)
     if (!isValid())
         return;
 
-#if ENABLE(TIZEN_WEBKIT2_ROTATION_WHILE_JAVASCRIPT_POPUP)
-    if (isWaitingForJavaScriptPopupReply())
-        return;
-#endif
-
     if (!m_currentlyProcessedWheelEvents.isEmpty()) {
         m_wheelEventQueue.append(event);
         if (m_wheelEventQueue.size() < wheelEventQueueSizeThreshold)
@@ -1175,11 +1165,6 @@ void WebPageProxy::handleKeyboardEvent(const NativeWebKeyboardEvent& event)
     if (!isValid())
         return;
     
-#if ENABLE(TIZEN_WEBKIT2_ROTATION_WHILE_JAVASCRIPT_POPUP)
-    if (isWaitingForJavaScriptPopupReply())
-        return;
-#endif
-
     LOG(KeyHandling, "WebPageProxy::handleKeyboardEvent: %s", webKeyboardEventTypeString(event.type()));
 
     m_keyEventQueue.append(event);

diff --git a/Source/WebKit2/UIProcess/WebPageProxy.h b/Source/WebKit2/UIProcess/WebPageProxy.h
index 839eccb..700104a 100755 (executable)
--- a/Source/WebKit2/UIProcess/WebPageProxy.h
+++ b/Source/WebKit2/UIProcess/WebPageProxy.h
@@ -968,9 +968,6 @@ private:
     void showPage();
     void closePage(bool stopResponsivenessTimer);
 #if OS(TIZEN)
-#if ENABLE(TIZEN_WEBKIT2_ROTATION_WHILE_JAVASCRIPT_POPUP)
-    bool isWaitingForJavaScriptPopupReply();
-#endif
     void runJavaScriptAlert(uint64_t frameID, const String&, PassRefPtr<Messages::WebPageProxy::RunJavaScriptAlert::DelayedReply>);
     void runJavaScriptConfirm(uint64_t frameID, const String&, PassRefPtr<Messages::WebPageProxy::RunJavaScriptConfirm::DelayedReply>);
     void runJavaScriptPrompt(uint64_t frameID, const String&, const String&, PassRefPtr<Messages::WebPageProxy::RunJavaScriptPrompt::DelayedReply>);

diff --git a/Source/WebKit2/UIProcess/efl/WebPageProxyEfl.cpp b/Source/WebKit2/UIProcess/efl/WebPageProxyEfl.cpp
index 33e2b8a..273bdb6 100755 (executable)
--- a/Source/WebKit2/UIProcess/efl/WebPageProxyEfl.cpp
+++ b/Source/WebKit2/UIProcess/efl/WebPageProxyEfl.cpp
@@ -748,13 +748,6 @@ void WebPageProxy::didGetTextStyleStateForSelection(int underlineState, int ital
 }
 #endif
 
-#if ENABLE(TIZEN_WEBKIT2_ROTATION_WHILE_JAVASCRIPT_POPUP)
-bool WebPageProxy::isWaitingForJavaScriptPopupReply()
-{
-    return m_alertReply || m_confirmReply || m_promptReply;
-}
-#endif
-
 #endif // #if OS(TIZEN)
 
 } // namespace WebKit