Changeset 104634 in webkit

Timestamp:

Jan 10, 2012 3:01:52 PM (12 years ago)

Author:

bbudge@chromium.org

Message:

Allow plugins to add rotate items to browser's context menu. Adds a new
WebPluginAction struct, with rotate types.
​https://bugs.webkit.org/show_bug.cgi?id=75645

Reviewed by Darin Fisher.

• WebKit.gyp:
• public/WebContextMenuData.h:
• public/WebPlugin.h:

(WebKit::WebPlugin::canRotateView):
(WebKit::WebPlugin::rotateView):

• public/WebPluginAction.h: Added.

(WebKit::WebPluginAction::WebPluginAction):

• public/WebView.h:
• src/ContextMenuClientImpl.cpp:

(WebKit::ContextMenuClientImpl::getCustomMenuFromDefaultItems):

• src/WebViewImpl.cpp:

(WebKit::WebViewImpl::performMediaPlayerAction):
(WebKit::WebViewImpl::performPluginAction):

• src/WebViewImpl.h:

Location:

trunk/Source/WebKit/chromium

Files:

• ChangeLog (modified) (1 diff)
• WebKit.gyp (modified) (1 diff)
• public/WebContextMenuData.h (modified) (2 diffs)
• public/WebPlugin.h (modified) (2 diffs)
• public/WebPluginAction.h (added)
• public/WebView.h (modified) (2 diffs)
• src/ContextMenuClientImpl.cpp (modified) (2 diffs)
• src/WebViewImpl.cpp (modified) (5 diffs)
• src/WebViewImpl.h (modified) (1 diff)

trunk/Source/WebKit/chromium/ChangeLog

@@ +1 @@
+2012-01-10  Bill Budge  <bbudge@chromium.org>
+
+        Allow plugins to add rotate items to browser's context menu. Adds a new
+        WebPluginAction struct, with rotate types.
+        https://bugs.webkit.org/show_bug.cgi?id=75645
+
+        Reviewed by Darin Fisher.
+
+        * WebKit.gyp:
+        * public/WebContextMenuData.h:
+        * public/WebPlugin.h:
+        (WebKit::WebPlugin::canRotateView):
+        (WebKit::WebPlugin::rotateView):
+        * public/WebPluginAction.h: Added.
+        (WebKit::WebPluginAction::WebPluginAction):
+        * public/WebView.h:
+        * src/ContextMenuClientImpl.cpp:
+        (WebKit::ContextMenuClientImpl::getCustomMenuFromDefaultItems):
+        * src/WebViewImpl.cpp:
+        (WebKit::WebViewImpl::performMediaPlayerAction):
+        (WebKit::WebViewImpl::performPluginAction):
+        * src/WebViewImpl.h:
+
 2012-01-10  Dana Jansens  <danakj@chromium.org>
 

trunk/Source/WebKit/chromium/WebKit.gyp

@@ -217 +217 @@
                 'public/WebPermissionClient.h',
                 'public/WebPlugin.h',
+                'public/WebPluginAction.h',
                 'public/WebPluginContainer.h',
                 'public/WebPluginDocument.h',

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

@@ -1 +1 @@
 /*
- * Copyright (C) 2009 Google Inc. All rights reserved.
+ * Copyright (C) 2009, 2012 Google Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -103 +103 @@
         MediaControlRootElement = 0x80,
         MediaCanPrint = 0x100,
+        MediaCanRotate = 0x200,
     };
 

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

@@ -1 +1 @@
 /*
- * Copyright (C) 2009 Google Inc. All rights reserved.
+ * Copyright (C) 2009, 2012 Google Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -126 +126 @@
     virtual void stopFind() { }
 
+    // View rotation types.
+    enum RotationType {
+        RotationType90Clockwise,
+        RotationType90Counterclockwise
+    };
+    // Whether the plugin can rotate the view of its content.
+    virtual bool canRotateView() { return false; }
+    // Rotates the plugin's view of its content.
+    virtual void rotateView(RotationType type) { }
+
 protected:
     ~WebPlugin() { }

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

@@ -56 +56 @@
 class WebViewClient;
 struct WebMediaPlayerAction;
+struct WebPluginAction;
 struct WebPoint;
 
@@ -274 +275 @@
     // Media ---------------------------------------------------------------
 
-    // Performs the specified action on the node at the given location.
+    // Performs the specified media player action on the node at the given location.
     virtual void performMediaPlayerAction(
         const WebMediaPlayerAction&, const WebPoint& location) = 0;
+
+    // Performs the specified plugin action on the node at the given location.
+    virtual void performPluginAction(
+        const WebPluginAction&, const WebPoint& location) = 0;
 
 

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

@@ -1 +1 @@
 /*
- * Copyright (C) 2009 Google Inc. All rights reserved.
+ * Copyright (C) 2009, 2012 Google Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -235 +235 @@
                 data.srcURL = pluginElement->document()->completeURL(pluginElement->url());
                 data.mediaFlags |= WebContextMenuData::MediaCanSave;
+
+                // Add context menu commands that are supported by the plugin.
+                if (plugin->plugin()->canRotateView())
+                    data.mediaFlags |= WebContextMenuData::MediaCanRotate;
             }
         }

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

@@ -1 +1 @@
 /*
- * Copyright (C) 2011 Google Inc. All rights reserved.
+ * Copyright (C) 2011, 2012 Google Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -96 +96 @@
 #include "RenderLayerCompositor.h"
 #include "RenderView.h"
+#include "RenderWidget.h"
 #include "ResourceHandle.h"
 #include "SchemeRegistry.h"
@@ -126 +127 @@
 #include "WebNode.h"
 #include "WebPlugin.h"
+#include "WebPluginAction.h"
 #include "WebPluginContainerImpl.h"
 #include "platform/WebPoint.h"
@@ -2184 +2186 @@
     RefPtr<Node> node = result.innerNonSharedNode();
     if (!node->hasTagName(HTMLNames::videoTag) && !node->hasTagName(HTMLNames::audioTag))
-      return;
+        return;
 
     RefPtr<HTMLMediaElement> mediaElement =
@@ -2209 +2211 @@
 }
 
+void WebViewImpl::performPluginAction(const WebPluginAction& action,
+                                      const WebPoint& location)
+{
+    HitTestResult result = hitTestResultForWindowPos(location);
+    RefPtr<Node> node = result.innerNonSharedNode();
+    if (!node->hasTagName(HTMLNames::objectTag) && !node->hasTagName(HTMLNames::embedTag))
+        return;
+
+    RenderObject* object = node->renderer();
+    if (object && object->isWidget()) {
+        Widget* widget = toRenderWidget(object)->widget();
+        if (widget && widget->isPluginContainer()) {
+            WebPluginContainerImpl* plugin = static_cast<WebPluginContainerImpl*>(widget);
+            switch (action.type) {
+            case WebPluginAction::Rotate90Clockwise:
+                plugin->plugin()->rotateView(WebPlugin::RotationType90Clockwise);
+                break;
+            case WebPluginAction::Rotate90Counterclockwise:
+                plugin->plugin()->rotateView(WebPlugin::RotationType90Counterclockwise);
+                break;
+            default:
+                ASSERT_NOT_REACHED();
+            }
+        }
+    }
+}
+
 void WebViewImpl::copyImageAt(const WebPoint& point)
 {

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

@@ -187 +187 @@
         const WebMediaPlayerAction& action,
         const WebPoint& location);
+    virtual void performPluginAction(
+        const WebPluginAction&,
+        const WebPoint&);
     virtual void copyImageAt(const WebPoint& point);
     virtual void dragSourceEndedAt(