Added "Copy" context menu in case that selected node has imageURL.
authorYuni Jeong <yhnet.jung@samsung.com>
Mon, 20 May 2013 14:26:38 +0000 (23:26 +0900)
committerGerrit Code Review <gerrit@gerrit.vlan144.tizendev.org>
Wed, 10 Jul 2013 03:06:03 +0000 (03:06 +0000)
[Title] Added "Copy" context menu in case that selected node has imageURL.
[Issue#] P130517-3062
[Problem] when "SelectMode" context menu is selected after longtap on image in reader view,
          context menu(ex - Copy...) for text selection is not displayed.
[Cause] If selected node has linkURL, "Copy" context menu is added.
        In this case, selected node has only imageURL and does not has linkURL.
        So, "Copy" context menu is not added.
[Solution] Added "Copy" context menu in case that selected node has imageURL.

Change-Id: Ifedc0aa5a8b91a176653d7add6637fa9e669975b

Source/WebCore/page/ContextMenuController.cpp

index 983c1cd..04097ec 100755 (executable)
@@ -854,9 +854,8 @@ void ContextMenuController::populate()
         if (!linkURL.isEmpty()) {
 #if ENABLE(TIZEN_WEBKIT2_TEXT_SELECTION)
             if (m_hitTestResult.isSelected() || frame->selection()->isRange()) {
-                if (selectionContainsPossibleWord(frame)) {
+                if (selectionContainsPossibleWord(frame))
                     appendItem(SearchWebItem, m_contextMenu.get());
-                }
                 appendItem(CopyItem, m_contextMenu.get());
                 return;
             }
@@ -880,6 +879,12 @@ void ContextMenuController::populate()
 
         KURL imageURL = m_hitTestResult.absoluteImageURL();
         if (!imageURL.isEmpty()) {
+#if ENABLE(TIZEN_WEBKIT2_TEXT_SELECTION)
+            if (m_hitTestResult.isSelected() || frame->selection()->isRange()) {
+                appendItem(CopyItem, m_contextMenu.get());
+                return;
+            }
+#endif
             if (!linkURL.isEmpty())
                 appendItem(*separatorItem(), m_contextMenu.get());