[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-9427-gc2be6fc

[xan at webkit.org]

The following commit has been merged in the debian/experimental branch:
commit 852ad3d58725bfee27d15056abb5e09edb1a4166
Author: xan at webkit.org <xan at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Mon Sep 6 15:29:45 2010 +0000

    2010-09-06  Xan Lopez  <xlopez at igalia.com>
    
            Rubber-stamped by Tor Arne Vestbø.
    
            WebCore already generates a focus-{out,in} events on its setFocus
            method, there's no need to duplicate it here. Previously this was
            needed because we were not catching all possible names of focus
            events in PluginView::handleEvent and were missing the ones
            WebCore does, but this has been fixed in r66827.
    
            * plugins/qt/PluginViewQt.cpp:
            (WebCore::PluginView::setFocus):
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@66831 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index ffea0e4..2c4029f 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,16 @@
+2010-09-06  Xan Lopez  <xlopez at igalia.com>
+
+        Rubber-stamped by Tor Arne Vestbø.
+
+        WebCore already generates a focus-{out,in} events on its setFocus
+        method, there's no need to duplicate it here. Previously this was
+        needed because we were not catching all possible names of focus
+        events in PluginView::handleEvent and were missing the ones
+        WebCore does, but this has been fixed in r66827.
+
+        * plugins/qt/PluginViewQt.cpp:
+        (WebCore::PluginView::setFocus):
+
 2010-09-06  Sheriff Bot  <webkit.review.bot at gmail.com>
 
         Unreviewed, rolling out r66823.
diff --git a/WebCore/plugins/qt/PluginViewQt.cpp b/WebCore/plugins/qt/PluginViewQt.cpp
index f60885d..e2df392 100644
--- a/WebCore/plugins/qt/PluginViewQt.cpp
+++ b/WebCore/plugins/qt/PluginViewQt.cpp
@@ -154,13 +154,6 @@ void PluginView::setFocus(bool focused)
     } else {
         Widget::setFocus(focused);
     }
-    if (!m_isWindowed) {
-      XEvent npEvent;
-      initXEvent(&npEvent);
-      npEvent.type = (focused) ? 9 : 10; // ints as Qt unsets FocusIn and FocusOut
-      if (!dispatchNPEvent(npEvent))
-          LOG(Events, "PluginView::setFocus(%d): Focus event not accepted", focused);
-    }
 }
 
 void PluginView::show()

-- 
WebKit Debian packaging