From 2970b5ee9943b455da5e80c47db33c34fcfd96f9 Mon Sep 17 00:00:00 2001 From: Yuni Jeong Date: Wed, 22 Aug 2012 23:47:47 +0900 Subject: [PATCH] Fixed context menu issue in email. [Title] Fixed context menu issue in email. [Issue#] S1-7512 [Problem] [email] can't see pasted text after paste from context menu [Cause] Because text selection mode is not changed to OFF. - 'paste' context menu is context menu releated to text selection. [Solution] modify that text selection is set to off after selecting 'paste' & customized context menu. Change-Id: Iadd3e3bb8970a7854b687fe2eacc1275206856f7 --- Source/WebKit2/UIProcess/PageClient.h | 1 + Source/WebKit2/UIProcess/WebPageProxy.cpp | 8 ++++++++ 2 files changed, 9 insertions(+) mode change 100644 => 100755 Source/WebKit2/UIProcess/PageClient.h diff --git a/Source/WebKit2/UIProcess/PageClient.h b/Source/WebKit2/UIProcess/PageClient.h old mode 100644 new mode 100755 index 9b917ef..1e63d11 --- a/Source/WebKit2/UIProcess/PageClient.h +++ b/Source/WebKit2/UIProcess/PageClient.h @@ -207,6 +207,7 @@ public: #if OS(TIZEN) #if ENABLE(TIZEN_WEBKIT2_TEXT_SELECTION) virtual void updateTextSelection() = 0; + virtual void setIsTextSelectionMode(bool isTextSelectionMode) = 0; #endif virtual void didStartProgress() = 0; diff --git a/Source/WebKit2/UIProcess/WebPageProxy.cpp b/Source/WebKit2/UIProcess/WebPageProxy.cpp index 47438cf..ae2872d 100755 --- a/Source/WebKit2/UIProcess/WebPageProxy.cpp +++ b/Source/WebKit2/UIProcess/WebPageProxy.cpp @@ -3105,9 +3105,17 @@ void WebPageProxy::contextMenuItemSelected(const WebContextMenuItemData& item) // Application custom items don't need to round-trip through to WebCore in the WebProcess. if (item.action() >= ContextMenuItemBaseApplicationTag) { m_contextMenuClient.customContextMenuItemSelected(this, item); +#if ENABLE(TIZEN_WEBKIT2_TEXT_SELECTION) + m_pageClient->setIsTextSelectionMode(false); +#endif return; } +#if ENABLE(TIZEN_WEBKIT2_TEXT_SELECTION) + if (item.action() == ContextMenuItemTagPaste) + m_pageClient->setIsTextSelectionMode(false); +#endif + #if PLATFORM(MAC) if (item.action() == ContextMenuItemTagSmartCopyPaste) { setSmartInsertDeleteEnabled(!isSmartInsertDeleteEnabled()); -- 2.7.4