Changeset 62036 in webkit

Timestamp:

Jun 28, 2010 2:07:06 PM (14 years ago)

Author:

jam@chromium.org

Message:

2010-06-27 John Abd-El-Malek <​jam@chromium.org>

Reviewed by Darin Fisher.

[chromium] Get the selected text from plugins for right click menu
​https://bugs.webkit.org/show_bug.cgi?id=41242

• public/WebContextMenuData.h: (WebKit::WebContextMenuData::):
• public/WebPlugin.h: (WebKit::WebPlugin::selectedText):
• src/ContextMenuClientImpl.cpp: (WebKit::ContextMenuClientImpl::getCustomMenuFromDefaultItems):
• src/WebPluginContainerImpl.cpp: (WebKit::WebPluginContainerImpl::selectedText):
• src/WebPluginContainerImpl.h:

Location:

trunk/WebKit/chromium

Files:

• ChangeLog (modified) (1 diff)
• public/WebContextMenuData.h (modified) (1 diff)
• public/WebPlugin.h (modified) (2 diffs)
• src/ContextMenuClientImpl.cpp (modified) (5 diffs)
• src/WebPluginContainerImpl.cpp (modified) (1 diff)
• src/WebPluginContainerImpl.h (modified) (1 diff)

trunk/WebKit/chromium/ChangeLog

@@ +1 @@
+2010-06-27  John Abd-El-Malek  <jam@chromium.org>
+
+        Reviewed by Darin Fisher.
+
+        [chromium] Get the selected text from plugins for right click menu
+        https://bugs.webkit.org/show_bug.cgi?id=41242
+
+        * public/WebContextMenuData.h:
+        (WebKit::WebContextMenuData::):
+        * public/WebPlugin.h:
+        (WebKit::WebPlugin::selectedText):
+        * src/ContextMenuClientImpl.cpp:
+        (WebKit::ContextMenuClientImpl::getCustomMenuFromDefaultItems):
+        * src/WebPluginContainerImpl.cpp:
+        (WebKit::WebPluginContainerImpl::selectedText):
+        * src/WebPluginContainerImpl.h:
+
 2010-06-28  Yury Semikhatsky  <yurys@chromium.org>
 

trunk/WebKit/chromium/public/WebContextMenuData.h

@@ -125 +125 @@
         CanDelete = 0x20,
         CanSelectAll = 0x40,
+        CanTranslate = 0x80,
     };
 

trunk/WebKit/chromium/public/WebPlugin.h

@@ -33 +33 @@
 
 #include "WebCanvas.h"
+#include "WebString.h"
 
 struct NPObject;
@@ -94 +95 @@
     virtual void printEnd() { }
 
+    virtual WebString selectedText() { return WebString(); }
+
 protected:
     ~WebPlugin() { }

trunk/WebKit/chromium/src/ContextMenuClientImpl.cpp

@@ -47 +47 @@
 #include "MediaError.h"
 #include "PlatformString.h"
+#include "RenderWidget.h"
 #include "TextBreakIterator.h"
 #include "Widget.h"
@@ -54 +55 @@
 #include "WebFrameImpl.h"
 #include "WebMenuItemInfo.h"
+#include "WebPluginContainerImpl.h"
 #include "WebPoint.h"
 #include "WebString.h"
@@ -147 +149 @@
     WebContextMenuData data;
     data.mousePosition = selectedFrame->view()->contentsToWindow(r.point());
+
+    // Compute edit flags.
+    data.editFlags = WebContextMenuData::CanDoNone;
+    if (m_webView->focusedWebCoreFrame()->editor()->canUndo())
+        data.editFlags |= WebContextMenuData::CanUndo;
+    if (m_webView->focusedWebCoreFrame()->editor()->canRedo())
+        data.editFlags |= WebContextMenuData::CanRedo;
+    if (m_webView->focusedWebCoreFrame()->editor()->canCut())
+        data.editFlags |= WebContextMenuData::CanCut;
+    if (m_webView->focusedWebCoreFrame()->editor()->canCopy())
+        data.editFlags |= WebContextMenuData::CanCopy;
+    if (m_webView->focusedWebCoreFrame()->editor()->canPaste())
+        data.editFlags |= WebContextMenuData::CanPaste;
+    if (m_webView->focusedWebCoreFrame()->editor()->canDelete())
+        data.editFlags |= WebContextMenuData::CanDelete;
+    // We can always select all...
+    data.editFlags |= WebContextMenuData::CanSelectAll;
+    data.editFlags |= WebContextMenuData::CanTranslate;
 
     // Links, Images, Media tags, and Image/Media-Links take preference over
@@ -183 +203 @@
         if (mediaElement->controls())
             data.mediaFlags |= WebContextMenuData::MediaControls;
+    } else if (r.innerNonSharedNode()->hasTagName(HTMLNames::objectTag)
+               || r.innerNonSharedNode()->hasTagName(HTMLNames::embedTag)) {
+        RenderObject* object = r.innerNonSharedNode()->renderer();
+        if (object && object->isWidget()) {
+            Widget* widget = toRenderWidget(object)->widget();
+            if (widget) {
+                WebPluginContainerImpl* plugin = static_cast<WebPluginContainerImpl*>(widget);
+                WebString text = plugin->selectedText();
+                if (!text.isEmpty()) {
+                    data.selectedText = text;
+                    data.editFlags |= WebContextMenuData::CanCopy;
+                }
+                data.editFlags &= ~WebContextMenuData::CanTranslate;
+            }
+        }
     }
 
@@ -226 +261 @@
     if (ds)
         data.securityInfo = ds->response().securityInfo();
-
-    // Compute edit flags.
-    data.editFlags = WebContextMenuData::CanDoNone;
-    if (m_webView->focusedWebCoreFrame()->editor()->canUndo())
-        data.editFlags |= WebContextMenuData::CanUndo;
-    if (m_webView->focusedWebCoreFrame()->editor()->canRedo())
-        data.editFlags |= WebContextMenuData::CanRedo;
-    if (m_webView->focusedWebCoreFrame()->editor()->canCut())
-        data.editFlags |= WebContextMenuData::CanCut;
-    if (m_webView->focusedWebCoreFrame()->editor()->canCopy())
-        data.editFlags |= WebContextMenuData::CanCopy;
-    if (m_webView->focusedWebCoreFrame()->editor()->canPaste())
-        data.editFlags |= WebContextMenuData::CanPaste;
-    if (m_webView->focusedWebCoreFrame()->editor()->canDelete())
-        data.editFlags |= WebContextMenuData::CanDelete;
-    // We can always select all...
-    data.editFlags |= WebContextMenuData::CanSelectAll;
 
     // Filter out custom menu elements and add them into the data.

trunk/WebKit/chromium/src/WebPluginContainerImpl.cpp

@@ -247 +247 @@
 }
 
+WebString WebPluginContainerImpl::selectedText()
+{
+    return m_webPlugin->selectedText();
+}
+
 WebElement WebPluginContainerImpl::element()
 {

trunk/WebKit/chromium/src/WebPluginContainerImpl.h

@@ -103 +103 @@
     void printEnd();
 
+    WebString selectedText();
+
     // Resource load events for the plugin's source data:
     void didReceiveResponse(const WebCore::ResourceResponse&);