Allow keyboard input to work in Mac plugins....

webkit/api/src/WebPluginContainerImpl.cpp

 /*
  * Copyright (C) 2009 Google Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are
  * met:
  *
  *     * Redistributions of source code must retain the above copyright
  * notice, this list of conditions and the following disclaimer.
  *     * Redistributions in binary form must reproduce the above
@@ skipping 332 matching lines @@
 
     if (event->type() == eventNames().mousedownEvent) {
         // Ensure that the frame containing the plugin has focus.
         Frame* containingFrame = parentView->frame();
         if (Page* currentPage = containingFrame->page())
             currentPage->focusController()->setFocusedFrame(containingFrame);
         // Give focus to our containing HTMLPluginElement.
         containingFrame->document()->setFocusedNode(m_element);
     }
 
+    WebCursorInfo cursorInfo;
+    bool handled = m_webPlugin->handleInputEvent(webEvent, cursorInfo);
+#if !PLATFORM(DARWIN)
     // TODO(pkasting): http://b/1119691 This conditional seems exactly
-    // backwards, but it matches Safari's code, and if I reverse it, giving
-    // focus to a transparent (windowless) plugin fails.
-    WebCursorInfo cursorInfo;
-    if (!m_webPlugin->handleInputEvent(webEvent, cursorInfo))
+    // backwards, but if I reverse it, giving focus to a transparent
+    // (windowless) plugin fails.
+    handled = !handled;
+    // TODO(awalker): oddly, the above is not true in Mac builds.  Looking
+    // at Apple's corresponding code for Mac and Windows (PluginViewMac and
+    // PluginViewWin), setDefaultHandled() gets called when handleInputEvent()
+    // returns true, which then indicates to WebCore that the plugin wants to
+    // swallow the event--which is what we want.  Calling setDefaultHandled()
+    // fixes several Mac Chromium bugs, but does indeed prevent windowless plugins
+    // from getting focus in Windows builds, as pkasting notes above.  So for
+    // now, we only do so in Mac builds.
+#endif
+    if (handled)
         event->setDefaultHandled();
 
     // A windowless plugin can change the cursor in response to a mouse move
     // event.  We need to reflect the changed cursor in the frame view as the
     // mouse is moved in the boundaries of the windowless plugin.
     webKitClient()->setCursorForPlugin(cursorInfo, parentView->frame());
 }
 
 void WebPluginContainerImpl::handleKeyboardEvent(KeyboardEvent* event)
 {
     WebKeyboardEventBuilder webEvent(*event);
     if (webEvent.type == WebInputEvent::Undefined)
         return;
 
+    WebCursorInfo cursor_info;
+    bool handled = m_webPlugin->handleInputEvent(webEvent, cursor_info);
+#if !PLATFORM(DARWIN)
     // TODO(pkasting): http://b/1119691 See above.
-    WebCursorInfo cursor_info;
-    if (!m_webPlugin->handleInputEvent(webEvent, cursor_info))
+    handled = !handled;
+#endif
+    if (handled)
         event->setDefaultHandled();
 }
 
 void WebPluginContainerImpl::calculateGeometry(const IntRect& frameRect,
                                                IntRect& windowRect,
                                                IntRect& clipRect,
                                                Vector<IntRect>& cutOutRects)
 {
     windowRect = IntRect(
         parent()->contentsToWindow(frameRect.location()), frameRect.size());
@@ skipping 140 matching lines @@
                     roundedIntPoint(iframeRenderer->localToAbsolute());
                 RenderBox* rbox = toRenderBox(iframeRenderer);
                 IntSize size(rbox->width(), rbox->height());
                 cutOutRects.append(IntRect(point, size));
             }
         }
     }
 }
 
 } // namespace WebKit