Changeset 69154 in webkit

Timestamp:

Oct 5, 2010 3:45:52 PM (14 years ago)

Author:

jam@chromium.org

Message:

2010-10-05 John Abd-El-Malek <​jam@chromium.org>

Reviewed by Darin Fisher.

[chromium] Get the link from a plugin when creating a context menu
​https://bugs.webkit.org/show_bug.cgi?id=47130

• chromium/public/WebPlugin.h: (WebKit::WebPlugin::linkAtPosition):
• chromium/public/WebView.h:
• chromium/src/ChromeClientImpl.cpp: (WebKit::ChromeClientImpl::mouseDidMoveOverElement):
• chromium/src/ContextMenuClientImpl.cpp: (WebKit::ContextMenuClientImpl::getCustomMenuFromDefaultItems):

Location:

trunk/WebKit

Files:

• ChangeLog (modified) (1 diff)
• chromium/public/WebPlugin.h (modified) (3 diffs)
• chromium/public/WebView.h (modified) (1 diff)
• chromium/src/ChromeClientImpl.cpp (modified) (3 diffs)
• chromium/src/ContextMenuClientImpl.cpp (modified) (1 diff)

trunk/WebKit/ChangeLog

@@ +1 @@
+2010-10-05  John Abd-El-Malek  <jam@chromium.org>
+
+        Reviewed by Darin Fisher.
+
+        [chromium] Get the link from a plugin when creating a context menu
+        https://bugs.webkit.org/show_bug.cgi?id=47130
+
+        * chromium/public/WebPlugin.h:
+        (WebKit::WebPlugin::linkAtPosition):
+        * chromium/public/WebView.h:
+        * chromium/src/ChromeClientImpl.cpp:
+        (WebKit::ChromeClientImpl::mouseDidMoveOverElement):
+        * chromium/src/ContextMenuClientImpl.cpp:
+        (WebKit::ContextMenuClientImpl::getCustomMenuFromDefaultItems):
+
 2010-09-22  Lucas De Marchi  <lucas.demarchi@profusion.mobi>
 

trunk/WebKit/chromium/public/WebPlugin.h

@@ -34 +34 @@
 #include "WebCanvas.h"
 #include "WebString.h"
+#include "WebURL.h"
 
 struct NPObject;
@@ -43 +44 @@
 class WebInputEvent;
 class WebPluginContainer;
-class WebURL;
 class WebURLResponse;
 struct WebCursorInfo;
 struct WebPluginParams;
+struct WebPoint;
 struct WebRect;
 struct WebURLError;
@@ -99 +100 @@
     virtual WebString selectionAsMarkup() const { return WebString(); }
 
+    // If the given position is over a link, returns the absolute url.
+    // Otherwise an empty url is returned.
+    virtual WebURL linkAtPosition(const WebPoint& position) const { return WebURL(); }
+
     // Used for zooming of full page plugins.
     virtual void setZoomLevel(double level, bool textOnly) { }

trunk/WebKit/chromium/public/WebView.h

@@ -37 +37 @@
 #include "WebWidget.h"
 
-// FIXME(jam): take this out after Chrome is updated
-#define ZOOM_LEVEL_IS_DOUBLE
-
 namespace WebKit {
 

trunk/WebKit/chromium/src/ChromeClientImpl.cpp

@@ -56 +56 @@
 #include "Page.h"
 #include "PopupMenuChromium.h"
+#include "RenderWidget.h"
 #include "ScriptController.h"
 #include "SearchPopupMenuChromium.h"
@@ -72 +73 @@
 #include "WebKit.h"
 #include "WebNode.h"
+#include "WebPlugin.h"
+#include "WebPluginContainerImpl.h"
 #include "WebPopupMenuImpl.h"
 #include "WebPopupMenuInfo.h"
@@ -604 +607 @@
     if (!m_webView->client())
         return;
+
+    WebURL url;
     // Find out if the mouse is over a link, and if so, let our UI know...
     if (result.isLiveLink() && !result.absoluteLinkURL().string().isEmpty())
-        m_webView->client()->setMouseOverURL(result.absoluteLinkURL());
-    else
-        m_webView->client()->setMouseOverURL(WebURL());
+        url = result.absoluteLinkURL();
+    else if (result.innerNonSharedNode()->hasTagName(HTMLNames::objectTag)
+             || result.innerNonSharedNode()->hasTagName(HTMLNames::embedTag)) {
+        RenderObject* object = result.innerNonSharedNode()->renderer();
+        if (object && object->isWidget()) {
+            Widget* widget = toRenderWidget(object)->widget();
+            if (widget) {
+                WebPluginContainerImpl* plugin = static_cast<WebPluginContainerImpl*>(widget);
+                url = plugin->plugin()->linkAtPosition(result.point());
+            }
+        }
+    }
+
+    m_webView->client()->setMouseOverURL(url);
 }
 

trunk/WebKit/chromium/src/ContextMenuClientImpl.cpp

@@ -217 +217 @@
                 }
                 data.editFlags &= ~WebContextMenuData::CanTranslate;
+                data.linkURL = plugin->plugin()->linkAtPosition(data.mousePosition);
             }
         }