[SCM] WebKit Debian packaging branch, webkit-1.2, updated. upstream/1.1.90-6072-g9a69373

[eric at webkit.org]

The following commit has been merged in the webkit-1.2 branch:
commit 105afdb5ccd3ba5a535a6af28555022ba14fbef5
Author: eric at webkit.org <eric at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Sat Mar 6 02:34:47 2010 +0000

    2010-03-05  John Abd-El-Malek  <jam at 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):
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@55606 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/chromium/ChangeLog b/WebKit/chromium/ChangeLog
index 93a474b..edbf1b6 100644
--- a/WebKit/chromium/ChangeLog
+++ b/WebKit/chromium/ChangeLog
@@ -1,3 +1,16 @@
+2010-03-05  John Abd-El-Malek  <jam at 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 at chromium.org>
 
         Reviewed by Pavel Feldman.
diff --git a/WebKit/chromium/public/WebPluginContainer.h b/WebKit/chromium/public/WebPluginContainer.h
index 41e304e..2aa5a66 100644
--- a/WebKit/chromium/public/WebPluginContainer.h
+++ b/WebKit/chromium/public/WebPluginContainer.h
@@ -33,6 +33,9 @@
 
 struct NPObject;
 
+// Temporary ifdef since this is two-sided.
+#define WEBPLUGINCONTAINER_DOESNT_MODIFY_HANDLED 1
+
 namespace WebKit {
 
 class WebString;
diff --git a/WebKit/chromium/src/WebPluginContainerImpl.cpp b/WebKit/chromium/src/WebPluginContainerImpl.cpp
index c44434c..1fb418c 100644
--- a/WebKit/chromium/src/WebPluginContainerImpl.cpp
+++ b/WebKit/chromium/src/WebPluginContainerImpl.cpp
@@ -360,20 +360,6 @@ void WebPluginContainerImpl::handleMouseEvent(MouseEvent* event)
 
     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();
 
@@ -396,10 +382,6 @@ void WebPluginContainerImpl::handleKeyboardEvent(KeyboardEvent* event)
 
     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();
 }

-- 
WebKit Debian packaging