Changeset 55606 in webkit

Timestamp:

Mar 5, 2010 6:34:47 PM (14 years ago)

Author:

eric@webkit.org

Message:

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

Reviewed by Darin Fisher.

Take out code hack that flips the result of NPP_HandleEvent. This needs to move to
the NPAPI code so that Pepper plugins don't hit it.
​https://bugs.webkit.org/show_bug.cgi?id=35779

• public/WebPluginContainer.h:
• src/WebPluginContainerImpl.cpp: (WebKit::WebPluginContainerImpl::handleMouseEvent): (WebKit::WebPluginContainerImpl::handleKeyboardEvent):

Location:

trunk/WebKit/chromium

Files:

• ChangeLog (modified) (1 diff)
• public/WebPluginContainer.h (modified) (1 diff)
• src/WebPluginContainerImpl.cpp (modified) (2 diffs)

trunk/WebKit/chromium/ChangeLog

@@ +1 @@
+2010-03-05  John Abd-El-Malek  <jam@chromium.org>
+
+        Reviewed by Darin Fisher.
+
+        Take out code hack that flips the result of NPP_HandleEvent.  This needs to move to
+        the NPAPI code so that Pepper plugins don't hit it.
+        https://bugs.webkit.org/show_bug.cgi?id=35779
+
+        * public/WebPluginContainer.h:
+        * src/WebPluginContainerImpl.cpp:
+        (WebKit::WebPluginContainerImpl::handleMouseEvent):
+        (WebKit::WebPluginContainerImpl::handleKeyboardEvent):
+
 2010-03-05  Ilya Tikhonovsky  <loislo@chromium.org>
 

trunk/WebKit/chromium/public/WebPluginContainer.h

@@ -33 +33 @@
 
 struct NPObject;
+
+// Temporary ifdef since this is two-sided.
+#define WEBPLUGINCONTAINER_DOESNT_MODIFY_HANDLED 1
 
 namespace WebKit {

trunk/WebKit/chromium/src/WebPluginContainerImpl.cpp

@@ -361 +361 @@
     WebCursorInfo cursorInfo;
     bool handled = m_webPlugin->handleInputEvent(webEvent, cursorInfo);
-#if !OS(DARWIN)
-    // TODO(pkasting): http://b/1119691 This conditional seems exactly
-    // 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();
@@ -397 +383 @@
     WebCursorInfo cursor_info;
     bool handled = m_webPlugin->handleInputEvent(webEvent, cursor_info);
-#if !OS(DARWIN)
-    // TODO(pkasting): http://b/1119691 See above.
-    handled = !handled;
-#endif
     if (handled)
         event->setDefaultHandled();