Merge 48854 to 375 - Linux: for Flash, disable right clicks in windowless mod...

webkit/glue/plugins/webplugin_delegate_impl_gtk.cc

 // Copyright (c) 2006-2008 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "webkit/glue/plugins/webplugin_delegate_impl.h"
 
 #include <string>
 #include <vector>
 
 #include <gtk/gtk.h>
@@ skipping 37 matching lines @@
       pixmap_(NULL),
       first_event_time_(-1.0),
       plug_(NULL),
       socket_(NULL),
       parent_(containing_view),
       quirks_(0),
       handle_event_depth_(0) {
   memset(&window_, 0, sizeof(window_));
   if (instance_->mime_type() == "application/x-shockwave-flash") {
     // Flash is tied to Firefox's whacky behavior with windowless plugins. See
-    // comments in WindowlessPaint
+    // comments in WindowlessPaint.
+    // TODO(viettrungluu): PLUGIN_QUIRK_WINDOWLESS_NO_RIGHT_CLICK: Don't allow
+    // right-clicks in windowless content since Flash 10.1 (initial release, at
+    // least) hangs in that case. Remove this once Flash is fixed.
     quirks_ |= PLUGIN_QUIRK_WINDOWLESS_OFFSET_WINDOW_TO_DRAW
-        | PLUGIN_QUIRK_WINDOWLESS_INVALIDATE_AFTER_SET_WINDOW;
+        | PLUGIN_QUIRK_WINDOWLESS_INVALIDATE_AFTER_SET_WINDOW
+        | PLUGIN_QUIRK_WINDOWLESS_NO_RIGHT_CLICK;
   }
 
   // TODO(evanm): I played with this for quite a while but couldn't
   // figure out a way to make Flash not crash unless I didn't call
   // NPP_SetWindow.
   // However, after piman's grand refactor of windowed plugins, maybe
   // this is no longer necessary.
   quirks_ |= PLUGIN_QUIRK_DONT_SET_NULL_WINDOW_HANDLE_ON_DESTROY;
 }
 
@@ skipping 618 matching lines @@
     const WebInputEvent& event, WebCursorInfo* cursor_info) {
 
   if (first_event_time_ < 0.0)
     first_event_time_ = event.timeStampSeconds;
   Time timestamp = static_cast<Time>(
       (event.timeStampSeconds - first_event_time_) * 1.0e3);
   NPEvent np_event = {0};
   if (!NPEventFromWebInputEvent(event, timestamp, &np_event)) {
     return false;
   }
+  // See comment about PLUGIN_QUIRK_WINDOWLESS_NO_RIGHT_CLICK in constructor.
+  if (windowless_ &&
+      (quirks_ & PLUGIN_QUIRK_WINDOWLESS_NO_RIGHT_CLICK) &&
+      (np_event.type == ButtonPress || np_event.type == ButtonRelease) &&
+      (np_event.xbutton.button == Button3)) {
+    return false;
+  }
+
   bool ret = instance()->NPP_HandleEvent(&np_event) != 0;
 
   // Flash always returns false, even when the event is handled.
   ret = true;
 
 #if 0
   if (event->event == WM_MOUSEMOVE) {
     // Snag a reference to the current cursor ASAP in case the plugin modified
     // it. There is a nasty race condition here with the multiprocess browser
     // as someone might be setting the cursor in the main process as well.
     *cursor = current_windowless_cursor_;
   }
 #endif
 
   return ret;
 }