Changeset 89939 in webkit

Timestamp:

Jun 28, 2011 9:58:00 AM (13 years ago)

Author:

jhawkins@chromium.org

Message:

2011-06-27 James Hawkins <​jhawkins@chromium.org>

Reviewed by Darin Fisher.

[Chromium] Pass an optional WebNode that is the node receiving the context menu action.
​https://bugs.webkit.org/show_bug.cgi?id=63503

• public/WebFrame.h:
• src/WebFrameImpl.cpp: (WebKit::pluginContainerFromNode): (WebKit::WebFrameImpl::executeCommand): (WebKit::WebFrameImpl::printBegin):
• src/WebFrameImpl.h:

Location:

trunk/Source/WebKit/chromium

Files:

• ChangeLog (modified) (1 diff)
• public/WebFrame.h (modified) (1 diff)
• src/WebFrameImpl.cpp (modified) (5 diffs)
• src/WebFrameImpl.h (modified) (1 diff)

trunk/Source/WebKit/chromium/ChangeLog

@@ +1 @@
+2011-06-27  James Hawkins  <jhawkins@chromium.org>
+
+        Reviewed by Darin Fisher.
+
+        [Chromium] Pass an optional WebNode that is the node receiving the context menu action.
+        https://bugs.webkit.org/show_bug.cgi?id=63503
+
+        * public/WebFrame.h:
+        * src/WebFrameImpl.cpp:
+        (WebKit::pluginContainerFromNode):
+        (WebKit::WebFrameImpl::executeCommand):
+        (WebKit::WebFrameImpl::printBegin):
+        * src/WebFrameImpl.h:
+
 2011-06-27  Ryosuke Niwa  <rniwa@webkit.org>
 

trunk/Source/WebKit/chromium/public/WebFrame.h

@@ -393 +393 @@
     // Unselect, etc. See EditorCommand.cpp for the full list of supported
     // commands.
-    virtual bool executeCommand(const WebString&) = 0;
+    virtual bool executeCommand(const WebString&, const WebNode& = WebNode()) = 0;
     virtual bool executeCommand(const WebString&, const WebString& value) = 0;
     virtual bool isCommandEnabled(const WebString&) const = 0;

trunk/Source/WebKit/chromium/src/WebFrameImpl.cpp

@@ -286 +286 @@
 }
 
+static WebPluginContainerImpl* pluginContainerFromNode(const WebNode& node)
+{
+    const Node* coreNode = node.constUnwrap<Node>();
+    if (coreNode->hasTagName(HTMLNames::objectTag) || coreNode->hasTagName(HTMLNames::embedTag)) {
+        RenderObject* object = coreNode->renderer();
+        if (object && object->isWidget()) {
+            Widget* widget = toRenderWidget(object)->widget();
+            if (widget && widget->isPluginContainer())
+                return static_cast<WebPluginContainerImpl*>(widget);
+        }
+    }
+    return 0;
+}
+
 WebPluginContainerImpl* WebFrameImpl::pluginContainerFromFrame(Frame* frame)
 {
@@ -297 +311 @@
 
 // Simple class to override some of PrintContext behavior. Some of the methods
-// made virtual so that they can be overriden by ChromePluginPrintContext.
+// made virtual so that they can be overridden by ChromePluginPrintContext.
 class ChromePrintContext : public PrintContext {
     WTF_MAKE_NONCOPYABLE(ChromePrintContext);
@@ -1101 +1115 @@
 }
 
-bool WebFrameImpl::executeCommand(const WebString& name)
+bool WebFrameImpl::executeCommand(const WebString& name, const WebNode& node)
 {
     ASSERT(frame());
@@ -1121 +1135 @@
     if (command == "Copy") {
         WebPluginContainerImpl* pluginContainer = pluginContainerFromFrame(frame());
+        if (!pluginContainer)
+            pluginContainer = pluginContainerFromNode(node);
         if (pluginContainer) {
             pluginContainer->copy();
@@ -1308 +1324 @@
     } else {
         // We only support printing plugin nodes for now.
-        const Node* coreNode = constrainToNode.constUnwrap<Node>();
-        if (coreNode->hasTagName(HTMLNames::objectTag) || coreNode->hasTagName(HTMLNames::embedTag)) {
-            RenderObject* object = coreNode->renderer();
-            if (object && object->isWidget()) {
-                Widget* widget = toRenderWidget(object)->widget();
-                if (widget && widget->isPluginContainer())
-                    pluginContainer =  static_cast<WebPluginContainerImpl*>(widget);
-            }
-        }
+        pluginContainer = pluginContainerFromNode(constrainToNode);
     }
 

trunk/Source/WebKit/chromium/src/WebFrameImpl.h

@@ -150 +150 @@
     virtual bool firstRectForCharacterRange(unsigned location, unsigned length, WebRect&) const;
     virtual size_t characterIndexForPoint(const WebPoint&) const;
-    virtual bool executeCommand(const WebString&);
+    virtual bool executeCommand(const WebString&, const WebNode& = WebNode());
     virtual bool executeCommand(const WebString&, const WebString& value);
     virtual bool isCommandEnabled(const WebString&) const;